aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-11-13 01:59:17 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-11-13 02:02:23 +0800
commit48a400618b705696443f4aeacceaa1af0345a148 (patch)
tree58ad1c21797f4e1f21baa47185bec6c5d1f976ed /mail
parentc1d59b0e9eb17c365d5cfabfbca2270f8d55b6b9 (diff)
downloadgsoc2013-evolution-48a400618b705696443f4aeacceaa1af0345a148.tar
gsoc2013-evolution-48a400618b705696443f4aeacceaa1af0345a148.tar.gz
gsoc2013-evolution-48a400618b705696443f4aeacceaa1af0345a148.tar.bz2
gsoc2013-evolution-48a400618b705696443f4aeacceaa1af0345a148.tar.lz
gsoc2013-evolution-48a400618b705696443f4aeacceaa1af0345a148.tar.xz
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 'mail')
-rw-r--r--mail/importers/evolution-mbox-importer.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index a100302db7..01129471ae 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -79,14 +79,18 @@ folder_selected(EMFolderSelectionButton *button, EImportTargetURI *target)
static GtkWidget *
mbox_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
{
+ GtkWindow *window;
GtkWidget *hbox, *w;
gchar *select_uri = NULL;
- EShellWindow *shell_window;
/* preselect the folder selected in a mail view */
- shell_window = E_SHELL_WINDOW (e_shell_get_active_window (e_shell_get_default ()));
- if (shell_window) {
- const gchar *view = e_shell_window_get_active_view (shell_window);
+ window = e_shell_get_active_window (e_shell_get_default ());
+ if (E_IS_SHELL_WINDOW (window)) {
+ EShellWindow *shell_window;
+ const gchar *view;
+
+ shell_window = E_SHELL_WINDOW (window);
+ view = e_shell_window_get_active_view (shell_window);
if (view && g_str_equal (view, "mail")) {
EShellView *shell_view = e_shell_window_get_shell_view (shell_window, view);