aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-09-25 22:02:19 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-09-26 22:28:11 +0800
commit1dff09f9e261caa623ee5475d05268955745f790 (patch)
tree010be95e89db133ccc191a7a8f4aa7600a5e7031
parent3b2cfae1768902b60d604fa96cd546636077feb1 (diff)
downloadgsoc2013-evolution-1dff09f9e261caa623ee5475d05268955745f790.tar.gz
gsoc2013-evolution-1dff09f9e261caa623ee5475d05268955745f790.tar.zst
gsoc2013-evolution-1dff09f9e261caa623ee5475d05268955745f790.zip
Shell importer does not need an EShellWindow.
-rw-r--r--shell/e-shell-importer.c3
-rw-r--r--shell/e-shell-importer.h3
-rw-r--r--shell/e-shell-window-actions.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 5d062126e0..e97d52492a 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -660,7 +660,7 @@ import_assistant_prepare (GtkAssistant *assistant, GtkWidget *page, gpointer use
}
void
-e_shell_importer_start_import (EShellWindow *shell_window)
+e_shell_importer_start_import (void)
{
const gchar *empty_xpm_img[] = {
"48 1 2 1",
@@ -683,7 +683,6 @@ e_shell_importer_start_import (EShellWindow *shell_window)
spacer = gdk_pixbuf_new_from_xpm_data (empty_xpm_img);
dialog_open = TRUE;
- data->window = shell_window;
data->assistant = gtk_assistant_new ();
assistant = GTK_ASSISTANT (data->assistant);
diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h
index bd57fbd4f0..700bbddff6 100644
--- a/shell/e-shell-importer.h
+++ b/shell/e-shell-importer.h
@@ -24,11 +24,10 @@
#define E_SHELL_IMPORTER_H
#include "e-shell-common.h"
-#include "e-shell-window.h"
G_BEGIN_DECLS
-void e_shell_importer_start_import (EShellWindow *shell_window);
+void e_shell_importer_start_import (void);
G_END_DECLS
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 2fe4a17e0a..8d74ae97de 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -838,7 +838,7 @@ static void
action_import_cb (GtkAction *action,
EShellWindow *shell_window)
{
- e_shell_importer_start_import (shell_window);
+ e_shell_importer_start_import ();
}
/**