diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-11-13 01:59:17 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-11-13 02:02:23 +0800 |
| commit | 48a400618b705696443f4aeacceaa1af0345a148 (patch) | |
| tree | 58ad1c21797f4e1f21baa47185bec6c5d1f976ed /shell | |
| parent | c1d59b0e9eb17c365d5cfabfbca2270f8d55b6b9 (diff) | |
| download | gsoc2013-evolution-48a400618b705696443f4aeacceaa1af0345a148.tar.gz gsoc2013-evolution-48a400618b705696443f4aeacceaa1af0345a148.tar.zst gsoc2013-evolution-48a400618b705696443f4aeacceaa1af0345a148.zip | |
Further tweaks for the command-line importing.
Includes Bastien Nocera's patch to register our importable MIME types
with the MIME database.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-utils.c | 12 |
1 files changed, 1 insertions, 11 deletions
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 { |