diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-10-18 04:50:00 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-10-18 04:50:00 +0800 |
| commit | cf1d544b1068c0f04fe5da5344521f140af24016 (patch) | |
| tree | a65dc7287cae8756f90f68ae993e6d3fedfb616d /mail/mail-callbacks.c | |
| parent | 3ced16bfa226cdc03aa6e38552a78976d05ff171 (diff) | |
| download | gsoc2013-evolution-cf1d544b1068c0f04fe5da5344521f140af24016.tar.gz gsoc2013-evolution-cf1d544b1068c0f04fe5da5344521f140af24016.tar.zst gsoc2013-evolution-cf1d544b1068c0f04fe5da5344521f140af24016.zip | |
Helper macro.
2001-10-17 Jeffrey Stedfast <fejj@ximian.com>
* subscribe-dialog.h (subscribe_dialog_show): Helper macro.
* subscribe-dialog.c (subscribe_dialog_run_and_close): Removed.
* mail-callbacks.c (check_send_configuration): Don't use
gnome_dialog_run_and_close() here, we can easily get away with
just using a gtk_widget_show().
(providers_config): Don't use a gnome_dialog_run_and_close() here
either. No longer need to use e_gnome_dialog utils.
(manage_subscriptions): Don't run_and_close().
svn path=/trunk/; revision=13732
Diffstat (limited to 'mail/mail-callbacks.c')
| -rw-r--r-- | mail/mail-callbacks.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index a24141adee..2a4c9d227c 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -2128,7 +2128,7 @@ providers_config (BonoboUIComponent *uih, void *user_data, const char *path) if (!accounts_dialog) { accounts_dialog = mail_accounts_dialog_new (fb->shell); - e_gnome_dialog_set_parent (GNOME_DIALOG (accounts_dialog), FB_WINDOW (fb)); + gnome_dialog_set_parent (GNOME_DIALOG (accounts_dialog), FB_WINDOW (fb)); gtk_signal_connect (GTK_OBJECT (accounts_dialog), "destroy", accounts_dialog_close, NULL); gnome_dialog_set_close (GNOME_DIALOG (accounts_dialog), TRUE); @@ -2229,6 +2229,7 @@ static GtkObject *subscribe_dialog = NULL; static void subscribe_dialog_destroy (GtkWidget *widget, gpointer user_data) { + gtk_object_unref (subscribe_dialog); subscribe_dialog = NULL; } @@ -2237,11 +2238,12 @@ manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path) { if (!subscribe_dialog) { subscribe_dialog = subscribe_dialog_new (); - gtk_signal_connect (GTK_OBJECT (subscribe_dialog), "destroy", + gtk_signal_connect (GTK_OBJECT (SUBSCRIBE_DIALOG (subscribe_dialog)->app), "destroy", subscribe_dialog_destroy, NULL); - subscribe_dialog_run_and_close (SUBSCRIBE_DIALOG (subscribe_dialog)); - gtk_object_unref (GTK_OBJECT (subscribe_dialog)); + gnome_dialog_set_close (GNOME_DIALOG (SUBSCRIBE_DIALOG (subscribe_dialog)->app), TRUE); + + subscribe_dialog_show (subscribe_dialog); } else { gdk_window_raise (SUBSCRIBE_DIALOG (subscribe_dialog)->app->window); } |