From 427c7a92282a6ee8def483774f8655648d2e6564 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 4 Nov 2002 14:53:49 +0000 Subject: Replace gtk_signal_emit() with g_signal_emit(). Likewise. Likewise. * e-folder-list.c: Replace gtk_signal_emit() with g_signal_emit(). * e-folder.c: Likewise. * e-shell-folder-selection-dialog.c: Likewise. * e-shell-folder-title-bar.c: Likewise. * e-shell-offline-handler.c: Likewise. * e-shell-view.c: Likewise. * e-shortcuts-view.c: Likewise. * e-shortcuts.c: Likewise. * e-storage-set-view.c: Likewise. * e-storage-set.c: Likewise. * e-storage.c: Likewise. * evolution-activity-client.c: Likewise. * evolution-folder-selector-button.c: Likewise. * evolution-storage-listener.c: Likewise. * evolution-storage-set-view-listener.c: Likewise. svn path=/trunk/; revision=18524 --- shell/ChangeLog | 18 ++++++++++++++++++ shell/e-folder-list.c | 4 ++-- shell/e-folder.c | 24 ++++++++++++------------ shell/e-shell-folder-selection-dialog.c | 13 ++++++------- shell/e-shell-folder-title-bar.c | 9 ++++----- shell/e-shell-offline-handler.c | 10 +++++----- shell/e-shell-view.c | 18 +++++++++--------- shell/e-shortcuts-view.c | 14 +++++++------- shell/e-shortcuts.c | 19 +++++++++---------- shell/e-storage-set-view.c | 21 ++++++++------------- shell/e-storage-set.c | 22 ++++++++++------------ shell/e-storage.c | 8 ++++---- shell/evolution-activity-client.c | 4 ++-- shell/evolution-folder-selector-button.c | 9 +++------ shell/evolution-storage-listener.c | 11 +++++------ shell/evolution-storage-set-view-listener.c | 4 ++-- 16 files changed, 106 insertions(+), 102 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 7a14605c0e..c2fc81b19c 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,21 @@ +2002-11-04 Ettore Perazzoli + + * e-folder-list.c: Replace gtk_signal_emit() with g_signal_emit(). + * e-folder.c: Likewise. + * e-shell-folder-selection-dialog.c: Likewise. + * e-shell-folder-title-bar.c: Likewise. + * e-shell-offline-handler.c: Likewise. + * e-shell-view.c: Likewise. + * e-shortcuts-view.c: Likewise. + * e-shortcuts.c: Likewise. + * e-storage-set-view.c: Likewise. + * e-storage-set.c: Likewise. + * e-storage.c: Likewise. + * evolution-activity-client.c: Likewise. + * evolution-folder-selector-button.c: Likewise. + * evolution-storage-listener.c: Likewise. + * evolution-storage-set-view-listener.c: Likewise. + 2002-11-04 Ettore Perazzoli * e-folder-list.c: Use g_object_set_data() instead of diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c index e604c9c428..7aef708dae 100644 --- a/shell/e-folder-list.c +++ b/shell/e-folder-list.c @@ -133,7 +133,7 @@ create_display_string (EFolderList *efl, char *folder_uri, char *folder_name) static void e_folder_list_changed (EFolderList *efl) { - gtk_signal_emit (GTK_OBJECT (efl), signals[CHANGED]); + g_signal_emit (efl, signals[CHANGED], 0); } static void @@ -375,7 +375,7 @@ remove_clicked (GtkButton *button, EFolderList *efl) static void optionmenu_changed (EOptionMenu *option_menu, int value, EFolderList *efl) { - gtk_signal_emit (GTK_OBJECT (efl), signals[OPTION_MENU_CHANGED], value); + g_signal_emit (efl, signals[OPTION_MENU_CHANGED], 0, value); } static void diff --git a/shell/e-folder.c b/shell/e-folder.c index bf129d44fe..112b8d7def 100644 --- a/shell/e-folder.c +++ b/shell/e-folder.c @@ -51,7 +51,7 @@ struct _EFolderPrivate { priority value are compared by name, while folders with a higher priority number always come after the folders with a lower priority number. */ - int sorting_priority; + int sorting_priority; unsigned int self_highlight : 1; unsigned int is_stock : 1; @@ -342,8 +342,8 @@ e_folder_set_name (EFolder *folder, g_free (folder->priv->name); folder->priv->name = g_strdup (name); - gtk_signal_emit (GTK_OBJECT (folder), signals[NAME_CHANGED]); - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[NAME_CHANGED], 0); + g_signal_emit (folder, signals[CHANGED], 0); } void @@ -357,7 +357,7 @@ e_folder_set_type_string (EFolder *folder, g_free (folder->priv->type); folder->priv->type = g_strdup (type); - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } void @@ -371,7 +371,7 @@ e_folder_set_description (EFolder *folder, g_free (folder->priv->description); folder->priv->description = g_strdup (description); - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } void @@ -388,7 +388,7 @@ e_folder_set_physical_uri (EFolder *folder, g_free (folder->priv->physical_uri); folder->priv->physical_uri = g_strdup (physical_uri); - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } void @@ -400,7 +400,7 @@ e_folder_set_unread_count (EFolder *folder, folder->priv->unread_count = unread_count; - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } void @@ -415,7 +415,7 @@ e_folder_set_child_highlight (EFolder *folder, else folder->priv->child_highlight--; - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } void @@ -427,7 +427,7 @@ e_folder_set_is_stock (EFolder *folder, folder->priv->is_stock = !! is_stock; - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } void @@ -438,7 +438,7 @@ e_folder_set_can_sync_offline (EFolder *folder, folder->priv->can_sync_offline = !! can_sync_offline; - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } /** @@ -464,7 +464,7 @@ e_folder_set_custom_icon (EFolder *folder, g_free (folder->priv->custom_icon_name); folder->priv->custom_icon_name = g_strdup (icon_name); - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } } @@ -490,7 +490,7 @@ e_folder_set_sorting_priority (EFolder *folder, folder->priv->sorting_priority = sorting_priority; - gtk_signal_emit (GTK_OBJECT (folder), signals[CHANGED]); + g_signal_emit (folder, signals[CHANGED], 0); } diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c index 46c6e0dde3..e23cbec95c 100644 --- a/shell/e-shell-folder-selection-dialog.c +++ b/shell/e-shell-folder-selection-dialog.c @@ -216,13 +216,13 @@ impl_clicked (GnomeDialog *dialog, switch (button_number) { case 0: /* OK */ if (check_folder_type_valid (folder_selection_dialog)) { - gtk_signal_emit (GTK_OBJECT (folder_selection_dialog), signals[FOLDER_SELECTED], - e_shell_folder_selection_dialog_get_selected_path (folder_selection_dialog)); + g_signal_emit (folder_selection_dialog, signals[FOLDER_SELECTED], 0, + e_shell_folder_selection_dialog_get_selected_path (folder_selection_dialog)); gnome_dialog_close (GNOME_DIALOG (dialog)); } break; case 1: /* Cancel */ - gtk_signal_emit (GTK_OBJECT (folder_selection_dialog), signals[CANCELLED]); + g_signal_emit (folder_selection_dialog, signals[CANCELLED], 0); gnome_dialog_close (GNOME_DIALOG (dialog)); break; case 2: /* Add */ @@ -324,7 +324,7 @@ delete_event_cb (GtkWidget *w, GdkEvent *event, gpointer data) { EShellFolderSelectionDialog *dialog = data; - gtk_signal_emit (GTK_OBJECT (dialog), signals[CANCELLED]); + g_signal_emit (dialog, signals[CANCELLED], 0); return TRUE; } @@ -340,9 +340,8 @@ double_click_cb (EStorageSetView *essv, g_return_if_fail (folder_selection_dialog != NULL); if (check_folder_type_valid (folder_selection_dialog)) { - gtk_signal_emit (GTK_OBJECT (folder_selection_dialog), - signals[FOLDER_SELECTED], - e_shell_folder_selection_dialog_get_selected_path (folder_selection_dialog)); + g_signal_emit (folder_selection_dialog, signals[FOLDER_SELECTED], 0, + e_shell_folder_selection_dialog_get_selected_path (folder_selection_dialog)); gnome_dialog_close (GNOME_DIALOG (folder_selection_dialog)); } } diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index 40d8b8ad65..93549bf1b5 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -315,7 +315,7 @@ back_button_clicked_callback (GtkButton *button, folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (data); - gtk_signal_emit (GTK_OBJECT (folder_title_bar), signals[BACK_CLICKED]); + g_signal_emit (folder_title_bar, signals[BACK_CLICKED], 0); } static void @@ -326,7 +326,7 @@ forward_button_clicked_callback (GtkButton *button, folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (data); - gtk_signal_emit (GTK_OBJECT (folder_title_bar), signals[FORWARD_CLICKED]); + g_signal_emit (folder_title_bar, signals[FORWARD_CLICKED], 0); } static void @@ -375,9 +375,8 @@ title_button_toggled_cb (GtkToggleButton *title_button, EShellFolderTitleBar *folder_title_bar; folder_title_bar = E_SHELL_FOLDER_TITLE_BAR (data); - gtk_signal_emit (GTK_OBJECT (folder_title_bar), - signals[TITLE_TOGGLED], - gtk_toggle_button_get_active (title_button)); + g_signal_emit (folder_title_bar, signals[TITLE_TOGGLED], 0, + gtk_toggle_button_get_active (title_button)); } diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c index 9e30b6d9c9..6c782ec406 100644 --- a/shell/e-shell-offline-handler.c +++ b/shell/e-shell-offline-handler.c @@ -212,7 +212,7 @@ impl_OfflineProgressListener_updateProgress (PortableServer_Servant servant, update_dialog_clist (offline_handler); if (priv->num_total_connections == 0 && ! priv->finished) { - gtk_signal_emit (GTK_OBJECT (offline_handler), signals[OFFLINE_PROCEDURE_FINISHED], TRUE); + g_signal_emit (offline_handler, signals[OFFLINE_PROCEDURE_FINISHED], 0, TRUE); priv->finished = TRUE; } } @@ -372,7 +372,7 @@ cancel_offline (EShellOfflineHandler *offline_handler) priv->num_total_connections = 0; if (! priv->finished) { - gtk_signal_emit (GTK_OBJECT (offline_handler), signals[OFFLINE_PROCEDURE_FINISHED], FALSE); + g_signal_emit (offline_handler, signals[OFFLINE_PROCEDURE_FINISHED], 0, FALSE); priv->finished = TRUE; } } @@ -505,7 +505,7 @@ finalize_offline (EShellOfflineHandler *offline_handler) if (priv->num_total_connections == 0 && ! priv->finished) { /* Nothing else to do, we are all set. */ - gtk_signal_emit (GTK_OBJECT (offline_handler), signals[OFFLINE_PROCEDURE_FINISHED], TRUE); + g_signal_emit (offline_handler, signals[OFFLINE_PROCEDURE_FINISHED], 0, TRUE); priv->finished = TRUE; } @@ -819,14 +819,14 @@ e_shell_offline_handler_put_components_offline (EShellOfflineHandler *offline_ha g_object_ref (offline_handler); - gtk_signal_emit (GTK_OBJECT (offline_handler), signals[OFFLINE_PROCEDURE_STARTED]); + g_signal_emit (offline_handler, signals[OFFLINE_PROCEDURE_STARTED], 0); priv->finished = FALSE; if (! prepare_for_offline (offline_handler)) { /* FIXME: Maybe do something smarter here. */ g_warning ("Couldn't put components off-line"); - gtk_signal_emit (GTK_OBJECT (offline_handler), signals[OFFLINE_PROCEDURE_FINISHED], FALSE); + g_signal_emit (offline_handler, signals[OFFLINE_PROCEDURE_FINISHED], 0, FALSE); priv->finished = TRUE; g_object_unref (offline_handler); return; diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 2db76cc72c..1d0da0db5c 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -2359,11 +2359,11 @@ display_uri (EShellView *shell_view, bonobo_ui_engine_thaw (bonobo_window_get_ui_engine (BONOBO_WINDOW (shell_view))); - gtk_signal_emit (GTK_OBJECT (shell_view), signals[VIEW_CHANGED], - e_shell_view_get_current_path (shell_view), - e_shell_view_get_current_uri (shell_view), - e_shell_view_get_current_folder_type (shell_view), - e_shell_view_get_current_component_id (shell_view)); + g_signal_emit (shell_view, signals[VIEW_CHANGED], 0, + e_shell_view_get_current_path (shell_view), + e_shell_view_get_current_uri (shell_view), + e_shell_view_get_current_folder_type (shell_view), + e_shell_view_get_current_component_id (shell_view)); g_free (allocated_uri); @@ -2413,8 +2413,8 @@ e_shell_view_show_shortcut_bar (EShellView *shell_view, priv->shortcut_bar_shown = !! show; - gtk_signal_emit (GTK_OBJECT (shell_view), signals[SHORTCUT_BAR_VISIBILITY_CHANGED], - priv->shortcut_bar_shown); + g_signal_emit (shell_view, signals[SHORTCUT_BAR_VISIBILITY_CHANGED], 0, + priv->shortcut_bar_shown); } void @@ -2458,8 +2458,8 @@ e_shell_view_show_folder_bar (EShellView *shell_view, priv->folder_bar_shown = !! show; - gtk_signal_emit (GTK_OBJECT (shell_view), signals[FOLDER_BAR_VISIBILITY_CHANGED], - priv->folder_bar_shown); + g_signal_emit (shell_view, signals[FOLDER_BAR_VISIBILITY_CHANGED], 0, + priv->folder_bar_shown); } void diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index 779a5c55be..87092d91f3 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -141,7 +141,7 @@ hide_shortcut_bar_cb (GtkWidget *widget, shortcut_view = E_SHORTCUTS_VIEW (menu_data->shortcuts_view); - gtk_signal_emit (GTK_OBJECT (shortcut_view), signals[HIDE_REQUESTED]); + g_signal_emit (shortcut_view, signals[HIDE_REQUESTED], 0); } static void @@ -172,7 +172,7 @@ destroy_group_cb (GtkWidget *widget, shortcuts = priv->shortcuts; title = e_utf8_to_locale_string (e_shortcuts_get_group_title ( - shortcuts, menu_data->group_num)); + shortcuts, menu_data->group_num)); question = g_strdup_printf (_("Do you really want to remove group\n" "`%s' from the shortcut bar?"), title); g_free (title); @@ -340,8 +340,8 @@ open_shortcut_helper (ShortcutRightClickMenuData *menu_data, if (shortcut_item == NULL) return; - gtk_signal_emit (GTK_OBJECT (shortcuts_view), signals[ACTIVATE_SHORTCUT], - shortcuts, shortcut_item->uri, in_new_window); + g_signal_emit (shortcuts_view, signals[ACTIVATE_SHORTCUT], 0, + shortcuts, shortcut_item->uri, in_new_window); } static void @@ -414,7 +414,7 @@ static GnomeUIInfo shortcut_right_click_menu_uiinfo[] = { open_shortcut_in_new_window_cb), GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_ITEM_NONE (N_("_Rename"), N_("Rename this shortcut"), - rename_shortcut_cb), + rename_shortcut_cb), GNOMEUIINFO_ITEM_STOCK (N_("Re_move"), N_("Remove this shortcut from the shortcut bar"), remove_shortcut_cb, GTK_STOCK_REMOVE), GNOMEUIINFO_END @@ -517,8 +517,8 @@ item_selected (EShortcutBar *shortcut_bar, if (shortcut_item == NULL) return; - gtk_signal_emit (GTK_OBJECT (shortcuts_view), signals[ACTIVATE_SHORTCUT], - shortcuts, shortcut_item->uri, FALSE); + g_signal_emit (shortcuts_view, signals[ACTIVATE_SHORTCUT], 0, + shortcuts, shortcut_item->uri, FALSE); } static void diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index efa0ce01f9..e05d688812 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -237,13 +237,13 @@ update_shortcut_and_emit_signal (EShortcuts *shortcuts, /* Only thing that changed was the unread count */ if (shortcut_item->unread_count != unread_count && !shortcut_item_update (shortcut_item, uri, name, unread_count, type, custom_icon_name)) { - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[UPDATE_SHORTCUT], group_num, num); + g_signal_emit (shortcuts, signals[UPDATE_SHORTCUT], 0, group_num, num); return FALSE; } /* Unread count is the same, but other stuff changed */ else if (shortcut_item_update (shortcut_item, uri, name, unread_count, type, custom_icon_name)) { - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[UPDATE_SHORTCUT], group_num, num); + g_signal_emit (shortcuts, signals[UPDATE_SHORTCUT], 0, group_num, num); return TRUE; } @@ -265,7 +265,7 @@ unload_shortcuts (EShortcuts *shortcuts) for (p = priv->groups; p != NULL; p = p->next) { ShortcutGroup *group; - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[REMOVE_GROUP], 0); + g_signal_emit (shortcuts, signals[REMOVE_GROUP], 0, 0); group = (ShortcutGroup *) p->data; @@ -968,7 +968,7 @@ e_shortcuts_remove_shortcut (EShortcuts *shortcuts, p = g_slist_nth (group->shortcuts, num); g_return_if_fail (p != NULL); - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[REMOVE_SHORTCUT], group_num, num); + g_signal_emit (shortcuts, signals[REMOVE_SHORTCUT], 0, group_num, num); item = (EShortcutItem *) p->data; shortcut_item_free (item); @@ -1010,7 +1010,7 @@ e_shortcuts_add_shortcut (EShortcuts *shortcuts, group->shortcuts = g_slist_insert (group->shortcuts, item, num); - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[NEW_SHORTCUT], group_num, num); + g_signal_emit (shortcuts, signals[NEW_SHORTCUT], 0, group_num, num); make_dirty (shortcuts); } @@ -1096,7 +1096,7 @@ e_shortcuts_remove_group (EShortcuts *shortcuts, p = g_slist_nth (priv->groups, group_num); g_return_if_fail (p != NULL); - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[REMOVE_GROUP], group_num); + g_signal_emit (shortcuts, signals[REMOVE_GROUP], 0, group_num); shortcut_group_free ((ShortcutGroup *) p->data); @@ -1130,7 +1130,7 @@ e_shortcuts_rename_group (EShortcuts *shortcuts, } else return; - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[RENAME_GROUP], group_num, new_title); + g_signal_emit (shortcuts, signals[RENAME_GROUP], 0, group_num, new_title); make_dirty (shortcuts); } @@ -1156,7 +1156,7 @@ e_shortcuts_add_group (EShortcuts *shortcuts, priv->groups = g_slist_insert (priv->groups, group, group_num); priv->num_groups ++; - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[NEW_GROUP], group_num); + g_signal_emit (shortcuts, signals[NEW_GROUP], 0, group_num); make_dirty (shortcuts); } @@ -1206,8 +1206,7 @@ e_shortcuts_set_group_uses_small_icons (EShortcuts *shortcuts, use_small_icons = !! use_small_icons; if (group->use_small_icons != use_small_icons) { group->use_small_icons = use_small_icons; - gtk_signal_emit (GTK_OBJECT (shortcuts), signals[GROUP_CHANGE_ICON_SIZE], - group_num, use_small_icons); + g_signal_emit (shortcuts, signals[GROUP_CHANGE_ICON_SIZE], 0, group_num, use_small_icons); make_dirty (shortcuts); } diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 1990adda21..4b47bec962 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -1142,7 +1142,7 @@ impl_tree_drag_motion (ETree *tree, return FALSE; folder_path = e_tree_memory_node_get_data (E_TREE_MEMORY (priv->etree_model), - e_tree_node_at_row (E_TREE (storage_set_view), row)); + e_tree_node_at_row (E_TREE (storage_set_view), row)); if (folder_path == NULL) return FALSE; @@ -1244,14 +1244,11 @@ impl_right_click (ETree *etree, priv->right_click_row_path = g_strdup (e_tree_memory_node_get_data (E_TREE_MEMORY(priv->etree_model), path)); if (priv->ui_container) { - gtk_signal_emit (GTK_OBJECT (storage_set_view), - signals[FOLDER_CONTEXT_MENU_POPPING_UP], - priv->right_click_row_path); + g_signal_emit (storage_set_view, signals[FOLDER_CONTEXT_MENU_POPPING_UP], 0, priv->right_click_row_path); popup_folder_menu (storage_set_view, (GdkEventButton *) event); - gtk_signal_emit (GTK_OBJECT (storage_set_view), - signals[FOLDER_CONTEXT_MENU_POPPED_DOWN]); + g_signal_emit (storage_set_view, signals[FOLDER_CONTEXT_MENU_POPPED_DOWN], 0); } g_free (priv->right_click_row_path); @@ -1276,8 +1273,8 @@ impl_cursor_activated (ETree *tree, if (path) { priv->selected_row_path = g_strdup (e_tree_memory_node_get_data (E_TREE_MEMORY (priv->etree_model), path)); - gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED], - priv->selected_row_path); + g_signal_emit (storage_set_view, signals[FOLDER_SELECTED], 0, + priv->selected_row_path); } else priv->selected_row_path = NULL; @@ -1473,8 +1470,7 @@ etree_fill_in_children (ETreeModel *etree, parent = e_tree_model_node_get_parent (etree, tree_path); path = (char *) e_tree_memory_node_get_data (E_TREE_MEMORY(etree), parent); if (tree_path == e_tree_model_node_get_first_child (etree, parent)) { - gtk_signal_emit (GTK_OBJECT (storage_set_view), - signals[FOLDER_OPENED], path); + g_signal_emit (storage_set_view, signals[FOLDER_OPENED], 0, path); } } @@ -1518,8 +1514,7 @@ etree_set_value_at (ETreeModel *etree, } e_tree_model_node_col_changed (etree, tree_path, col); - gtk_signal_emit (GTK_OBJECT (storage_set_view), - signals[CHECKBOXES_CHANGED]); + g_signal_emit (storage_set_view, signals[CHECKBOXES_CHANGED], 0); break; } } @@ -2207,7 +2202,7 @@ e_storage_set_view_set_current_folder (EStorageSetView *storage_set_view, g_free (priv->selected_row_path); priv->selected_row_path = g_strdup (path); - gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED], path); + g_signal_emit (storage_set_view, signals[FOLDER_SELECTED], 0, path); } const char * diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c index d6b4ea1366..3a105b924b 100644 --- a/shell/e-storage-set.c +++ b/shell/e-storage-set.c @@ -170,10 +170,8 @@ storage_callback (EStorage *storage, storage_callback_data->data); if (storage_callback_data->operation == OPERATION_MOVE) - gtk_signal_emit (GTK_OBJECT (storage_callback_data->storage_set), - signals[MOVED_FOLDER], - storage_callback_data->source_path, - storage_callback_data->destination_path); + g_signal_emit (storage_callback_data->storage_set, signals[MOVED_FOLDER], 0, + storage_callback_data->source_path, storage_callback_data->destination_path); storage_callback_data_free (storage_callback_data); } @@ -214,7 +212,7 @@ storage_new_folder_cb (EStorage *storage, storage_set = E_STORAGE_SET (data); full_path = make_full_path (storage, path); - gtk_signal_emit (GTK_OBJECT (storage_set), signals[NEW_FOLDER], full_path); + g_signal_emit (storage_set, signals[NEW_FOLDER], 0, full_path); g_free (full_path); } @@ -229,7 +227,7 @@ storage_updated_folder_cb (EStorage *storage, storage_set = E_STORAGE_SET (data); full_path = make_full_path (storage, path); - gtk_signal_emit (GTK_OBJECT (storage_set), signals[UPDATED_FOLDER], full_path); + g_signal_emit (storage_set, signals[UPDATED_FOLDER], 0, full_path); g_free (full_path); } @@ -244,7 +242,7 @@ storage_removed_folder_cb (EStorage *storage, storage_set = E_STORAGE_SET (data); full_path = make_full_path (storage, path); - gtk_signal_emit (GTK_OBJECT (storage_set), signals[REMOVED_FOLDER], full_path); + g_signal_emit (storage_set, signals[REMOVED_FOLDER], 0, full_path); g_free (full_path); } @@ -259,7 +257,7 @@ storage_close_folder_cb (EStorage *storage, storage_set = E_STORAGE_SET (data); full_path = make_full_path (storage, path); - gtk_signal_emit (GTK_OBJECT (storage_set), signals[CLOSE_FOLDER], full_path); + g_signal_emit (storage_set, signals[CLOSE_FOLDER], 0, full_path); g_free (full_path); } @@ -310,7 +308,7 @@ signal_new_folder_for_all_folders_under_paths (EStorageSet *storage_set, path = (const char *) p->data; path_with_storage = g_strconcat (E_PATH_SEPARATOR_S, e_storage_get_name (storage), path, NULL); - gtk_signal_emit (GTK_OBJECT (storage_set), signals[NEW_FOLDER], path_with_storage); + g_signal_emit (storage_set, signals[NEW_FOLDER], 0, path_with_storage); g_free (path_with_storage); sub_path_list = e_storage_get_subfolder_paths (storage, path); @@ -534,7 +532,7 @@ e_storage_set_add_storage (EStorageSet *storage_set, named_storage = named_storage_new (storage); g_hash_table_insert (priv->name_to_named_storage, named_storage->name, named_storage); - gtk_signal_emit (GTK_OBJECT (storage_set), signals[NEW_STORAGE], storage); + g_signal_emit (storage_set, signals[NEW_STORAGE], 0, storage); signal_new_folder_for_all_folders_in_storage (storage_set, storage); @@ -565,7 +563,7 @@ e_storage_set_remove_storage (EStorageSet *storage_set, priv->storages = g_list_remove (priv->storages, storage); - gtk_signal_emit (GTK_OBJECT (storage_set), signals[REMOVED_STORAGE], storage); + g_signal_emit (storage_set, signals[REMOVED_STORAGE], 0, storage); g_object_unref (storage); return TRUE; @@ -587,7 +585,7 @@ e_storage_set_remove_all_storages (EStorageSet *storage_set) storage = E_STORAGE (p->data); - gtk_signal_emit (GTK_OBJECT (storage_set), signals[REMOVED_STORAGE], storage); + g_signal_emit (storage_set, signals[REMOVED_STORAGE], 0, storage); g_object_unref (storage); } diff --git a/shell/e-storage.c b/shell/e-storage.c index 7f72ec665d..4d2a924b42 100644 --- a/shell/e-storage.c +++ b/shell/e-storage.c @@ -110,7 +110,7 @@ folder_changed_cb (EFolder *folder, path = e_folder_tree_get_path_for_data (priv->folder_tree, folder); g_assert (path != NULL); - gtk_signal_emit (GTK_OBJECT (storage), signals[UPDATED_FOLDER], path); + g_signal_emit (storage, signals[UPDATED_FOLDER], 0, path); highlight = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (folder), "last_highlight")); if (highlight != e_folder_get_highlighted (folder)) { @@ -711,7 +711,7 @@ e_storage_new_folder (EStorage *storage, g_signal_connect_object (e_folder, "changed", G_CALLBACK (folder_changed_cb), storage, 0); - gtk_signal_emit (GTK_OBJECT (storage), signals[NEW_FOLDER], path); + g_signal_emit (storage, signals[NEW_FOLDER], 0, path); folder_changed_cb (e_folder, storage); @@ -736,7 +736,7 @@ e_storage_has_subfolders (EStorage *storage, priv = storage->priv; - gtk_signal_emit (GTK_OBJECT (storage), signals[CLOSE_FOLDER], path); + g_signal_emit (storage, signals[CLOSE_FOLDER], 0, path); if (g_hash_table_lookup (priv->pseudofolders, path)) return TRUE; @@ -794,7 +794,7 @@ e_storage_removed_folder (EStorage *storage, g_free (parent_path); } - gtk_signal_emit (GTK_OBJECT (storage), signals[REMOVED_FOLDER], path); + g_signal_emit (storage, signals[REMOVED_FOLDER], 0, path); e_folder_tree_remove (priv->folder_tree, path); diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c index 29bfd2226a..4f9cf01cc4 100644 --- a/shell/evolution-activity-client.c +++ b/shell/evolution-activity-client.c @@ -147,9 +147,9 @@ listener_callback (BonoboListener *listener, activity_client = EVOLUTION_ACTIVITY_CLIENT (data); if (strcmp (event_name, "ShowDetails") == 0) - gtk_signal_emit (GTK_OBJECT (activity_client), signals[SHOW_DETAILS]); + g_signal_emit (activity_client, signals[SHOW_DETAILS], 0); else if (strcmp (event_name, "Cancel") == 0) - gtk_signal_emit (GTK_OBJECT (activity_client), signals[CANCEL]); + g_signal_emit (activity_client, signals[CANCEL], 0); else g_warning ("EvolutionActivityClient: Unknown event from listener -- %s", event_name); } diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c index 26a119e449..7c1d6afeab 100644 --- a/shell/evolution-folder-selector-button.c +++ b/shell/evolution-folder-selector-button.c @@ -159,8 +159,7 @@ clicked (GtkButton *button) else initial_uri = ""; - gtk_signal_emit (GTK_OBJECT (folder_selector_button), - signals[POPPED_UP]); + g_signal_emit (folder_selector_button, signals[POPPED_UP], 0); evolution_shell_client_user_select_folder (priv->shell_client, parent_window, @@ -185,15 +184,13 @@ clicked (GtkButton *button) g_object_unref (parent_window); if (!return_folder) { - gtk_signal_emit (GTK_OBJECT (folder_selector_button), - signals[CANCELED]); + g_signal_emit (folder_selector_button, signals[CANCELED], 0); return; } set_folder (folder_selector_button, return_folder); - gtk_signal_emit (GTK_OBJECT (folder_selector_button), - signals[SELECTED], return_folder); + g_signal_emit (folder_selector_button, signals[SELECTED], 0, return_folder); } diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c index 9d1c225f02..d9bd3c6aa5 100644 --- a/shell/evolution-storage-listener.c +++ b/shell/evolution-storage-listener.c @@ -74,7 +74,7 @@ impl_GNOME_Evolution_StorageListener_notifyDestroyed (PortableServer_Servant ser listener = gtk_object_from_servant (servant); priv = listener->priv; - gtk_signal_emit (GTK_OBJECT (listener), signals[DESTROYED]); + g_signal_emit (listener, signals[DESTROYED], 0); } static void @@ -89,7 +89,7 @@ impl_GNOME_Evolution_StorageListener_notifyFolderCreated (PortableServer_Servant listener = gtk_object_from_servant (servant); priv = listener->priv; - gtk_signal_emit (GTK_OBJECT (listener), signals[NEW_FOLDER], path, folder); + g_signal_emit (listener, signals[NEW_FOLDER], 0, path, folder); } static void @@ -104,8 +104,7 @@ impl_GNOME_Evolution_StorageListener_notifyFolderUpdated (PortableServer_Servant listener = gtk_object_from_servant (servant); priv = listener->priv; - gtk_signal_emit (GTK_OBJECT (listener), signals[UPDATE_FOLDER], path, - unread_count); + g_signal_emit (listener, signals[UPDATE_FOLDER], 0, path, unread_count); } static void @@ -119,7 +118,7 @@ impl_GNOME_Evolution_StorageListener_notifyFolderRemoved (PortableServer_Servant listener = gtk_object_from_servant (servant); priv = listener->priv; - gtk_signal_emit (GTK_OBJECT (listener), signals[REMOVED_FOLDER], path); + g_signal_emit (listener, signals[REMOVED_FOLDER], 0, path); } static void @@ -134,7 +133,7 @@ impl_GNOME_Evolution_StorageListener_notifyHasSubfolders (PortableServer_Servant listener = gtk_object_from_servant (servant); priv = listener->priv; - gtk_signal_emit (GTK_OBJECT (listener), signals[HAS_SUBFOLDERS], path, message); + g_signal_emit (listener, signals[HAS_SUBFOLDERS], 0, path, message); } static EvolutionStorageListenerServant * diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c index e5e52fe797..f397601e49 100644 --- a/shell/evolution-storage-set-view-listener.c +++ b/shell/evolution-storage-set-view-listener.c @@ -69,7 +69,7 @@ impl_GNOME_Evolution_StorageSetViewListener_notifyFolderSelected (PortableServer listener = gtk_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (listener), signals[FOLDER_SELECTED], uri); + g_signal_emit (listener, signals[FOLDER_SELECTED], 0, uri); } static void @@ -80,7 +80,7 @@ impl_GNOME_Evolution_StorageSetViewListener_notifyFolderToggled (PortableServer_ listener = gtk_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (listener), signals[FOLDER_TOGGLED]); + g_signal_emit (listener, signals[FOLDER_TOGGLED], 0); } static EvolutionStorageSetViewListenerServant * -- cgit v1.2.3