diff options
Diffstat (limited to 'widgets')
50 files changed, 74 insertions, 74 deletions
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c index f00d63c2dc..1ce2514b0c 100644 --- a/widgets/table/e-cell-checkbox.c +++ b/widgets/table/e-cell-checkbox.c @@ -45,7 +45,7 @@ e_cell_checkbox_class_init (GtkObjectClass *object_class) checks [1] = gdk_pixbuf_new_from_xpm_data (check_filled_xpm); } -E_MAKE_TYPE(e_cell_checkbox, "ECellCheckbox", ECellCheckbox, e_cell_checkbox_class_init, NULL, PARENT_TYPE); +E_MAKE_TYPE(e_cell_checkbox, "ECellCheckbox", ECellCheckbox, e_cell_checkbox_class_init, NULL, PARENT_TYPE) /** * e_cell_checkbox_new: diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 1844c5c81f..70b5d1ccf7 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -110,7 +110,7 @@ static ECellPopupClass *parent_class; E_MAKE_TYPE (e_cell_combo, "ECellCombo", ECellCombo, e_cell_combo_class_init, e_cell_combo_init, - e_cell_popup_get_type()); + e_cell_popup_get_type()) static void diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index e08efc84de..188d136ce6 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -179,4 +179,4 @@ e_cell_date_new (const char *fontname, GtkJustification justify) return (ECell *) ecd; } -E_MAKE_TYPE(e_cell_date, "ECellDate", ECellDate, e_cell_date_class_init, e_cell_date_init, PARENT_TYPE); +E_MAKE_TYPE(e_cell_date, "ECellDate", ECellDate, e_cell_date_class_init, e_cell_date_init, PARENT_TYPE) diff --git a/widgets/table/e-cell-float.c b/widgets/table/e-cell-float.c index b393c1193a..9b1880be71 100644 --- a/widgets/table/e-cell-float.c +++ b/widgets/table/e-cell-float.c @@ -90,4 +90,4 @@ e_cell_float_new (const char *fontname, GtkJustification justify) return (ECell *) ecn; } -E_MAKE_TYPE(e_cell_float, "ECellFloat", ECellFloat, e_cell_float_class_init, e_cell_float_init, PARENT_TYPE); +E_MAKE_TYPE(e_cell_float, "ECellFloat", ECellFloat, e_cell_float_class_init, e_cell_float_init, PARENT_TYPE) diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c index 77866f3e36..36defa3508 100644 --- a/widgets/table/e-cell-number.c +++ b/widgets/table/e-cell-number.c @@ -82,4 +82,4 @@ e_cell_number_new (const char *fontname, GtkJustification justify) return (ECell *) ecn; } -E_MAKE_TYPE(e_cell_number, "ECellNumber", ECellNumber, e_cell_number_class_init, e_cell_number_init, PARENT_TYPE); +E_MAKE_TYPE(e_cell_number, "ECellNumber", ECellNumber, e_cell_number_class_init, e_cell_number_init, PARENT_TYPE) diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index 565eae8d8b..3fc8ead3f9 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -382,8 +382,8 @@ e_cell_pixbuf_get_type (void) sizeof (ECellPixbufClass), (GtkClassInitFunc) e_cell_pixbuf_class_init, (GtkObjectInitFunc) e_cell_pixbuf_init, - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL, + NULL, + NULL, }; type = gtk_type_unique (e_cell_get_type (), &type_info); diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index bf0104758f..b2a0f3bf03 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -114,7 +114,7 @@ static ECellClass *parent_class; E_MAKE_TYPE (e_cell_popup, "ECellPopup", ECellPopup, e_cell_popup_class_init, - e_cell_popup_init, e_cell_get_type()); + e_cell_popup_init, e_cell_get_type()) static void diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index e24382a6e5..ff18300e65 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -105,4 +105,4 @@ e_cell_size_new (const char *fontname, GtkJustification justify) return (ECell *) ecd; } -E_MAKE_TYPE(e_cell_size, "ECellSize", ECellSize, e_cell_size_class_init, e_cell_size_init, PARENT_TYPE); +E_MAKE_TYPE(e_cell_size, "ECellSize", ECellSize, e_cell_size_class_init, e_cell_size_init, PARENT_TYPE) diff --git a/widgets/table/e-cell-spin-button.c b/widgets/table/e-cell-spin-button.c index 4cbd9f63a8..917cb9e310 100644 --- a/widgets/table/e-cell-spin-button.c +++ b/widgets/table/e-cell-spin-button.c @@ -116,7 +116,7 @@ enum { LAST_SIGNAL }; -static gint signals[LAST_SIGNAL] = { 0 }; +static guint signals[LAST_SIGNAL] = { 0 }; static ECell *parent_class; static void @@ -670,5 +670,5 @@ e_cell_spin_button_step_float (ECellSpinButton *ecsb, E_MAKE_TYPE (e_cell_spin_button, "ECellSpinButton", ECellSpinButton, e_cell_spin_button_class_init, e_cell_spin_button_init, - PARENT_TYPE); + PARENT_TYPE) diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 0d89b28b87..6f5ddcc7c1 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -1573,7 +1573,7 @@ e_cell_text_init (ECellText *ect) ect->editable = TRUE; } -E_MAKE_TYPE(e_cell_text, "ECellText", ECellText, e_cell_text_class_init, e_cell_text_init, PARENT_TYPE); +E_MAKE_TYPE(e_cell_text, "ECellText", ECellText, e_cell_text_class_init, e_cell_text_init, PARENT_TYPE) /** * e_cell_text_construct: diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 4458605e6d..c787b8f07e 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -425,7 +425,7 @@ e_cell_toggle_init (GtkObject *object) etog->n_states = 0; } -E_MAKE_TYPE(e_cell_toggle, "ECellToggle", ECellToggle, e_cell_toggle_class_init, e_cell_toggle_init, PARENT_TYPE); +E_MAKE_TYPE(e_cell_toggle, "ECellToggle", ECellToggle, e_cell_toggle_class_init, e_cell_toggle_init, PARENT_TYPE) /** * e_cell_toggle_construct: diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index f581dab0fa..b6d51038cf 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -698,7 +698,7 @@ e_cell_tree_class_init (GtkObjectClass *object_class) parent_class = gtk_type_class (PARENT_TYPE); } -E_MAKE_TYPE(e_cell_tree, "ECellTree", ECellTree, e_cell_tree_class_init, NULL, PARENT_TYPE); +E_MAKE_TYPE(e_cell_tree, "ECellTree", ECellTree, e_cell_tree_class_init, NULL, PARENT_TYPE) /** * e_cell_tree_construct: diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c index b440370fb3..5d3e261cb0 100644 --- a/widgets/table/e-cell.c +++ b/widgets/table/e-cell.c @@ -159,7 +159,7 @@ e_cell_init (GtkObject *object) { } -E_MAKE_TYPE(e_cell, "ECell", ECell, e_cell_class_init, e_cell_init, PARENT_TYPE); +E_MAKE_TYPE(e_cell, "ECell", ECell, e_cell_class_init, e_cell_init, PARENT_TYPE) /** * e_cell_event: diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h index bc04f32f58..e821ce60c3 100644 --- a/widgets/table/e-cell.h +++ b/widgets/table/e-cell.h @@ -58,12 +58,12 @@ typedef enum { E_CELL_EDITING = 1 << 4, - E_CELL_CURSOR = 1 << 5, + E_CELL_CURSOR = 1 << 5 } ECellFlags; typedef enum { E_CELL_GRAB = 1 << 0, - E_CELL_UNGRAB = 1 << 1, + E_CELL_UNGRAB = 1 << 1 } ECellActions; typedef struct { diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 7c42b8c2e1..6e17ae8b32 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -43,7 +43,7 @@ enum { LAST_SIGNAL }; -static gint etcta_signals [LAST_SIGNAL] = { 0, }; +static guint etcta_signals [LAST_SIGNAL] = { 0 }; #define PARENT_OBJECT_TYPE gnome_canvas_group_get_type () @@ -57,7 +57,7 @@ enum { ARG_MODEL, ARG_MESSAGE, ARG_WIDTH, - ARG_HEIGHT, + ARG_HEIGHT }; static void diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 9b147b198d..7d302f4d80 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -34,7 +34,7 @@ static GtkObjectClass *parent_class; enum { ARG_0, - ARG_SORTABLE, + ARG_SORTABLE }; static void @@ -102,7 +102,7 @@ e_table_col_init (ETableCol *etc) etc->priority = 0; } -E_MAKE_TYPE(e_table_col, "ETableCol", ETableCol, e_table_col_class_init, e_table_col_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_col, "ETableCol", ETableCol, e_table_col_class_init, e_table_col_init, PARENT_TYPE) /** * e_table_col_new: diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c index 30bb80c779..6ff4a67bd3 100644 --- a/widgets/table/e-table-column-specification.c +++ b/widgets/table/e-table-column-specification.c @@ -80,7 +80,7 @@ etcs_init (ETableColumnSpecification *specification) specification->priority = 0; } -E_MAKE_TYPE(e_table_column_specification, "ETableColumnSpecification", ETableColumnSpecification, etcs_class_init, etcs_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_column_specification, "ETableColumnSpecification", ETableColumnSpecification, etcs_class_init, etcs_init, PARENT_TYPE) ETableColumnSpecification * e_table_column_specification_new (void) diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index 0416c5dcd2..e0ae8f169c 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -61,7 +61,7 @@ etcf_init (ETableConfigField *etcf) etcf->child_fields = NULL; } -E_MAKE_TYPE(e_table_config_field, "ETableConfigField", ETableConfigField, etcf_class_init, etcf_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_config_field, "ETableConfigField", ETableConfigField, etcf_class_init, etcf_init, PARENT_TYPE) ETableConfigField * e_table_config_field_new (ETableSpecification *spec, diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index cd9a3359ba..b9922a2d38 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -60,7 +60,7 @@ enum { enum { ARG_0, - ARG_STATE, + ARG_STATE }; static guint e_table_config_signals [LAST_SIGNAL] = { 0, }; @@ -586,13 +586,13 @@ configure_dialog (GladeXML *gui, const char *widget_name, ETableConfig *config) #endif static void -connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, void *cback) +connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, GtkSignalFunc cback) { GtkWidget *button = glade_xml_get_widget (gui, widget_name); if (button) { gtk_signal_connect (GTK_OBJECT (button), "clicked", - GTK_SIGNAL_FUNC (cback), config); + cback, config); } } @@ -1134,4 +1134,4 @@ e_table_config_raise (ETableConfig *config) gdk_window_raise (GTK_WIDGET (config->dialog_toplevel)->window); } -E_MAKE_TYPE(e_table_config, "ETableConfig", ETableConfig, config_class_init, config_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_config, "ETableConfig", ETableConfig, config_class_init, config_init, PARENT_TYPE) diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index e9a18b4f8e..9c5b5fb935 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -136,7 +136,7 @@ ete_init (ETableExtras *extras) e_table_extras_add_cell(extras, "tree-string", e_cell_tree_new (NULL, NULL, TRUE, e_cell_text_new (NULL, GTK_JUSTIFY_LEFT))); } -E_MAKE_TYPE(e_table_extras, "ETableExtras", ETableExtras, ete_class_init, ete_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_extras, "ETableExtras", ETableExtras, ete_class_init, ete_init, PARENT_TYPE) ETableExtras * e_table_extras_new (void) @@ -188,14 +188,14 @@ e_table_extras_add_compare (ETableExtras *extras, g_free (old_key); } - g_hash_table_insert(extras->compares, g_strdup(id), compare); + g_hash_table_insert(extras->compares, g_strdup(id), (gpointer) compare); } GCompareFunc e_table_extras_get_compare (ETableExtras *extras, char *id) { - return g_hash_table_lookup(extras->compares, id); + return (GCompareFunc) g_hash_table_lookup(extras->compares, id); } void diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index 813478798c..fa9def8a6f 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -40,7 +40,7 @@ enum { ARG_0, ARG_DND_CODE, ARG_FULL_HEADER, - ARG_HEADER, + ARG_HEADER }; GtkType diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 5bd71a1fbc..676170d117 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -66,7 +66,7 @@ enum { ARG_HEADER, ARG_DND_CODE, ARG_WIDTH, - ARG_HEIGHT, + ARG_HEIGHT }; static void diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 6f11fad849..85d65817b0 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -39,7 +39,7 @@ enum { ARG_0, ARG_FULL_HEADER, ARG_HEADER, - ARG_DND_CODE, + ARG_DND_CODE }; GtkType diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 6f2ef9ea35..c7185d9007 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -57,7 +57,7 @@ enum { ARG_CURSOR_MODE, ARG_SELECTION_MODEL, ARG_LENGTH_THRESHOLD, - ARG_UNIFORM_ROW_HEIGHT, + ARG_UNIFORM_ROW_HEIGHT }; typedef struct { @@ -1023,7 +1023,7 @@ etgc_init (GtkObject *object) container->uniform_row_height = FALSE; } -E_MAKE_TYPE (e_table_group_container, "ETableGroupContainer", ETableGroupContainer, etgc_class_init, etgc_init, PARENT_TYPE); +E_MAKE_TYPE (e_table_group_container, "ETableGroupContainer", ETableGroupContainer, etgc_class_init, etgc_init, PARENT_TYPE) void e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *closure) diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c index 48e0d28650..f9e34a8920 100644 --- a/widgets/table/e-table-group-leaf.c +++ b/widgets/table/e-table-group-leaf.c @@ -49,7 +49,7 @@ enum { ARG_CURSOR_MODE, ARG_LENGTH_THRESHOLD, ARG_SELECTION_MODEL, - ARG_UNIFORM_ROW_HEIGHT, + ARG_UNIFORM_ROW_HEIGHT }; static void etgl_set_arg (GtkObject *object, GtkArg *arg, guint arg_id); @@ -630,4 +630,4 @@ etgl_init (GtkObject *object) e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM(object), etgl_reflow); } -E_MAKE_TYPE (e_table_group_leaf, "ETableGroupLeaf", ETableGroupLeaf, etgl_class_init, etgl_init, PARENT_TYPE); +E_MAKE_TYPE (e_table_group_leaf, "ETableGroupLeaf", ETableGroupLeaf, etgl_class_init, etgl_init, PARENT_TYPE) diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c index 8606502154..6973d7c387 100644 --- a/widgets/table/e-table-group.c +++ b/widgets/table/e-table-group.c @@ -47,7 +47,7 @@ enum { LAST_SIGNAL }; -static gint etg_signals [LAST_SIGNAL] = { 0, }; +static guint etg_signals [LAST_SIGNAL] = { 0, }; static gboolean etg_get_focus (ETableGroup *etg); static void etg_destroy (GtkObject *object); @@ -699,4 +699,4 @@ etg_class_init (GtkObjectClass *object_class) E_OBJECT_CLASS_ADD_SIGNALS (object_class, etg_signals, LAST_SIGNAL); } -E_MAKE_TYPE (e_table_group, "ETableGroup", ETableGroup, etg_class_init, NULL, PARENT_TYPE); +E_MAKE_TYPE (e_table_group, "ETableGroup", ETableGroup, etg_class_init, NULL, PARENT_TYPE) diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 87b499fb93..ac9512d765 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -99,7 +99,7 @@ enum { ARG_TABLE_FONTSET, ARG_SORT_INFO, ARG_TABLE, - ARG_TREE, + ARG_TREE }; enum { diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index e5eda9fd42..aa4b4ffb75 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -35,7 +35,7 @@ enum { ARG_0, ARG_SORT_INFO, ARG_WIDTH, - ARG_WIDTH_EXTRAS, + ARG_WIDTH_EXTRAS }; enum { diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 10fc205625..b647d1b1bd 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -73,7 +73,7 @@ enum { LAST_SIGNAL }; -static gint eti_signals [LAST_SIGNAL] = { 0, }; +static guint eti_signals [LAST_SIGNAL] = { 0, }; enum { ARG_0, @@ -91,7 +91,7 @@ enum { ARG_MINIMUM_WIDTH, ARG_WIDTH, - ARG_HEIGHT, + ARG_HEIGHT }; #define DOUBLE_CLICK_TIME 250 diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index 8cbbc3a0b4..7a2771843d 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -26,7 +26,7 @@ enum { ARG_0, - ARG_APPEND_ROW, + ARG_APPEND_ROW }; #define PARENT_TYPE e_table_memory_get_type () @@ -143,7 +143,7 @@ etmc_get_arg (GtkObject *o, GtkArg *arg, guint arg_id) switch (arg_id){ case ARG_APPEND_ROW: - GTK_VALUE_POINTER(*arg) = etmc->append_row; + GTK_VALUE_POINTER(*arg) = (gpointer)etmc->append_row; break; } } @@ -155,7 +155,7 @@ etmc_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) switch (arg_id){ case ARG_APPEND_ROW: - etmc->append_row = GTK_VALUE_POINTER(*arg); + etmc->append_row = (ETableMemoryCalbacksAppendRowFn)GTK_VALUE_POINTER(*arg); break; default: arg->type = GTK_TYPE_INVALID; diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index 89dce2756c..258c16ac10 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -32,7 +32,7 @@ #define d(x) -d(static gint depth = 0); +d(static gint depth = 0;) static GtkObjectClass *e_table_model_parent_class; diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c index e5bd0f1f58..6bcc2cb008 100644 --- a/widgets/table/e-table-scrolled.c +++ b/widgets/table/e-table-scrolled.c @@ -42,7 +42,7 @@ static GtkObjectClass *parent_class; enum { ARG_0, - ARG_TABLE, + ARG_TABLE }; static void @@ -220,5 +220,5 @@ e_table_scrolled_class_init (ETableScrolledClass *class) GTK_ARG_READABLE, ARG_TABLE); } -E_MAKE_TYPE(e_table_scrolled, "ETableScrolled", ETableScrolled, e_table_scrolled_class_init, e_table_scrolled_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_scrolled, "ETableScrolled", ETableScrolled, e_table_scrolled_class_init, e_table_scrolled_init, PARENT_TYPE) diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index 5d61904161..5de3ced003 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -41,7 +41,7 @@ static gint etsm_get_row_count (ESelectionModelArray *esm); enum { ARG_0, ARG_MODEL, - ARG_HEADER, + ARG_HEADER }; static void @@ -311,7 +311,7 @@ e_table_selection_model_class_init (ETableSelectionModelClass *klass) } E_MAKE_TYPE(e_table_selection_model, "ETableSelectionModel", ETableSelectionModel, - e_table_selection_model_class_init, e_table_selection_model_init, PARENT_TYPE); + e_table_selection_model_class_init, e_table_selection_model_init, PARENT_TYPE) /** * e_table_selection_model_new diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index b57d0fc275..3d49e4ba88 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -109,7 +109,7 @@ e_table_sort_info_class_init (ETableSortInfoClass *klass) } E_MAKE_TYPE(e_table_sort_info, "ETableSortInfo", ETableSortInfo, - e_table_sort_info_class_init, e_table_sort_info_init, PARENT_TYPE); + e_table_sort_info_class_init, e_table_sort_info_init, PARENT_TYPE) static void e_table_sort_info_sort_info_changed (ETableSortInfo *info) diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index 520e7c3c69..7689d1f33f 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -93,7 +93,7 @@ etsv_init (ETableSortedVariable *etsv) etsv->insert_count = 0; } -E_MAKE_TYPE(e_table_sorted_variable, "ETableSortedVariable", ETableSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_sorted_variable, "ETableSortedVariable", ETableSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE) static gboolean etsv_sort_idle(ETableSortedVariable *etsv) diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c index ae42022162..5cc9c5bfd7 100644 --- a/widgets/table/e-table-sorted.c +++ b/widgets/table/e-table-sorted.c @@ -100,7 +100,7 @@ ets_init (ETableSorted *ets) ets->insert_count = 0; } -E_MAKE_TYPE(e_table_sorted, "ETableSorted", ETableSorted, ets_class_init, ets_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_sorted, "ETableSorted", ETableSorted, ets_class_init, ets_init, PARENT_TYPE) static gboolean ets_sort_idle(ETableSorted *ets) diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index 6afafb6824..7a0c9d9126 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -176,7 +176,7 @@ ets_init (ETableSorter *ets) ets->group_info_changed_id = 0; } -E_MAKE_TYPE(e_table_sorter, "ETableSorter", ETableSorter, ets_class_init, ets_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_sorter, "ETableSorter", ETableSorter, ets_class_init, ets_init, PARENT_TYPE) ETableSorter * e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info) diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c index cabd5b9084..e449d4e9b7 100644 --- a/widgets/table/e-table-specification.c +++ b/widgets/table/e-table-specification.c @@ -92,7 +92,7 @@ etsp_init (ETableSpecification *etsp) etsp->click_to_add_message = NULL; } -E_MAKE_TYPE (e_table_specification, "ETableSpecification", ETableSpecification, etsp_class_init, etsp_init, PARENT_TYPE); +E_MAKE_TYPE (e_table_specification, "ETableSpecification", ETableSpecification, etsp_class_init, etsp_init, PARENT_TYPE) /** * e_table_specification_new: diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 5ac78b2ea4..730103ed8c 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -81,7 +81,7 @@ etst_init (ETableState *state) state->sort_info = e_table_sort_info_new(); } -E_MAKE_TYPE(e_table_state, "ETableState", ETableState, etst_class_init, etst_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_state, "ETableState", ETableState, etst_class_init, etst_init, PARENT_TYPE) ETableState * e_table_state_new (void) diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index 6d298d6050..474fb5586d 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -130,7 +130,7 @@ etssv_class_init (GtkObjectClass *object_class) klass->remove = etssv_remove; } -E_MAKE_TYPE(e_table_subset_variable, "ETableSubsetVariable", ETableSubsetVariable, etssv_class_init, NULL, PARENT_TYPE); +E_MAKE_TYPE(e_table_subset_variable, "ETableSubsetVariable", ETableSubsetVariable, etssv_class_init, NULL, PARENT_TYPE) ETableModel * e_table_subset_variable_construct (ETableSubsetVariable *etssv, diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c index c5399ce402..9518d4a2db 100644 --- a/widgets/table/e-table-subset.c +++ b/widgets/table/e-table-subset.c @@ -266,7 +266,7 @@ etss_init (ETableSubset *etss) etss->last_access = 0; } -E_MAKE_TYPE(e_table_subset, "ETableSubset", ETableSubset, etss_class_init, etss_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_subset, "ETableSubset", ETableSubset, etss_class_init, etss_init, PARENT_TYPE) static void etss_proxy_model_pre_change_real (ETableSubset *etss, ETableModel *etm) diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index f6d4fe3b86..7aa4a2fc1d 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -248,7 +248,7 @@ etw_init (ETableWithout *etw) etw->priv->free_duplicated_key_func = NULL; } -E_MAKE_TYPE(e_table_without, "ETableWithout", ETableWithout, etw_class_init, etw_init, PARENT_TYPE); +E_MAKE_TYPE(e_table_without, "ETableWithout", ETableWithout, etw_class_init, etw_init, PARENT_TYPE) ETableModel * e_table_without_construct (ETableWithout *etw, diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 3a321eee00..7106400d29 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -94,7 +94,7 @@ enum { ARG_0, ARG_LENGTH_THRESHOLD, ARG_MODEL, - ARG_UNIFORM_ROW_HEIGHT, + ARG_UNIFORM_ROW_HEIGHT }; enum { @@ -104,7 +104,7 @@ enum { ET_SCROLL_RIGHT = 1 << 3 }; -static gint et_signals [LAST_SIGNAL] = { 0, }; +static guint et_signals [LAST_SIGNAL] = { 0 }; static void e_table_fill_table (ETable *e_table, ETableModel *model); static gboolean changed_idle (gpointer data); @@ -3144,4 +3144,4 @@ e_table_class_init (ETableClass *class) GTK_ARG_READABLE, ARG_MODEL); } -E_MAKE_TYPE(e_table, "ETable", ETable, e_table_class_init, e_table_init, PARENT_TYPE); +E_MAKE_TYPE(e_table, "ETable", ETable, e_table_class_init, e_table_init, PARENT_TYPE) diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index d288db73e0..8ffdee7771 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -55,7 +55,7 @@ typedef struct _ETableDragSourceSite ETableDragSourceSite; typedef enum { E_TABLE_CURSOR_LOC_NONE = 0, E_TABLE_CURSOR_LOC_ETCTA = 1 << 0, - E_TABLE_CURSOR_LOC_TABLE = 1 << 1, + E_TABLE_CURSOR_LOC_TABLE = 1 << 1 } ETableCursorLoc; typedef struct { diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c index 30a6524c98..93a5e6c702 100644 --- a/widgets/table/e-tree-scrolled.c +++ b/widgets/table/e-tree-scrolled.c @@ -42,7 +42,7 @@ static GtkObjectClass *parent_class; enum { ARG_0, - ARG_TREE, + ARG_TREE }; static void @@ -219,5 +219,5 @@ e_tree_scrolled_class_init (ETreeScrolledClass *class) GTK_ARG_READABLE, ARG_TREE); } -E_MAKE_TYPE(e_tree_scrolled, "ETreeScrolled", ETreeScrolled, e_tree_scrolled_class_init, e_tree_scrolled_init, PARENT_TYPE); +E_MAKE_TYPE(e_tree_scrolled, "ETreeScrolled", ETreeScrolled, e_tree_scrolled_class_init, e_tree_scrolled_init, PARENT_TYPE) diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 7b0e306be0..29c641e879 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -44,7 +44,7 @@ enum { ARG_CURSOR_COL, ARG_MODEL, ARG_ETTA, - ARG_ETS, + ARG_ETS }; typedef struct ETreeSelectionModelNode { @@ -1390,4 +1390,4 @@ e_tree_selection_model_new (void) } E_MAKE_TYPE(e_tree_selection_model, "ETreeSelectionModel", ETreeSelectionModel, - e_tree_selection_model_class_init, e_tree_selection_model_init, PARENT_TYPE); + e_tree_selection_model_class_init, e_tree_selection_model_init, PARENT_TYPE) diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index 18812a7feb..f2a753222a 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -120,7 +120,7 @@ etsv_init (ETreeSortedVariable *etsv) etsv->insert_count = 0; } -E_MAKE_TYPE(e_tree_sorted_variable, "ETreeSortedVariable", ETreeSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE); +E_MAKE_TYPE(e_tree_sorted_variable, "ETreeSortedVariable", ETreeSortedVariable, etsv_class_init, etsv_init, PARENT_TYPE) static gboolean etsv_sort_idle(ETreeSortedVariable *etsv) diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index b65c6cbb1c..2244f1ba11 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -114,7 +114,7 @@ struct ETreeSortedPriv { enum { ARG_0, - ARG_SORT_INFO, + ARG_SORT_INFO }; static void ets_sort_info_changed (ETableSortInfo *sort_info, ETreeSorted *ets); diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index a907efa56b..3f66b6b46c 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -635,7 +635,7 @@ etta_init (ETreeTableAdapter *etta) etta->priv->tree_model_node_request_collapse_id = 0; } -E_MAKE_TYPE(e_tree_table_adapter, "ETreeTableAdapter", ETreeTableAdapter, etta_class_init, etta_init, PARENT_TYPE); +E_MAKE_TYPE(e_tree_table_adapter, "ETreeTableAdapter", ETreeTableAdapter, etta_class_init, etta_init, PARENT_TYPE) static void etta_proxy_pre_change (ETreeModel *etm, ETreeTableAdapter *etta) diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index b3bc4da094..51d807eed4 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -97,7 +97,7 @@ enum { ARG_VERTICAL_DRAW_GRID, ARG_DRAW_FOCUS, ARG_ETTA, - ARG_UNIFORM_ROW_HEIGHT, + ARG_UNIFORM_ROW_HEIGHT }; enum { @@ -191,7 +191,7 @@ struct ETreePriv { GList *expanded_list; }; -static gint et_signals [LAST_SIGNAL] = { 0, }; +static guint et_signals [LAST_SIGNAL] = { 0, }; static void et_grab_focus (GtkWidget *widget); @@ -3147,4 +3147,4 @@ e_tree_class_init (ETreeClass *class) GTK_ARG_READWRITE, ARG_UNIFORM_ROW_HEIGHT); } -E_MAKE_TYPE(e_tree, "ETree", ETree, e_tree_class_init, e_tree_init, PARENT_TYPE); +E_MAKE_TYPE(e_tree, "ETree", ETree, e_tree_class_init, e_tree_init, PARENT_TYPE) |