diff options
| author | JP Rosevear <jpr@ximian.com> | 2002-01-03 03:11:03 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2002-01-03 03:11:03 +0800 |
| commit | 178c7af85fac11d8ae0c4bf5c4ae2396731396e9 (patch) | |
| tree | 88527bee1142a8f70932397fdb7b8f361428bb5e /mail | |
| parent | 5df4d0a321a1890780f43c715681176c64f01594 (diff) | |
| download | gsoc2013-evolution-178c7af85fac11d8ae0c4bf5c4ae2396731396e9.tar.gz gsoc2013-evolution-178c7af85fac11d8ae0c4bf5c4ae2396731396e9.tar.zst gsoc2013-evolution-178c7af85fac11d8ae0c4bf5c4ae2396731396e9.zip | |
remove e_gnome_dialog util functions and use e-util ones instead
2002-01-02 JP Rosevear <jpr@ximian.com>
* mail-callbacks.c: remove e_gnome_dialog util functions and use
e-util ones instead
2002-01-02 JP Rosevear <jpr@ximian.com>
* e-dialog-utils.c (e_gnome_dialog_set_parent): util function
moved from mail-callbacks, also destroys the dialog if the parent
is destroyed
(e_gnome_warning_dialog_parented): similarly
(e_gnome_ok_cancel_dialog_parented): ditto
* e-dialog-utils.h: new protos
svn path=/trunk/; revision=15225
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 45 |
2 files changed, 6 insertions, 44 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 7a01be6d11..14cb4b9667 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2002-01-02 JP Rosevear <jpr@ximian.com> + + * mail-callbacks.c: remove e_gnome_dialog util functions and use + e-util ones instead + 2001-12-21 Jeffrey Stedfast <fejj@ximian.com> The idea here is that if we consistantly name the movemail file diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 1c6a40609f..f08c40f9d4 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -31,8 +31,6 @@ #include <errno.h> #include <time.h> #include <libgnome/gnome-paper.h> -#include <libgnomeui/gnome-dialog.h> -#include <libgnomeui/gnome-dialog-util.h> #include <libgnomeui/gnome-stock.h> #include <libgnome/gnome-paper.h> #include <libgnomeprint/gnome-print-master.h> @@ -42,6 +40,7 @@ #include <gal/e-table/e-table.h> #include <gal/widgets/e-gui-utils.h> #include <gal/widgets/e-unicode.h> +#include <e-util/e-dialog-utils.h> #include <filter/filter-editor.h> #include "mail.h" #include "message-browser.h" @@ -73,48 +72,6 @@ #define FB_WINDOW(fb) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (fb), GTK_TYPE_WINDOW)) -/* These e_gnome_dialog* functions are to handle the brokenness that is gnome-dialog */ -static void -e_gnome_dialog_parent_destroyed (GtkWidget *parent, GtkWidget *dialog) -{ - gnome_dialog_close (GNOME_DIALOG (dialog)); -} - -static void -e_gnome_dialog_set_parent (GnomeDialog *dialog, GtkWindow *parent) -{ - gnome_dialog_set_parent (dialog, parent); - gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", - e_gnome_dialog_parent_destroyed, - dialog, GTK_OBJECT (dialog)); -} - -static GtkWidget * -e_gnome_warning_dialog_parented (const char *warning, GtkWindow *parent) -{ - GtkWidget *dialog; - - dialog = gnome_warning_dialog_parented (warning, parent); - gtk_signal_connect (GTK_OBJECT (parent), "destroy", - e_gnome_dialog_parent_destroyed, dialog); - - return dialog; -} - -static GtkWidget * -e_gnome_ok_cancel_dialog_parented (const char *message, GnomeReplyCallback callback, - gpointer data, GtkWindow *parent) -{ - GtkWidget *dialog; - - dialog = gnome_ok_cancel_dialog_parented (message, callback, data, parent); - gtk_signal_connect (GTK_OBJECT (parent), "destroy", - e_gnome_dialog_parent_destroyed, dialog); - - return dialog; -} - - struct post_send_data { CamelFolder *folder; gchar *uid; |