Update for e_notice move. Likewise Likewise Likewise Likewise Likewise

	* e-folder-dnd-bridge.c: Update for e_notice move.
	* e-setup.c: Likewise
	* e-shell-folder-commands.c: Likewise
	* e-shell-folder-creation-dialog.c: Likewise
	* e-shell-offline-sync.c: Likewise
	* e-shell-shared-folder-picker-dialog.c: Likewise
	* e-shell-view-menu.c: Likewise
	* e-shell.c: Likewise
	* evolution-shell-component-utils.c: Likewise

	* Makefile.am (libeshell_la_LIBADD): libeshell depends on
	libeutil.

	* e-corba-storage.c: Fix warnings

svn path=/trunk/; revision=20500

13 files changed, 51 insertions, 37 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index f1407f8067..a2725f9722 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,22 @@
 2003-03-25  Dan Winship  <danw@ximian.com>
 
+	* e-folder-dnd-bridge.c: Update for e_notice move.
+	* e-setup.c: Likewise
+	* e-shell-folder-commands.c: Likewise
+	* e-shell-folder-creation-dialog.c: Likewise
+	* e-shell-offline-sync.c: Likewise
+	* e-shell-shared-folder-picker-dialog.c: Likewise
+	* e-shell-view-menu.c: Likewise
+	* e-shell.c: Likewise
+	* evolution-shell-component-utils.c: Likewise
+
+	* Makefile.am (libeshell_la_LIBADD): libeshell depends on
+	libeutil.
+
+	* e-corba-storage.c: Fix warnings
+
+2003-03-25  Dan Winship  <danw@ximian.com>
+
 	* Evolution-ShellComponent.idl (interactive): add a "new_view_xid"
 	arg, so the component has a window id to make use of as a parent
 	if it needs to pop up a dialog.
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7759e5ba85..c81d66ee67 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -133,6 +133,9 @@ libeshell_la_SOURCES = 				\
 	e-shell-marshal.c			\
 	$(eshellinclude_HEADERS)
 
+libeshell_la_LIBADD =				\
+	$(top_builddir)/e-util/libeutil.la
+
 # Evolution executable
 
 evolution_SOURCES =				\
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index d094a3871b..9e3fa08eb8 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -38,6 +38,7 @@
 #include <bonobo/bonobo-listener.h>
 
 #include <gdk/gdkx.h>
+#include <gtk/gtkmain.h>
 
 #include <string.h>
 
@@ -331,7 +332,7 @@ get_folder (EStorage *storage, const char *path)
 			e_storage_async_open_folder (storage, path_dup,
 						     get_folder_cb, &done);
 			while (!done)
-				gtk_main_iteration (TRUE);
+				gtk_main_iteration ();
 		}
 		*p = '/';
 		p = strchr (p + 1, '/');
diff --git a/shell/e-folder-dnd-bridge.c b/shell/e-folder-dnd-bridge.c
index 726a53be83..c72322f476 100644
--- a/shell/e-folder-dnd-bridge.c
+++ b/shell/e-folder-dnd-bridge.c
@@ -31,7 +31,7 @@
 #include "e-storage-set-view.h"
 #include "e-shell-constants.h"
 
-#include <gal/widgets/e-gui-utils.h>
+#include "e-util/e-dialog-utils.h"
 
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
diff --git a/shell/e-setup.c b/shell/e-setup.c
index 5834c40930..8103c9431d 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -31,14 +31,13 @@
 #include "e-shell-config.h"
 #include "e-shell-constants.h"
 
+#include "e-util/e-dialog-utils.h"
 #include "e-util/e-path.h"
 
 #include <gconf/gconf-client.h>
 
 #include <gtk/gtklabel.h>
 
-#include <gal/widgets/e-gui-utils.h>
-
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index a8db04915b..b391ba28f1 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -26,6 +26,7 @@
 
 #include "e-shell-folder-commands.h"
 
+#include "e-util/e-dialog-utils.h"
 #include "e-util/e-request.h"
 
 #include "e-shell-constants.h"
@@ -33,8 +34,6 @@
 #include "e-shell-folder-selection-dialog.h"
 #include "e-shell-utils.h"
 
-#include <gal/widgets/e-gui-utils.h>
-
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 
@@ -142,7 +141,7 @@ xfer_result_callback (EStorageSet *storage_set,
 		else
 			fmt = _("Cannot move folder: %s");
 
-		e_notice (GTK_WINDOW (folder_command_data->shell_view), GTK_MESSAGE_ERROR,
+		e_notice (folder_command_data->shell_view, GTK_MESSAGE_ERROR,
 			  fmt, e_storage_result_to_string (result));
 	}
 
@@ -190,7 +189,7 @@ folder_selection_dialog_folder_selected_callback (EShellFolderSelectionDialog *f
 		else
 			msg = _("Cannot copy a folder over itself.");
 
-		e_notice (GTK_WINDOW (folder_selection_dialog), GTK_MESSAGE_ERROR, msg);
+		e_notice (folder_selection_dialog, GTK_MESSAGE_ERROR, msg);
 		return;
 	}
 
@@ -201,7 +200,7 @@ folder_selection_dialog_folder_selected_callback (EShellFolderSelectionDialog *f
 		if (strncmp (folder_command_data->destination_path,
 			     folder_command_data->source_path,
 			     source_len) == 0) {
-			e_notice (GTK_WINDOW (folder_selection_dialog), GTK_MESSAGE_ERROR,
+			e_notice (folder_selection_dialog, GTK_MESSAGE_ERROR,
 				  _("Cannot move a folder into one of its descendants."));
 			return;
 		}
@@ -388,7 +387,7 @@ delete_cb (EStorageSet *storage_set,
 	shell_view = E_SHELL_VIEW (data);
 
 	if (result != E_STORAGE_OK)
-		e_notice (GTK_WINDOW (shell_view), GTK_MESSAGE_ERROR,
+		e_notice (shell_view, GTK_MESSAGE_ERROR,
 			  _("Cannot delete folder:\n%s"), e_storage_result_to_string (result));
 }
 
@@ -482,7 +481,7 @@ rename_cb (EStorageSet *storage_set, EStorageResult result, void *data)
 	callback_data = (RenameCallbackData *) data;
 
 	if (result != E_STORAGE_OK) {
-		e_notice (GTK_WINDOW (callback_data->shell_view), GTK_MESSAGE_ERROR,
+		e_notice (callback_data->shell_view, GTK_MESSAGE_ERROR,
 			  _("Cannot rename folder:\n%s"), e_storage_result_to_string (result));
 	} else {
 		EFolder *folder;
@@ -546,7 +545,7 @@ e_shell_command_rename_folder (EShell *shell,
 		if (e_shell_folder_name_is_valid (new_name, &reason))
 			break;
 
-		e_notice (shell_view != NULL ? GTK_WINDOW (shell_view) : NULL, GTK_MESSAGE_ERROR,
+		e_notice (shell_view, GTK_MESSAGE_ERROR,
 			  _("The specified folder name is not valid: %s"), reason);
 	}
 
@@ -580,10 +579,10 @@ remove_shared_cb (EStorageSet *storage_set,
 
 	if (result == E_STORAGE_NOTIMPLEMENTED ||
 	    result == E_STORAGE_UNSUPPORTEDOPERATION)
-		e_notice (GTK_WINDOW (shell_view), GTK_MESSAGE_ERROR,
+		e_notice (shell_view, GTK_MESSAGE_ERROR,
 			  _("Selected folder does not belong to another user"));
 	else if (result != E_STORAGE_OK)
-		e_notice (GTK_WINDOW (shell_view), GTK_MESSAGE_ERROR,
+		e_notice (shell_view, GTK_MESSAGE_ERROR,
 			  _("Cannot remove folder:\n%s"), e_storage_result_to_string (result));
 }
 
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index 617a6dd936..b4bc19208b 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -38,12 +38,13 @@
 #include <glade/glade-xml.h>
 
 #include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
 
 #include "e-storage-set.h"
 #include "e-storage-set-view.h"
 #include "e-shell-utils.h"
 
+#include "e-util/e-dialog-utils.h"
+
 #include "e-shell-folder-creation-dialog.h"
 
 
@@ -122,7 +123,7 @@ async_create_cb (EStorageSet *storage_set,
 						  dialog_data->folder_path,
 						  dialog_data->result_callback_data);
 
-	e_notice (GTK_WINDOW (dialog_data->dialog), GTK_MESSAGE_ERROR,
+	e_notice (dialog_data->dialog, GTK_MESSAGE_ERROR,
 		  _("Cannot create the specified folder:\n%s"),
 		  e_storage_result_to_string (result));
 
@@ -165,7 +166,7 @@ dialog_response_cb (GtkDialog *dialog,
 	folder_name = gtk_entry_get_text(GTK_ENTRY (dialog_data->folder_name_entry));
 
 	if (! e_shell_folder_name_is_valid (folder_name, &reason)) {
-		e_notice (GTK_WINDOW (dialog), GTK_MESSAGE_ERROR,
+		e_notice (dialog, GTK_MESSAGE_ERROR,
 			  _("The specified folder name is not valid: %s"), reason);
 		return;
 	}
diff --git a/shell/e-shell-offline-sync.c b/shell/e-shell-offline-sync.c
index a828fb5b57..c37839e455 100644
--- a/shell/e-shell-offline-sync.c
+++ b/shell/e-shell-offline-sync.c
@@ -31,9 +31,9 @@
 
 #include "Evolution.h"
 
-#include <gconf/gconf-client.h>
+#include "e-util/e-dialog-utils.h"
 
-#include <gal/widgets/e-gui-utils.h>
+#include <gconf/gconf-client.h>
 
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmain.h>
@@ -159,7 +159,7 @@ impl_SyncFolderProgressListener_reportFailure (PortableServer_Servant servant,
 
 	/* FIXME -- We probably should give the user more of a chance to do
 	   something about it.  */
-	e_notice (GTK_WINDOW (sync_data->dialog), GTK_MESSAGE_ERROR,
+	e_notice (sync_data->dialog, GTK_MESSAGE_ERROR,
 		  _("Error synchronizing \"%s\":\n%s"), e_folder_get_name (folder), message);
 
 	sync_data->current_folder_finished = TRUE;
diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c
index 1614d49b76..191eccbbe3 100644
--- a/shell/e-shell-shared-folder-picker-dialog.c
+++ b/shell/e-shell-shared-folder-picker-dialog.c
@@ -33,7 +33,7 @@
 
 #include "Evolution-Addressbook-SelectNames.h"
 
-#include <gal/widgets/e-gui-utils.h>
+#include "e-util/e-dialog-utils.h"
 
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
@@ -278,7 +278,7 @@ show_dialog (EShell *shell,
 		/* It would be nice to insensitivize the OK button appropriately
 		   instead of doing this, but unfortunately we can't do this for the
 		   Bonobo control.  */
-		e_notice (GTK_WINDOW (dialog), GTK_MESSAGE_ERROR, _("Please select a user."));
+		e_notice (dialog, GTK_MESSAGE_ERROR, _("Please select a user."));
 	}
 
 	*user_email_address_return = user_email_address;
@@ -461,7 +461,7 @@ shared_folder_discovery_callback (EStorage *storage,
 		else
 			e_shell_create_view (shell, uri, NULL);
 	} else {
-		e_notice (parent ? GTK_WINDOW (parent) : NULL, GTK_MESSAGE_ERROR,
+		e_notice (parent, GTK_MESSAGE_ERROR,
 			  _("Could not open shared folder: %s."),
 			  e_storage_result_to_string (result));
 	}
@@ -514,7 +514,7 @@ discover_folder (EShell *shell,
 
  error:
 	/* FIXME: Be more verbose?  */
-	e_notice (GTK_WINDOW (parent), GTK_MESSAGE_ERROR,
+	e_notice (parent, GTK_MESSAGE_ERROR,
 		  _("Cannot find the specified shared folder."));
 }
 
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 93787d7042..0b9bc8c071 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -43,6 +43,8 @@
 
 #include "evolution-shell-component-utils.h"
 
+#include "e-util/e-dialog-utils.h"
+
 #include <glib.h>
 
 #include <gtk/gtksignal.h>
@@ -56,8 +58,6 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-about.h>
 
-#include <gal/widgets/e-gui-utils.h>
-
 
 /* Utility functions.  */
 
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 69c959fbcb..687d34e708 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -73,7 +73,6 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-moniker-util.h>
 
-#include <gal/widgets/e-gui-utils.h>
 #include <gal/util/e-util.h>
 
 #include <gconf/gconf-client.h>
@@ -172,7 +171,7 @@ pop_up_activation_error_dialog (ESplash *splash,
 	char *error_message;
 
 	error_message = e_get_activation_failure_msg (ev);
-	e_notice (GTK_WINDOW (splash), GTK_MESSAGE_ERROR,
+	e_notice (splash, GTK_MESSAGE_ERROR,
 		  _("Cannot activate component %s :\n"
 		    "The error from the activation system is:\n"
 		    "%s"),
@@ -1761,7 +1760,6 @@ e_shell_component_maybe_crashed   (EShell *shell,
 				   EShellView *shell_view)
 {
 	EShellPrivate *priv;
-	GtkWindow *parent_window;
 	EvolutionShellComponentClient *component;
 	GList *p;
 
@@ -1802,12 +1800,7 @@ e_shell_component_maybe_crashed   (EShell *shell,
 
 	priv->crash_type_names = g_list_prepend (priv->crash_type_names, g_strdup (type_name));
 
-	if (shell_view == NULL)
-		parent_window = NULL;
-	else
-		parent_window = GTK_WINDOW (shell_view);
-
-	e_notice (parent_window, GTK_MESSAGE_ERROR,
+	e_notice (shell_view, GTK_MESSAGE_ERROR,
 		  _("The Evolution component that handles folders of type \"%s\"\n"
 		    "has unexpectedly quit. You will need to quit Evolution and restart\n"
 		    "in order to access that data again."),
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index e855dad320..935b0f9973 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -25,6 +25,8 @@
 
 #include "evolution-shell-component-utils.h"
 
+#include "e-util/e-dialog-utils.h"
+
 #include <string.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
@@ -32,7 +34,6 @@
 #include <bonobo/bonobo-moniker-util.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo-activation/bonobo-activation.h>
-#include <gal/widgets/e-gui-utils.h>
 
 static void free_pixmaps (void);
 static GSList *inited_arrays = NULL;
diff --git a/shell/main.c b/shell/main.c
index e9e9718820..45a2e0c74f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include "e-util/e-dialog-utils.h"
 #include "e-util/e-gtk-utils.h"
 
 #include "e-icon-factory.h"
@@ -64,7 +65,6 @@
 #include <gconf/gconf.h>
 #endif
 
-#include <gal/widgets/e-gui-utils.h>
 #include <gal/widgets/e-cursors.h>
 
 #include <fcntl.h>