[evolution] Shell importer does not need an EShellWindow.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution] Shell importer does not need an EShellWindow.
- Date: Sat, 26 Sep 2009 15:00:25 +0000 (UTC)
commit 1dff09f9e261caa623ee5475d05268955745f790
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Sep 25 10:02:19 2009 -0400
Shell importer does not need an EShellWindow.
shell/e-shell-importer.c | 3 +--
shell/e-shell-importer.h | 3 +--
shell/e-shell-window-actions.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 5d06212..e97d524 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 bd57fbd..700bbdd 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 2fe4a17..8d74ae9 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 ();
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]