When invoking Evolution with URIs on the command-line (e.g. mailto:),

terminate after all the windows for those URIs have been closed.

svn path=/branches/kill-bonobo/; revision=37157

1 files changed, 11 insertions, 8 deletions

diff --git a/calendar/modules/e-memo-shell-module.c b/calendar/modules/e-memo-shell-module.c
index a82a8c5235..5e8f9a53bf 100644
--- a/calendar/modules/e-memo-shell-module.c
+++ b/calendar/modules/e-memo-shell-module.c
@@ -306,8 +306,8 @@ static GtkActionEntry source_entries[] = {
 };
 
 static gboolean
-memo_module_handle_uri (EShellModule *shell_module,
-                        const gchar *uri)
+memo_module_handle_uri_cb (EShellModule *shell_module,
+                           const gchar *uri)
 {
 	CompEditor *editor;
 	CompEditorFlags flags = 0;
@@ -443,19 +443,22 @@ exit:
 }
 
 static void
-memo_module_window_created (EShellModule *shell_module,
-                            EShellWindow *shell_window)
+memo_module_window_created_cb (EShellModule *shell_module,
+                               GtkWindow *window)
 {
 	const gchar *module_name;
 
+	if (!E_IS_SHELL_WINDOW (window))
+		return;
+
 	module_name = G_TYPE_MODULE (shell_module)->name;
 
 	e_shell_window_register_new_item_actions (
-		shell_window, module_name,
+		E_SHELL_WINDOW (window), module_name,
 		item_entries, G_N_ELEMENTS (item_entries));
 
 	e_shell_window_register_new_source_actions (
-		shell_window, module_name,
+		E_SHELL_WINDOW (window), module_name,
 		source_entries, G_N_ELEMENTS (source_entries));
 }
 
@@ -488,9 +491,9 @@ e_shell_module_init (GTypeModule *type_module)
 
 	g_signal_connect_swapped (
 		shell, "handle-uri",
-		G_CALLBACK (memo_module_handle_uri), shell_module);
+		G_CALLBACK (memo_module_handle_uri_cb), shell_module);
 
 	g_signal_connect_swapped (
 		shell, "window-created",
-		G_CALLBACK (memo_module_window_created), shell_module);
+		G_CALLBACK (memo_module_window_created_cb), shell_module);
 }