From 48a400618b705696443f4aeacceaa1af0345a148 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 12 Nov 2009 12:59:17 -0500 Subject: Further tweaks for the command-line importing. Includes Bastien Nocera's patch to register our importable MIME types with the MIME database. --- shell/e-shell-utils.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c index 30b658aef0..570f15bddd 100644 --- a/shell/e-shell-utils.c +++ b/shell/e-shell-utils.c @@ -183,14 +183,6 @@ exit: return chosen_file; } -static void -assistant_weak_notify_cb (EShell *shell, GObject *where_the_object_was) -{ - /* close the application if the import assistant was the only window here */ - if (e_shell_get_watched_windows (shell) == NULL) - gtk_main_quit (); -} - /** * e_shell_utils_import_uris: * @shell: The #EShell instance @@ -228,9 +220,7 @@ e_shell_utils_import_uris (EShell *shell, gchar **uris, gboolean preview) assistant, "finished", G_CALLBACK (gtk_widget_destroy), NULL); - g_object_weak_ref ( - G_OBJECT (assistant), (GWeakNotify) - assistant_weak_notify_cb, shell); + e_shell_watch_window (shell, GTK_WINDOW (assistant)); gtk_widget_show (assistant); } else { -- cgit