[evolution] Move mail migration code to libevolution-mail.so.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution] Move mail migration code to libevolution-mail.so.
- Date: Tue, 15 Dec 2009 16:54:26 +0000 (UTC)
commit 2aea353ce79d16f2ee637f413e49e312d5873f33
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Dec 15 11:53:50 2009 -0500
Move mail migration code to libevolution-mail.so.
So Anjal can reuse it.
mail/Makefile.am | 2 ++
.../e-mail-migrate.c | 15 +++++++--------
.../e-mail-migrate.h | 4 ++--
modules/mail/Makefile.am | 2 --
modules/mail/e-mail-shell-backend.c | 4 ++--
5 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 2f0f5c9..6749771 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -45,6 +45,7 @@ mailinclude_HEADERS = \
e-mail-label-manager.h \
e-mail-label-tree-view.h \
e-mail-local.h \
+ e-mail-migrate.h \
e-mail-reader.h \
e-mail-reader-utils.h \
e-mail-search-bar.h \
@@ -102,6 +103,7 @@ libevolution_mail_la_SOURCES = \
e-mail-label-manager.c \
e-mail-label-tree-view.c \
e-mail-local.c \
+ e-mail-migrate.c \
e-mail-reader.c \
e-mail-reader-utils.c \
e-mail-search-bar.c \
diff --git a/modules/mail/e-mail-shell-migrate.c b/mail/e-mail-migrate.c
similarity index 99%
rename from modules/mail/e-mail-shell-migrate.c
rename to mail/e-mail-migrate.c
index 67f6139..65dff61 100644
--- a/modules/mail/e-mail-shell-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -1,5 +1,5 @@
/*
- * e-mail-shell-migrate.c
+ * e-mail-migrate.c
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,7 @@
*
*/
-#include "e-mail-shell-migrate.h"
+#include "e-mail-migrate.h"
#include <stdio.h>
#include <stdlib.h>
@@ -63,7 +63,6 @@
#include "e-util/e-plugin.h"
#include "e-util/e-signature-utils.h"
-#include "e-mail-shell-backend.h"
#include "shell/e-shell.h"
#include "shell/e-shell-migrate.h"
@@ -2993,11 +2992,11 @@ migrate_to_db (EShellBackend *shell_backend)
}
gboolean
-e_mail_shell_migrate (EShellBackend *shell_backend,
- gint major,
- gint minor,
- gint micro,
- GError **error)
+e_mail_migrate (EShellBackend *shell_backend,
+ gint major,
+ gint minor,
+ gint micro,
+ GError **error)
{
struct stat st;
const gchar *data_dir;
diff --git a/modules/mail/e-mail-shell-migrate.h b/mail/e-mail-migrate.h
similarity index 92%
rename from modules/mail/e-mail-shell-migrate.h
rename to mail/e-mail-migrate.h
index 8f3057e..4d7154b 100644
--- a/modules/mail/e-mail-shell-migrate.h
+++ b/mail/e-mail-migrate.h
@@ -1,5 +1,5 @@
/*
- * e-mail-shell-migrate.h
+ * e-mail-migrate.h
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
G_BEGIN_DECLS
-gboolean e_mail_shell_migrate (EShellBackend *shell_backend,
+gboolean e_mail_migrate (EShellBackend *shell_backend,
gint major,
gint minor,
gint micro,
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 0b43942..fd05667 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -27,8 +27,6 @@ libevolution_module_mail_la_SOURCES = \
e-mail-shell-backend.h \
e-mail-shell-content.c \
e-mail-shell-content.h \
- e-mail-shell-migrate.c \
- e-mail-shell-migrate.h \
e-mail-shell-settings.c \
e-mail-shell-settings.h \
e-mail-shell-sidebar.c \
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index d54569c..f1a85a8 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -37,13 +37,13 @@
#include "composer/e-msg-composer.h"
#include "widgets/misc/e-preferences-window.h"
-#include "e-mail-shell-migrate.h"
#include "e-mail-shell-settings.h"
#include "e-mail-shell-sidebar.h"
#include "e-mail-shell-view.h"
#include "e-mail-browser.h"
#include "e-mail-local.h"
+#include "e-mail-migrate.h"
#include "e-mail-reader.h"
#include "e-mail-store.h"
#include "em-account-editor.h"
@@ -896,7 +896,7 @@ mail_shell_backend_class_init (EMailShellBackendClass *class)
shell_backend_class->sort_order = 200;
shell_backend_class->preferences_page = "mail-accounts";
shell_backend_class->start = mail_shell_backend_start;
- shell_backend_class->migrate = e_mail_shell_migrate;
+ shell_backend_class->migrate = e_mail_migrate;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]