aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-03-25 23:49:19 +0800
committerDan Winship <danw@src.gnome.org>2003-03-25 23:49:19 +0800
commitfea6083abffc47a4f9fd2d8988e924ad19a394c3 (patch)
tree83e852874848d3eddec8e85ac5f4b6431ed0f202
parentce81bdab983d9d3277de70c4d55286a6481cb42e (diff)
downloadgsoc2013-evolution-fea6083abffc47a4f9fd2d8988e924ad19a394c3.tar
gsoc2013-evolution-fea6083abffc47a4f9fd2d8988e924ad19a394c3.tar.gz
gsoc2013-evolution-fea6083abffc47a4f9fd2d8988e924ad19a394c3.tar.bz2
gsoc2013-evolution-fea6083abffc47a4f9fd2d8988e924ad19a394c3.tar.lz
gsoc2013-evolution-fea6083abffc47a4f9fd2d8988e924ad19a394c3.tar.xz
gsoc2013-evolution-fea6083abffc47a4f9fd2d8988e924ad19a394c3.tar.zst
gsoc2013-evolution-fea6083abffc47a4f9fd2d8988e924ad19a394c3.zip
Update for e_notice move (apply_changes): Pass a parent_window to e_notice
* mail-account-editor.c: Update for e_notice move (apply_changes): Pass a parent_window to e_notice * mail-account-gui.c: Update for e_notice move. (mail_account_gui_save): Pass a parent_window to e_notice * mail-callbacks.c: Update for e_notice move * mail-local.c: Likewise * mail-signature-editor.c: Likewise * mail-vfolder.c: Likewise svn path=/trunk/; revision=20502
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/mail-account-editor.c4
-rw-r--r--mail/mail-account-gui.c5
-rw-r--r--mail/mail-account-gui.h1
-rw-r--r--mail/mail-callbacks.c1
-rw-r--r--mail/mail-local.c2
-rw-r--r--mail/mail-signature-editor.c2
-rw-r--r--mail/mail-vfolder.c2
8 files changed, 18 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 81d221c14f..f62eaefee3 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,16 @@
2003-03-25 Dan Winship <danw@ximian.com>
+ * mail-account-editor.c: Update for e_notice move
+ (apply_changes): Pass a parent_window to e_notice
+
+ * mail-account-gui.c: Update for e_notice move.
+ (mail_account_gui_save): Pass a parent_window to e_notice
+
+ * mail-callbacks.c: Update for e_notice move
+ * mail-local.c: Likewise
+ * mail-signature-editor.c: Likewise
+ * mail-vfolder.c: Likewise
+
* component-factory.c (interactive_cb): Update prototype
2003-03-25 Not Zed <NotZed@Ximian.com>
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index 0183ddca1f..b4cdbc7cef 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <string.h>
#include <camel/camel-url.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <e-util/e-dialog-utils.h>
#include "mail-account-editor.h"
#include "mail-session.h"
@@ -99,7 +99,7 @@ apply_changes (MailAccountEditor *editor)
if (page != -1) {
gtk_notebook_set_current_page (editor->notebook, page);
gtk_widget_grab_focus (incomplete);
- e_notice (NULL, GTK_MESSAGE_ERROR, _("You have not filled in all of the required information."));
+ e_notice (editor, GTK_MESSAGE_ERROR, _("You have not filled in all of the required information."));
return FALSE;
}
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 71202de030..1542de946d 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -34,8 +34,7 @@
#include <gconf/gconf-client.h>
#include <e-util/e-account-list.h>
-
-#include <gal/widgets/e-gui-utils.h>
+#include <e-util/e-dialog-utils.h>
#include "evolution-folder-selector-button.h"
#include "mail-account-gui.h"
@@ -1878,7 +1877,7 @@ mail_account_gui_save (MailAccountGui *gui)
account = mail_config_get_account_by_name (new_name);
if (account && account != new) {
- e_notice (NULL, GTK_MESSAGE_ERROR, _("You may not create two accounts with the same name."));
+ e_notice (gui->account_name, GTK_MESSAGE_ERROR, _("You may not create two accounts with the same name."));
return FALSE;
}
diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h
index 74c00d5dc0..d003885bd4 100644
--- a/mail/mail-account-gui.h
+++ b/mail/mail-account-gui.h
@@ -58,7 +58,6 @@ typedef struct {
} MailAccountGuiService;
typedef struct {
- GtkWidget *top;
EAccount *account;
MailAccountsTab *dialog;
GladeXML *xml;
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index b3c24a2580..d1fbb74957 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -45,7 +45,6 @@
#include <bonobo/bonobo-widget.h>
#include <bonobo/bonobo-socket.h>
#include <gal/e-table/e-table.h>
-#include <gal/widgets/e-gui-utils.h>
#include <e-util/e-dialog-utils.h>
#include <filter/filter-editor.h>
diff --git a/mail/mail-local.c b/mail/mail-local.c
index e71a3315c2..cbec89d89e 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -37,7 +37,7 @@
#include <glade/glade.h>
#include "e-util/e-path.h"
-#include <gal/widgets/e-gui-utils.h>
+#include "e-util/e-dialog-utils.h"
#include <gal/util/e-xml-utils.h>
#include "Evolution.h"
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index d4a4272fbb..7a28e7a912 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -31,7 +31,7 @@
#include <bonobo.h>
#include <bonobo/bonobo-stream-memory.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <e-util/e-dialog-utils.h>
#include "e-msg-composer.h"
#include "mail-signature-editor.h"
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index de90ffac19..da87a5f13e 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -41,7 +41,7 @@
#include "mail-ops.h"
#include "mail-mt.h"
-#include "gal/widgets/e-gui-utils.h"
+#include "e-util/e-dialog-utils.h"
#include "camel/camel.h"
#include "camel/camel-vee-folder.h"