diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-07-30 22:58:26 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-07-30 22:58:26 +0800 |
commit | 9085a5a18c23f894a0d29be73222ad7c55a03bf1 (patch) | |
tree | 7f2882617c1b44d523b6bba9d496ae218900d145 /shell | |
parent | 1d2a02b6581372e13a2162bef597fb93a6d163ab (diff) | |
download | gsoc2013-evolution-9085a5a18c23f894a0d29be73222ad7c55a03bf1.tar gsoc2013-evolution-9085a5a18c23f894a0d29be73222ad7c55a03bf1.tar.gz gsoc2013-evolution-9085a5a18c23f894a0d29be73222ad7c55a03bf1.tar.bz2 gsoc2013-evolution-9085a5a18c23f894a0d29be73222ad7c55a03bf1.tar.lz gsoc2013-evolution-9085a5a18c23f894a0d29be73222ad7c55a03bf1.tar.xz gsoc2013-evolution-9085a5a18c23f894a0d29be73222ad7c55a03bf1.tar.zst gsoc2013-evolution-9085a5a18c23f894a0d29be73222ad7c55a03bf1.zip |
Remove unused 'preview' argument from e_import_assistant_new_simple().
We preview imported files by other means now.
Diffstat (limited to 'shell')
-rw-r--r-- | shell/e-shell-utils.c | 18 | ||||
-rw-r--r-- | shell/e-shell-utils.h | 3 | ||||
-rw-r--r-- | shell/e-shell.c | 5 |
3 files changed, 10 insertions, 16 deletions
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c index 1b19d17d7e..d47b88e174 100644 --- a/shell/e-shell-utils.c +++ b/shell/e-shell-utils.c @@ -303,13 +303,11 @@ exit: /** * e_shell_utils_import_uris: * @shell: The #EShell instance - * @uris: %NULL-terminated list of URIs to import or preview - * @preview: rather preview than import given URIs + * @uris: %NULL-terminated list of URIs to import * * Imports given URIs to Evolution, giving user a choice what to import * if more than one importer can be applied, and where to import it, if - * the importer itself is configurable. It can preview data, instead of - * importing if requested and the imported has that implemented. + * the importer itself is configurable. * * URIs should be either a filename or URI of form file://. * All others are skipped. @@ -317,7 +315,8 @@ exit: * Returns: the number of URIs successfully handled **/ guint -e_shell_utils_import_uris (EShell *shell, gchar **uris, gboolean preview) +e_shell_utils_import_uris (EShell *shell, + gchar **uris) { GtkWindow *parent; GtkWidget *assistant; @@ -326,7 +325,7 @@ e_shell_utils_import_uris (EShell *shell, gchar **uris, gboolean preview) g_return_val_if_fail (uris != NULL, 0); parent = e_shell_get_active_window (shell); - assistant = e_import_assistant_new_simple (parent, uris, preview); + assistant = e_import_assistant_new_simple (parent, uris); if (assistant) { g_signal_connect_after ( @@ -340,11 +339,8 @@ e_shell_utils_import_uris (EShell *shell, gchar **uris, gboolean preview) e_shell_watch_window (shell, GTK_WINDOW (assistant)); gtk_widget_show (assistant); - } else { - g_warning ( - "%s: Cannot %s any of the given URIs", - G_STRFUNC, preview ? "preview" : "import"); - } + } else + g_warning ("Cannot import any of the given URIs"); return g_strv_length (uris); } diff --git a/shell/e-shell-utils.h b/shell/e-shell-utils.h index c9237b983d..a45ecdb1ca 100644 --- a/shell/e-shell-utils.h +++ b/shell/e-shell-utils.h @@ -47,8 +47,7 @@ GFile * e_shell_run_save_dialog (EShell *shell, gpointer customize_data); guint e_shell_utils_import_uris (EShell *shell, - gchar **uris, - gboolean preview); + gchar **uris); void e_shell_hide_widgets_for_express_mode (EShell *shell, diff --git a/shell/e-shell.c b/shell/e-shell.c index 5c00277253..c51c5dd44a 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -1505,7 +1505,7 @@ e_shell_handle_uris (EShell *shell, goto unique; if (do_import) { - n_handled = e_shell_utils_import_uris (shell, uris, FALSE); + n_handled = e_shell_utils_import_uris (shell, uris); } else { for (ii = 0; uris[ii] != NULL; ii++) { gboolean handled; @@ -1517,8 +1517,7 @@ e_shell_handle_uris (EShell *shell, } if (n_handled == 0) - n_handled = e_shell_utils_import_uris ( - shell, uris, TRUE); + n_handled = e_shell_utils_import_uris (shell, uris); } return n_handled; |