Commit ff97e6ac authored by Jody Goldberg's avatar Jody Goldberg

remove some trailing whitespace that was irritating git.

svn path=/trunk/; revision=15866
parent 4e872462
......@@ -248,7 +248,7 @@ gnm_app_clipboard_cut_copy (WorkbookControl *wbc, gboolean is_cut,
/** gnm_app_clipboard_cut_copy_obj :
* @wbc : #WorkbookControl
* @is_cut :
* @is_cut :
* @sv : #SheetView
* @objects : a list of #SheetObject which is freed
*
......@@ -266,7 +266,7 @@ gnm_app_clipboard_cut_copy_obj (WorkbookControl *wbc, gboolean is_cut,
g_free (app->clipboard_cut_range);
app->clipboard_cut_range = NULL;
sv_weak_ref (sv, &(app->clipboard_sheet_view));
app->clipboard_copied_contents
app->clipboard_copied_contents
= clipboard_copy_obj (sv_sheet (sv), objects);
if (is_cut) {
cmd_objects_delete (wbc, objects, _("Cut Object"));
......@@ -778,7 +778,7 @@ gnm_app_init (GObject *obj)
GSF_CLASS (GnmApp, gnm_app,
gnm_app_class_init, gnm_app_init,
G_TYPE_OBJECT);
/**********************************************************************/
static GSList *extra_uis = NULL;
......
......@@ -63,7 +63,7 @@ GnmRange const *gnm_app_clipboard_area_get (void);
* Temporary home for extra actions until we rework this in 1.5
* with libgoffice
**/
typedef void (*GnmActionHandler) (GnmAction const *action, WorkbookControl *wbc,
gpointer user_data);
struct _GnmAction {
......
......@@ -259,7 +259,7 @@ paste_object (GnmPasteTarget const *pt, SheetObject const *src, int left, int to
struct paste_cell_data {
GnmPasteTarget const *pt;
GnmCellRegion const *cr;
GnmCellPos top_left;
GnmCellPos top_left;
GnmExprRelocateInfo rinfo;
};
......@@ -427,8 +427,8 @@ clipboard_paste_region (GnmCellRegion const *cr,
int const top = j * src_rows + pt->range.start.row;
struct paste_cell_data dat;
dat.top_left.col = left;
dat.top_left.row = top;
dat.top_left.col = left;
dat.top_left.row = top;
dat.rinfo.reloc_type = GNM_EXPR_RELOCATE_MOVE_RANGE;
dat.rinfo.origin_sheet = dat.rinfo.target_sheet = pt->sheet;
if (pt->paste_flags & PASTE_EXPR_LOCAL_RELOCATE) {
......@@ -639,7 +639,7 @@ clipboard_copy_obj (Sheet *sheet, GSList *objects)
#warning FIXME : This is only used in gnm_sog_write_image
/* NOTE #1 : It seems necessary to handle pasting an object that has been removed from
* the sheet after being added to the clipboard. it seems like we would need
* this sort of information for anything that implements SheetObjectImageableIface
* this sort of information for anything that implements SheetObjectImageableIface
**/
sheet_object_anchor_to_pts (anchor, sheet, coords);
w = fabs (coords[2] - coords[0]) + 1.5;
......@@ -875,7 +875,7 @@ int
cellregion_cmd_size (GnmCellRegion const *cr)
{
int res = 1;
g_return_val_if_fail (cr != NULL, 1);
res += g_slist_length (cr->styles);
......
......@@ -292,7 +292,7 @@ cb_int_descending (gconstpointer a, gconstpointer b)
*/
GSList *
gnm_slist_sort_merge (GSList *l1,
gnm_slist_sort_merge (GSList *l1,
GSList *l2)
{
GSList list, *l, *m;
......@@ -316,7 +316,7 @@ gnm_slist_sort_merge (GSList *l1,
}
}
l->next = l1 ? l1 : l2;
return list.next;
}
......
......@@ -677,7 +677,7 @@ cb_autofit_row (GnmColRowIter const *iter, gpointer data_)
min = MAX (min, iter->cri->size_pixels);
if (data->min_default)
min = MAX (min, sheet_row_get_default_size_pixels (data->sheet));
if (size > min)
sheet_row_set_size_pixels (data->sheet, iter->pos, size, FALSE);
......
......@@ -134,11 +134,11 @@ gboolean cmd_data_shuffle (WorkbookControl *wbc, struct _data_shuffling_t *sc, S
gboolean cmd_text_to_columns (WorkbookControl *wbc,
GnmRange const *src, Sheet *src_sheet,
GnmRange const *target, Sheet *target_sheet,
GnmRange const *src, Sheet *src_sheet,
GnmRange const *target, Sheet *target_sheet,
GnmCellRegion *content);
gboolean cmd_solver (WorkbookControl *wbc,
gboolean cmd_solver (WorkbookControl *wbc,
GSList *cells, GSList *ov, GSList *nv);
gboolean cmd_goal_seek (WorkbookControl *wbc,
......@@ -146,7 +146,7 @@ gboolean cmd_goal_seek (WorkbookControl *wbc,
gboolean cmd_tabulate (WorkbookControl *wbc, gpointer data);
gboolean cmd_so_graph_config (WorkbookControl *wbc, SheetObject *sog,
gboolean cmd_so_graph_config (WorkbookControl *wbc, SheetObject *sog,
GObject *n_graph, GObject *o_graph);
gboolean cmd_toggle_rtl (WorkbookControl *wbc, Sheet *sheet);
......
......@@ -168,8 +168,8 @@ consolidate_check_destination (GnmConsolidate *cs, data_analysis_output_t *dao)
if (dao->type == NewSheetOutput || dao->type == NewWorkbookOutput)
return TRUE;
range_init (&r, dao->start_col, dao->start_row,
dao->start_col + dao->cols - 1,
range_init (&r, dao->start_col, dao->start_row,
dao->start_col + dao->cols - 1,
dao->start_row + dao->rows - 1);
new = gnm_sheet_range_new (dao->sheet, &r);
......@@ -531,7 +531,7 @@ cb_row_tree (GnmValue const *key, TreeItem *ti, ConsolidateContext *cc)
GnmConsolidate *cs = cc->cs;
if (cs->mode & CONSOLIDATE_COPY_LABELS)
dao_set_cell_value (cc->dao, -1, 0, value_dup (key));
dao_set_cell_value (cc->dao, -1, 0, value_dup (key));
simple_consolidate (cs->fd, ti->val, FALSE, cc->dao);
......@@ -579,7 +579,7 @@ cb_col_tree (GnmValue const *key, TreeItem *ti, ConsolidateContext *cc)
GnmConsolidate *cs = cc->cs;
if (cs->mode & CONSOLIDATE_COPY_LABELS)
dao_set_cell_value (cc->dao, 0, -1, value_dup (key));
dao_set_cell_value (cc->dao, 0, -1, value_dup (key));
simple_consolidate (cs->fd, ti->val, FALSE, cc->dao);
......@@ -677,12 +677,12 @@ colrow_consolidate (GnmConsolidate *cs, data_analysis_output_t *dao)
if (cs->mode & CONSOLIDATE_COPY_LABELS) {
for (l = rows, y = 1; l != NULL; l = l->next, y++) {
GnmValue const *row_name = l->data;
dao_set_cell_value (dao, 0, y, value_dup (row_name));
}
for (m = cols, x = 1; m != NULL; m = m->next, x++) {
GnmValue const *col_name = m->data;
dao_set_cell_value (dao, x, 0, value_dup (col_name));
}
dao->offset_col = 1;
......@@ -700,7 +700,7 @@ colrow_consolidate (GnmConsolidate *cs, data_analysis_output_t *dao)
if (args) {
GnmExpr const *expr = gnm_expr_new_funcall (cs->fd, args);
dao_set_cell_expr (dao, x, y, expr);
}
}
......@@ -711,7 +711,7 @@ colrow_consolidate (GnmConsolidate *cs, data_analysis_output_t *dao)
}
static gboolean
consolidate_apply (GnmConsolidate *cs,
consolidate_apply (GnmConsolidate *cs,
data_analysis_output_t *dao)
{
/* WorkbookView *wbv = wb_control_view (wbc); */
......@@ -740,8 +740,8 @@ consolidate_apply (GnmConsolidate *cs,
gboolean
tool_consolidate_engine (data_analysis_output_t *dao, gpointer specs,
gboolean
tool_consolidate_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result)
{
GnmConsolidate *cs = specs;
......@@ -750,34 +750,34 @@ tool_consolidate_engine (data_analysis_output_t *dao, gpointer specs,
case TOOL_ENGINE_UPDATE_DESCRIPTOR:
return (dao_command_descriptor (dao, _("Consolidating to (%s)"),
result) == NULL);
case TOOL_ENGINE_UPDATE_DAO:
case TOOL_ENGINE_UPDATE_DAO:
{
GnmRange r;
range_init (&r, 0, 0, 0, 0);
get_bounding_box (cs->src, &r);
if ((cs->mode & CONSOLIDATE_ROW_LABELS) &&
if ((cs->mode & CONSOLIDATE_ROW_LABELS) &&
(cs->mode & CONSOLIDATE_COL_LABELS))
dao_adjust (dao, r.end.col + 1 +
dao_adjust (dao, r.end.col + 1 +
((cs->mode & CONSOLIDATE_COPY_LABELS) ?
1 : 0),
r.end.row + 1 +
1 : 0),
r.end.row + 1 +
((cs->mode & CONSOLIDATE_COPY_LABELS) ?
1 : 0));
else if (cs->mode & CONSOLIDATE_ROW_LABELS)
dao_adjust (dao, r.end.col + 1,
r.end.row + 1 +
dao_adjust (dao, r.end.col + 1,
r.end.row + 1 +
((cs->mode & CONSOLIDATE_COPY_LABELS) ?
1 : 0));
else if (cs->mode & CONSOLIDATE_COL_LABELS)
dao_adjust (dao, r.end.col + 1 +
dao_adjust (dao, r.end.col + 1 +
((cs->mode & CONSOLIDATE_COPY_LABELS) ?
1 : 0),
1 : 0),
r.end.row + 1);
else
dao_adjust (dao, r.end.col + 1,
dao_adjust (dao, r.end.col + 1,
r.end.row + 1);
return FALSE;
}
......
......@@ -40,14 +40,14 @@ GnmConsolidate *consolidate_new (void);
void consolidate_free (GnmConsolidate *cs, gboolean content_only);
void consolidate_set_function (GnmConsolidate *cs, GnmFunc *fd);
void consolidate_set_mode (GnmConsolidate *cs,
void consolidate_set_mode (GnmConsolidate *cs,
GnmConsolidateMode mode);
gboolean consolidate_add_source (GnmConsolidate *cs, GnmValue *range);
gboolean consolidate_check_destination (GnmConsolidate *cs,
gboolean consolidate_check_destination (GnmConsolidate *cs,
data_analysis_output_t *dao);
gboolean tool_consolidate_engine (data_analysis_output_t *dao, gpointer specs,
gboolean tool_consolidate_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
#endif
......@@ -524,7 +524,7 @@ expr_name_add (GnmParsePos const *pp, char const *name,
*error_msg = (pp->sheet != NULL)
? g_strdup_printf (_("'%s' is already defined in sheet"), name)
: g_strdup_printf (_("'%s' is already defined in workbook"), name);
gnm_expr_top_unref (texpr);
return NULL;
}
......@@ -912,7 +912,7 @@ sheet_names_check (Sheet const *sheet, GnmRange const *r)
* @texpr: string to be the value of the name
* @is_editable: whether this is a predefined action
*
* This is a wrapper around expr_name_add to set this as permanent name.
* This is a wrapper around expr_name_add to set this as permanent name.
*
*
**/
......
......@@ -896,7 +896,7 @@ bin_array_iter_a (GnmEvalPos const *ep,
GnmExpr const *expr)
{
BinOpImplicitIteratorState iter_info;
/* a must be a cellrange or array, it can not be NULL */
iter_info.ep = ep;
iter_info.func = func;
......@@ -1251,7 +1251,7 @@ gnm_expr_eval (GnmExpr const *expr, GnmEvalPos const *pos,
value_area_get_width (a, pos),
value_area_get_height (a, pos));
value_area_foreach (a, pos, CELL_ITER_ALL,
(GnmValueIterFunc) ((GNM_EXPR_GET_OPER (expr) == GNM_EXPR_OP_UNARY_NEG)
(GnmValueIterFunc) ((GNM_EXPR_GET_OPER (expr) == GNM_EXPR_OP_UNARY_NEG)
? cb_iter_unary_neg : cb_iter_percentage),
res);
value_release (a);
......@@ -1599,7 +1599,7 @@ do_expr_as_string (GnmExpr const *expr, int paren_level,
return;
}
case GNM_EXPR_OP_ARRAY_CORNER:
case GNM_EXPR_OP_ARRAY_CORNER:
do_expr_as_string (expr->array_corner.expr, 0, out);
return;
......@@ -1725,7 +1725,7 @@ reloc_range (GnmExprRelocateInfo const *rinfo,
rng->start.row += rinfo->row_offset;
rng->end.row += rinfo->row_offset;
return TRUE;
}
}
if (rinfo->col_offset == 0) {
if (start && rinfo->row_offset < range_height (rng)) {
......@@ -1779,14 +1779,14 @@ reloc_normalize_cellref (RelocInfoInternal const *rinfo, GnmCellRef const *ref,
res->col += rinfo->details->pos.eval.col;
else
res->col = 0;
}
}
res->row = ref->row;
if (ref->row_relative) {
if (rinfo->check_rels)
res->row += rinfo->details->pos.eval.row;
else
res->row = 0;
}
}
}
/* Return TRUE if @pos is out of bounds */
......@@ -1822,7 +1822,7 @@ reloc_restore_cellref (RelocInfoInternal const *rinfo,
return FALSE;
}
static GnmExpr const *
reloc_cellrange (RelocInfoInternal const *rinfo, GnmValueRange const *v)
{
......@@ -2762,7 +2762,7 @@ gnm_expr_top_equal (GnmExprTop const *te1, GnmExprTop const *te2)
* same cell after the move.
* GNM_EXPR_RELOCATE_COLS
* GNM_EXPR_RELOCATE_ROWS
*
*
*/
GnmExprTop const *
gnm_expr_top_relocate (GnmExprTop const *texpr,
......@@ -2922,7 +2922,7 @@ gnm_expr_top_get_array_corner (GnmExprTop const *texpr)
g_return_val_if_fail (IS_GNM_EXPR_TOP (texpr), NULL);
return GNM_EXPR_GET_OPER (texpr->expr) == GNM_EXPR_OP_ARRAY_CORNER
? &texpr->expr->array_corner
: NULL;
: NULL;
}
gboolean
......
......@@ -138,7 +138,7 @@ gnumeric_table_link (GnmFuncEvalInfo *ei)
GnmDependent *dep = ei->pos->dep;
GnmRangeRef rr;
rr.a.col_relative = rr.a.row_relative =
rr.a.col_relative = rr.a.row_relative =
rr.b.col_relative = rr.b.row_relative = FALSE;
rr.a.sheet = rr.b.sheet = dep->sheet;
......@@ -193,7 +193,7 @@ gnumeric_table (GnmFuncEvalInfo *ei, int argc, GnmExprConstPtr const *argv)
val[2] = NULL;
if (NULL != in[0] && NULL != in[1]) {
in[2] = sheet_cell_get (ei->pos->sheet,
in[2] = sheet_cell_get (ei->pos->sheet,
ei->pos->eval.col - 1, ei->pos->eval.row - 1);
if (NULL == in[2])
in[2] = sheet_cell_fetch (ei->pos->sheet,
......
......@@ -60,7 +60,7 @@ inline void
gnm_func_load_if_stub (GnmFunc *func)
{
if (func->fn_type == GNM_FUNC_TYPE_STUB)
gnm_func_load_stub (func);
gnm_func_load_stub (func);
}
static void
......@@ -202,8 +202,8 @@ split_at_colon (char const *s, char **rest)
* A generic utility routine to operate on all funtion defs
* in various ways. @dump_type will change/extend as needed
* Right now
* 0 :
* 1 :
* 0 :
* 1 :
* 2 :
* 3 : dump function usage count
**/
......@@ -358,12 +358,12 @@ function_dump_defs (char const *filename, int dump_type)
/* FIXME: Optional args? */
break;
}
case GNM_FUNC_HELP_EXAMPLES:
case GNM_FUNC_HELP_END:
case GNM_FUNC_HELP_NOTE:
break;
}
}
g_string_free (syntax, TRUE);
......@@ -1169,7 +1169,7 @@ function_call_with_exprs (GnmFuncEvalInfo *ei, GnmExprEvalFlags flags)
break;
}
}
while (i < fn_def->fn.args.max_args)
args [i++] = NULL;
......@@ -1316,7 +1316,7 @@ typedef struct {
**/
static GnmValue *
cb_iterate_cellrange (GnmCellIter const *iter, gpointer user)
{
IterateCallbackClosure *data = user;
GnmCell *cell;
......@@ -1371,7 +1371,7 @@ function_iterate_do_value (GnmEvalPos const *ep,
case VALUE_EMPTY:
case VALUE_BOOLEAN:
case VALUE_FLOAT:
case VALUE_FLOAT:
case VALUE_STRING:
res = (*callback)(ep, value, closure);
break;
......
......@@ -69,7 +69,7 @@ go_conf_sync (GOConfNode *node)
gconf_client_suggest_sync (gconf_client, NULL);
}
void
void
go_conf_set_bool (GOConfNode *node, gchar const *key, gboolean val)
{
gchar *real_key = go_conf_get_real_key (node, key);
......@@ -77,7 +77,7 @@ go_conf_set_bool (GOConfNode *node, gchar const *key, gboolean val)
g_free (real_key);
}
void
void
go_conf_set_int (GOConfNode *node, gchar const *key, gint val)
{
gchar *real_key = go_conf_get_real_key (node, key);
......@@ -85,7 +85,7 @@ go_conf_set_int (GOConfNode *node, gchar const *key, gint val)
g_free (real_key);
}
void
void
go_conf_set_double (GOConfNode *node, gchar const *key, gnm_float val)
{
gchar *real_key = go_conf_get_real_key (node, key);
......@@ -93,7 +93,7 @@ go_conf_set_double (GOConfNode *node, gchar const *key, gnm_float val)
g_free (real_key);
}
void
void
go_conf_set_string (GOConfNode *node, gchar const *key, gchar const *str)
{
gchar *real_key = go_conf_get_real_key (node, key);
......@@ -217,7 +217,7 @@ gchar *
go_conf_load_string (GOConfNode *node, gchar const *key)
{
gchar *val;
gchar *real_key = go_conf_get_real_key (node, key);
val = gconf_client_get_string (gconf_client, real_key, NULL);
g_free (real_key);
......@@ -229,12 +229,12 @@ GSList *
go_conf_load_str_list (GOConfNode *node, gchar const *key)
{
GSList *list;
gchar *real_key = go_conf_get_real_key (node, key);
list = gconf_client_get_list (gconf_client, real_key,
GCONF_VALUE_STRING, NULL);
g_free (real_key);
return list;
}
......@@ -450,13 +450,13 @@ go_conf_add_monitor (GOConfNode *node, gchar const *key,
guint ret;
GOConfClosure *close = g_new0 (GOConfClosure, 1);
gchar *real_key;
close->monitor = monitor;
close->data = data;
real_key = go_conf_get_real_key (node, key);
ret = gconf_client_notify_add (gconf_client, real_key,
(GConfClientNotifyFunc) cb_key_changed, close, g_free, NULL);
g_free (real_key);
return ret;
}
......@@ -158,7 +158,7 @@ go_conf_set_str_list (GOConfNode *node, gchar const *key, GSList *list)
list = list->next;
}
g_key_file_set_string_list (key_file, STRLIST_GROUP, real_key,
g_key_file_set_string_list (key_file, STRLIST_GROUP, real_key,
(gchar const **const) strs, ns);
g_free (real_key);
......@@ -320,7 +320,7 @@ go_conf_load_double (GOConfNode *node, gchar const *key,
if (err) {
val = default_val;
g_error_free (err);
} else {
} else {
val = g_ascii_strtod (ptr, NULL);
if (val < minima || val > maxima) {
val = default_val;
......@@ -347,8 +347,8 @@ go_conf_load_string (GOConfNode *node, gchar const *key)
g_warning (err->message);
#endif
g_error_free (err);
}
}
g_free (real_key);
return val;
}
......@@ -401,7 +401,7 @@ go_conf_get_type (GOConfNode *node, gchar const *key)
}
g_strfreev (groups);
}
g_free (real_key);
return type;
......@@ -413,7 +413,7 @@ go_conf_get_value_as_str (GOConfNode *node, gchar const *key)
gchar *val = NULL;
gchar *real_key = go_conf_get_real_key (node, key);
val = g_key_file_get_string (key_file, STRING_GROUP, real_key, NULL);
g_free (real_key);
g_free (real_key);
return val;
}
......
......@@ -38,7 +38,7 @@ go_conf_win32_get_node (GOConfNode *node, HKEY *phKey, gchar const *key, gboolea
0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS,
NULL, phKey, &disposition);
g_free (path);
if (is_new)
*is_new = disposition == REG_CREATED_NEW_KEY;
......@@ -202,7 +202,7 @@ go_conf_free_node (GOConfNode *node)
}
}
void
void
go_conf_set_bool (GOConfNode *node, gchar const *key, gboolean val)
{
guchar bool = val ? 1 : 0;
......@@ -211,14 +211,14 @@ go_conf_set_bool (GOConfNode *node, gchar const *key, gboolean val)
sizeof (bool));
}
void
void
go_conf_set_int (GOConfNode *node, gchar const *key, gint val)
{
go_conf_win32_set (node, key, REG_DWORD, (guchar *) &val,
sizeof (DWORD));
}
void
void
go_conf_set_double (GOConfNode *node, gchar const *key, gnm_float val)
{
gchar str[G_ASCII_DTOSTR_BUF_SIZE];
......@@ -228,7 +228,7 @@ go_conf_set_double (GOConfNode *node, gchar const *key, gnm_float val)
strlen (str) + 1);
}
void
void
go_conf_set_string (GOConfNode *node, gchar const *key, gchar const *str)
{
go_conf_win32_set (node, key, REG_SZ, (guchar *) str,
......
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* gnm-datetime.c:
* gnm-datetime.c:
*
* Copyright (C) 2005
* Miguel de Icaza (miguel@gnu.org)
......@@ -155,7 +155,7 @@ yearfrac (GDate const *from, GDate const *to, basis_t basis)
(g_date_get_month (to) * 0x100 + g_date_get_day (to) >= 2 * 0x100 + 29)))
feb29s = 1;
else
feb29s = 0;
feb29s = 0;
}
peryear = 365 + (gnm_float)feb29s / years;
......
......@@ -277,7 +277,7 @@ gnm_graph_window_set_graph (GnmGraphWindow *window,
gtk_container_add (GTK_CONTAINER (window->scrolled_window), window->graph);
gtk_widget_size_request (window->toolbar, &toolbar_requisition);
gtk_window_set_default_size (GTK_WINDOW (window),
gtk_window_set_default_size (GTK_WINDOW (window),
(int) graph_width,
(int) graph_height + toolbar_requisition.height);
......
......@@ -1045,8 +1045,8 @@ cb_pane_drag_motion (GtkWidget *widget, GdkDragContext *context,
NULL, NULL, &mask);
gnm_pane_objects_drag (GNM_PANE (source_widget), NULL,
wx, wy, 8, FALSE, (mask & GDK_SHIFT_MASK) != 0);
gdk_drag_status (context,
(mask & GDK_CONTROL_MASK) != 0 ? GDK_ACTION_COPY : GDK_ACTION_MOVE,
gdk_drag_status (context,
(mask & GDK_CONTROL_MASK) != 0 ? GDK_ACTION_COPY : GDK_ACTION_MOVE,
time);
}
return TRUE;
......@@ -1077,7 +1077,7 @@ cb_pane_drag_leave (GtkWidget *widget, GdkDragContext *context,
GtkWidget *source_widget = gtk_drag_get_source_widget (context);
GnmPane *source_pane;
WBCGtk *wbcg;
if (!source_widget || !IS_GNM_PANE (source_widget)) return;
source_pane = GNM_PANE (source_widget);
......@@ -2539,7 +2539,7 @@ gnm_pane_drag_begin (GnmPane *pane, SheetObject *so, GdkEvent *event)
target_list_add_list (targets, im_targets);
gtk_target_list_unref (im_targets);
}
}
}
if (imageable) {
im_targets = sheet_object_get_target_list (imageable);
if (im_targets != NULL) {
......@@ -2684,7 +2684,7 @@ cb_control_point_event (FooCanvasItem *ctrl_pt, GdkEvent *event, GnmPane *pane)
* the semantics of the col,row args in the callback. However,
* that is more work than I want to do right now.
*/
if (idx == 8)
if (idx == 8)
gnm_pane_drag_begin (pane, so, event);
else if (gnm_pane_handle_motion (GNM_PANE (ctrl_pt->canvas),
ctrl_pt->canvas, &event->motion,
......
......@@ -165,7 +165,7 @@ cb_gnm_so_line_changed (GnmSOLine const *sol,
{
GogStyleLine const *style = &sol->style->line;
GdkColor buf, *gdk = NULL;
if (style->color != 0 && style->width >= 0 && style->pattern != 0)
gdk = go_color_to_gdk (style->color, &buf);
......
......@@ -64,7 +64,7 @@ gnm_conf_init_page_setup (GOConfNode *node)
gchar *paper;
double margin;
GtkPageOrientation orient;
prefs.page_setup = gtk_page_setup_new ();
paper = go_conf_load_string (node, PRINTSETUP_GCONF_PAPER);
......@@ -107,7 +107,7 @@ gnm_conf_init_page_setup (GOConfNode *node)
0., 720. , 72.);
gtk_page_setup_set_right_margin (prefs.page_setup, margin,
GTK_UNIT_POINTS);
}
}
......@@ -117,7 +117,7 @@ gnm_conf_init_print_settings (GOConfNode *node)
GSList *list, *item;
char const *key;
char const *value;
prefs.print_settings = gtk_print_settings_new ();
item = list = go_conf_load_str_list (node, PRINTSETUP_GCONF_GTKSETTING);
......@@ -131,7 +131,7 @@ gnm_conf_init_print_settings (GOConfNode *node)
gtk_print_settings_set (prefs.print_settings, key, value);
}
}
go_slist_free_custom (list, g_free);
}
......@@ -163,7 +163,7 @@ static void
gnm_conf_init_essential (void)
{
GOConfNode *node;
node = go_conf_get_node (root, CONF_DEFAULT_FONT_DIR);
prefs.default_font.name = go_conf_load_string (node, CONF_DEFAULT_FONT_NAME);
if (prefs.default_font.name == NULL)
......@@ -222,39 +222,39 @@ gnm_gconf_init_printer_defaults (void)
if (prefs.print_settings != NULL)
return;
node = go_conf_get_node (root, PRINTSETUP_GCONF_DIR);
gnm_conf_init_print_settings (node);
gnm_conf_init_page_setup (node);
prefs.print_center_horizontally = go_conf_load_bool