diff options
Diffstat (limited to 'widgets')
-rw-r--r-- | widgets/menus/gal-view-instance-save-as-dialog.c | 2 | ||||
-rw-r--r-- | widgets/misc/e-canvas-background.c | 2 | ||||
-rw-r--r-- | widgets/misc/e-canvas.c | 8 | ||||
-rw-r--r-- | widgets/misc/e-charset-picker.c | 2 | ||||
-rw-r--r-- | widgets/misc/e-filter-bar.c | 2 | ||||
-rw-r--r-- | widgets/misc/e-filter-bar.h | 2 | ||||
-rw-r--r-- | widgets/table/a11y/gal-a11y-e-table-item.c | 2 | ||||
-rw-r--r-- | widgets/table/e-cell-hbox.c | 10 | ||||
-rw-r--r-- | widgets/table/e-table-col.c | 2 | ||||
-rw-r--r-- | widgets/table/e-table-config.c | 2 | ||||
-rw-r--r-- | widgets/table/e-table.c | 2 | ||||
-rw-r--r-- | widgets/table/e-tree-selection-model.c | 2 | ||||
-rw-r--r-- | widgets/table/e-tree.c | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 142806d514..bad4c20bc6 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -35,7 +35,7 @@ G_DEFINE_TYPE (GalViewInstanceSaveAsDialog, gal_view_instance_save_as_dialog, GT /* The arguments we take */ enum { PROP_0, - PROP_INSTANCE, + PROP_INSTANCE }; enum { diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 77cad661e1..4d300f01d4 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -74,7 +74,7 @@ enum { PROP_X1, PROP_X2, PROP_Y1, - PROP_Y2, + PROP_Y2 }; static void diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 3cb85c5839..903331576e 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -837,7 +837,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id) if (func) func(info->item, flags, info->id); g_message ("ECANVAS: free info (2): item %p, id %p", - info->item, info->id); + (gpointer) info->item, (gpointer) info->id); g_object_unref (info->item); g_free(info); } @@ -851,7 +851,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id) info->item = item; g_object_ref (info->item); info->id = id; - g_message ("ECANVAS: new info item %p, id %p", item, id); + g_message ("ECANVAS: new info item %p, id %p", (gpointer) item, (gpointer) id); flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR; func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item), @@ -920,7 +920,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id) info->item = item; g_object_ref (info->item); info->id = id; - g_message ("ECANVAS: new info (2): item %p, id %p", item, id); + g_message ("ECANVAS: new info (2): item %p, id %p", (gpointer) item, (gpointer) id); func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item), "ECanvasItem::selection_callback"); @@ -967,7 +967,7 @@ e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id) canvas->cursor = NULL; g_message ("ECANVAS: removing info: item %p, info %p", - info->item, info->id); + (gpointer) info->item, (gpointer) info->id); g_object_unref (info->item); g_free(info); g_list_free_1(list); diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 6b30b3b11c..81505dcb02 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -46,7 +46,7 @@ typedef enum { E_CHARSET_TURKISH, E_CHARSET_UNICODE, E_CHARSET_WESTERN_EUROPEAN, - E_CHARSET_WESTERN_EUROPEAN_NEW, + E_CHARSET_WESTERN_EUROPEAN_NEW } ECharsetClass; static const char *classnames[] = { diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 2125bdf30d..6d4bff46ca 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -37,7 +37,7 @@ enum { PROP_0, PROP_QUERY, - PROP_STATE, + PROP_STATE }; static gpointer parent_class; diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index edc20e2fec..957eea3d0b 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -107,7 +107,7 @@ enum { E_FILTERBAR_CURRENT_MESSAGE_ID = -6, E_FILTERBAR_CURRENT_FOLDER_ID = -7, E_FILTERBAR_CURRENT_ACCOUNT_ID = -8, - E_FILTERBAR_ALL_ACCOUNTS_ID = -9, + E_FILTERBAR_ALL_ACCOUNTS_ID = -9 }; #define E_FILTERBAR_SAVE { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, 0 } diff --git a/widgets/table/a11y/gal-a11y-e-table-item.c b/widgets/table/a11y/gal-a11y-e-table-item.c index 16d50df9b0..e28d0f6b83 100644 --- a/widgets/table/a11y/gal-a11y-e-table-item.c +++ b/widgets/table/a11y/gal-a11y-e-table-item.c @@ -760,7 +760,7 @@ enum { ETI_HEADER_UNCHANGED = 0, ETI_HEADER_REORDERED, ETI_HEADER_NEW_ADDED, - ETI_HEADER_REMOVED, + ETI_HEADER_REMOVED }; /* diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index 6c0bded852..5552bd33b2 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -152,15 +152,15 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, /* Now cause our subcells to draw their contents, shifted by subcell_offset pixels */ int width = allotted_width * hbox_view->def_size_cols[i] / 100; - //e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); -// if (width < hbox_view->def_size_cols[i]) - // width = hbox_view->def_size_cols[i]; -// printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); + /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); + if (width < hbox_view->def_size_cols[i]) + width = hbox_view->def_size_cols[i]; + printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */ e_cell_draw (hbox_view->subcell_views[i], drawable, hbox_view->model_cols[i], view_col, row, flags, x1 + subcell_offset , y1, x1 + subcell_offset + width, y2); - subcell_offset += width; //e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); + subcell_offset += width; /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); */ } } diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 8d90267a5e..892ff7cc5d 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -31,7 +31,7 @@ G_DEFINE_TYPE (ETableCol, e_table_col, G_TYPE_OBJECT) enum { PROP_0, - PROP_COMPARE_COL, + PROP_COMPARE_COL }; static void diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 5f93c32a72..0e69c45754 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -54,7 +54,7 @@ enum { enum { PROP_0, - PROP_STATE, + PROP_STATE }; enum { diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 754607c376..47ecd4bb45 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -656,7 +656,7 @@ e_table_setup_header (ETable *e_table) gtk_widget_show (GTK_WIDGET (e_table->header_canvas)); - pointer = g_strdup_printf("%p", e_table); + pointer = g_strdup_printf("%p", (gpointer) e_table); e_table->header_item = gnome_canvas_item_new ( gnome_canvas_root (e_table->header_canvas), diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 4eef7a9ad6..2b903ca0bc 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -36,7 +36,7 @@ enum { PROP_CURSOR_ROW, PROP_CURSOR_COL, PROP_MODEL, - PROP_ETTA, + PROP_ETTA }; struct ETreeSelectionModelPriv { diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 08399609a0..c9637cf70e 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -704,7 +704,7 @@ e_tree_setup_header (ETree *e_tree) gtk_widget_show (GTK_WIDGET (e_tree->priv->header_canvas)); - pointer = g_strdup_printf("%p", e_tree); + pointer = g_strdup_printf("%p", (gpointer) e_tree); e_tree->priv->header_item = gnome_canvas_item_new ( gnome_canvas_root (e_tree->priv->header_canvas), |