aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-folder-selection-dialog.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-04 06:08:16 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-04 06:08:16 +0800
commitede7fcb220b739c4d12775904086afe0df595acd (patch)
treecae8198cf8f57d3e08d13c03538e69a411f8a45c /shell/e-shell-folder-selection-dialog.c
parent9cbba714fc0eb122c0736b94727b4d2580b9d53c (diff)
downloadgsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.gz
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.bz2
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.lz
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.xz
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.zst
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.zip
Changed all gtk_object_refs()/gtk_object_unrefs() into
* *.c, *.h: Changed all gtk_object_refs()/gtk_object_unrefs() into g_object_refs()/g_object_unrefs() and all gtk_signal_connect_*() into g_signal_connect_*(). [Except for some case where we have gtk_signal_connect_full() or gtk_signal_connect_while_alive() calls that cannot be trivially ported to use the g_signal_* functions, we'll have to fix those later.] * e-splash.c (impl_finalize): Finalize implementation, copied over from impl_destroy. (impl_destroy): Removed. (class_init): Override finalize, not destroy. * e-activity-handler.c: Ported from GtkObject to GObject. * evolution-storage.c: Likewise. * e-corba-shortcuts.c: Likewise. * evolution-session.h: Likewise. * evolution-config-control.c: Likewise. * evolution-shell-component-dnd.c: Likewise. * evolution-shell-component.c: Likewise. * evolution-shell-view.c: Likewise. * evolution-storage-set-view.c: Likewise. * evolution-wizard.c: Likewise. svn path=/trunk/; revision=18513
Diffstat (limited to 'shell/e-shell-folder-selection-dialog.c')
-rw-r--r--shell/e-shell-folder-selection-dialog.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c
index 3c9df7cbce..46c6e0dde3 100644
--- a/shell/e-shell-folder-selection-dialog.c
+++ b/shell/e-shell-folder-selection-dialog.c
@@ -187,7 +187,7 @@ impl_destroy (GtkObject *object)
save_expanded_state (folder_selection_dialog);
if (priv->storage_set != NULL)
- gtk_object_unref (GTK_OBJECT (priv->storage_set));
+ g_object_unref (priv->storage_set);
e_free_string_list (priv->allowed_types);
@@ -386,8 +386,8 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
gtk_window_set_default_size (GTK_WINDOW (folder_selection_dialog), 350, 300);
gtk_window_set_modal (GTK_WINDOW (folder_selection_dialog), TRUE);
gtk_window_set_title (GTK_WINDOW (folder_selection_dialog), title);
- gtk_signal_connect (GTK_OBJECT (folder_selection_dialog), "delete_event",
- GTK_SIGNAL_FUNC (delete_event_cb), folder_selection_dialog);
+ g_signal_connect (folder_selection_dialog, "delete_event",
+ G_CALLBACK (delete_event_cb), folder_selection_dialog);
gnome_dialog_append_buttons (GNOME_DIALOG (folder_selection_dialog),
GNOME_STOCK_BUTTON_OK,
@@ -399,10 +399,12 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
/* Make sure we get destroyed if the shell gets destroyed. */
+#if 0
priv->shell = shell;
gtk_signal_connect_object_while_alive (GTK_OBJECT (shell), "destroy",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
+ G_CALLBACK (gtk_widget_destroy),
GTK_OBJECT (folder_selection_dialog));
+#endif
/* Set up the label. */
@@ -417,7 +419,7 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
/* Set up the storage set and its view. */
priv->storage_set = e_shell_get_storage_set (shell);
- gtk_object_ref (GTK_OBJECT (priv->storage_set));
+ g_object_ref (priv->storage_set);
priv->storage_set_view = e_storage_set_create_new_view (priv->storage_set, NULL);
e_storage_set_view_set_allow_dnd (E_STORAGE_SET_VIEW (priv->storage_set_view), FALSE);
@@ -432,12 +434,8 @@ e_shell_folder_selection_dialog_construct (EShellFolderSelectionDialog *folder_s
g_free (filename);
- gtk_signal_connect (GTK_OBJECT (priv->storage_set_view), "double_click",
- GTK_SIGNAL_FUNC (double_click_cb),
- folder_selection_dialog);
- gtk_signal_connect (GTK_OBJECT (priv->storage_set_view), "folder_selected",
- GTK_SIGNAL_FUNC (folder_selected_cb),
- folder_selection_dialog);
+ g_signal_connect (priv->storage_set_view, "double_click", G_CALLBACK (double_click_cb), folder_selection_dialog);
+ g_signal_connect (priv->storage_set_view, "folder_selected", G_CALLBACK (folder_selected_cb), folder_selection_dialog);
g_assert (priv->allowed_types == NULL);
if (allowed_types != NULL) {