diff options
Diffstat (limited to 'mail/importers')
| -rw-r--r-- | mail/importers/Makefile.am | 3 | ||||
| -rw-r--r-- | mail/importers/evolution-mbox-importer.c | 14 | ||||
| -rw-r--r-- | mail/importers/mail-importer.c | 35 | ||||
| -rw-r--r-- | mail/importers/mail-importer.h | 20 |
4 files changed, 23 insertions, 49 deletions
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 5e46a54c4d..bd38762ea2 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -1,6 +1,5 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = \ - $(top_builddir)/win32/libevolution-mail-shared.la \ $(top_builddir)/win32/libevolution-mail.la endif @@ -10,6 +9,7 @@ AM_CPPFLAGS = -I.. \ -I$(srcdir)/.. \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_MAIL_CFLAGS) \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(IMPORTERS_CFLAGS) @@ -27,6 +27,7 @@ libevolution_mail_importers_la_LIBADD = \ $(WIN32_BOOTSTRAP_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ + $(top_builddir)/mail/libevolution-mail.la \ $(IMPORTERS_LIBS) -include $(top_srcdir)/git.mk diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 7cd2b34b22..ade34526fc 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -40,9 +40,10 @@ #include <camel/camel-exception.h> +#include "mail/e-mail-local.h" +#include "mail/e-mail-store.h" #include "mail/em-folder-selection-button.h" - -#include "mail/mail-component.h" +#include "mail/em-folder-tree-model.h" #include "mail/mail-mt.h" #include "mail-importer.h" @@ -73,15 +74,18 @@ static GtkWidget * mbox_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) { GtkWidget *hbox, *w; + const gchar *local_inbox_uri; + + local_inbox_uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_INBOX); hbox = gtk_hbox_new(FALSE, 0); w = gtk_label_new(_("Destination folder:")); gtk_box_pack_start((GtkBox *)hbox, w, FALSE, TRUE, 6); - w = em_folder_selection_button_new(_("Select folder"), _("Select folder to import into")); - em_folder_selection_button_set_selection((EMFolderSelectionButton *)w, - mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_INBOX)); + w = em_folder_selection_button_new( + _("Select folder"), _("Select folder to import into")); + em_folder_selection_button_set_selection((EMFolderSelectionButton *)w, local_inbox_uri); g_signal_connect(w, "selected", G_CALLBACK(folder_selected), target); gtk_box_pack_start((GtkBox *)hbox, w, FALSE, TRUE, 6); diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index daecfaee53..61726dd37f 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -36,7 +36,6 @@ #include <glib.h> #include <glib/gstdio.h> -#include <gmodule.h> #include <glib/gi18n.h> #include <camel/camel-folder.h> #include <camel/camel-store.h> @@ -46,10 +45,12 @@ #include <camel/camel-stream-mem.h> #include "e-util/e-util-private.h" +#include "shell/e-shell-backend.h" -#include "mail/mail-mt.h" -#include "mail/mail-component.h" -#include "mail/mail-tools.h" +#include "mail-mt.h" +#include "mail-tools.h" +#include "e-mail-local.h" +#include "em-utils.h" #include "mail-importer.h" @@ -113,23 +114,6 @@ mail_importer_add_line (MailImporter *importer, camel_message_info_free(info); } -struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const gchar *iid, gpointer data) -{ -#if 0 - if (strcmp(iid, ELM_INTELLIGENT_IMPORTER_IID) == 0) - return elm_intelligent_importer_new(); - else if (strcmp(iid, PINE_INTELLIGENT_IMPORTER_IID) == 0) - return pine_intelligent_importer_new(); - else if (strcmp(iid, NETSCAPE_INTELLIGENT_IMPORTER_IID) == 0) - return netscape_intelligent_importer_new(); - else if (strcmp(iid, MBOX_IMPORTER_IID) == 0) - return mbox_importer_new(); - else if (strcmp(iid, OUTLOOK_IMPORTER_IID) == 0) - return outlook_importer_new(); -#endif - return NULL; -} - struct _import_mbox_msg { MailMsg base; @@ -203,7 +187,7 @@ import_mbox_exec (struct _import_mbox_msg *m) } if (m->uri == NULL || m->uri[0] == 0) - folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_INBOX); + folder = e_mail_local_get_folder (E_MAIL_FOLDER_INBOX); else folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); @@ -360,6 +344,7 @@ import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const GDir *dir; const gchar *d; struct stat st; + const gchar *data_dir; gchar *filefull, *foldersub, *uri, *utf8_filename; const gchar *folder; @@ -367,6 +352,8 @@ import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const if (dir == NULL) return; + data_dir = em_utils_get_data_dir (); + utf8_filename = g_filename_to_utf8 (filepath, -1, NULL, NULL, NULL); camel_operation_start(NULL, _("Scanning %s"), utf8_filename); g_free (utf8_filename); @@ -395,9 +382,9 @@ import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const break; } /* FIXME: need a better way to get default store location */ - uri = g_strdup_printf("mbox:%s/local#%s", mail_component_peek_base_directory(NULL), folder); + uri = g_strdup_printf("mbox:%s/local#%s", data_dir, folder); } else { - uri = g_strdup_printf("mbox:%s/local#%s/%s", mail_component_peek_base_directory(NULL), folderparent, folder); + uri = g_strdup_printf("mbox:%s/local#%s/%s", data_dir, folderparent, folder); } printf("importing to uri %s\n", uri); diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 6c5878e633..d751547827 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -24,10 +24,8 @@ #ifndef __MAIL_IMPORTER_H__ #define __MAIL_IMPORTER_H__ -#include <bonobo/bonobo-generic-factory.h> -#include <camel/camel-folder.h> - #include <e-util/e-import.h> +#include <camel/camel-folder.h> typedef struct _MailImporter MailImporter; struct _MailImporter { @@ -57,22 +55,6 @@ EImportImporter *mbox_importer_peek(void); EImportImporter *elm_importer_peek(void); EImportImporter *pine_importer_peek(void); -#define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer:" BASE_VERSION -#define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer:" BASE_VERSION -#define NETSCAPE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Netscape_Intelligent_Importer:" BASE_VERSION - -#define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION -#define OUTLOOK_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Outlook_Importer:" BASE_VERSION - -BonoboObject *elm_intelligent_importer_new(void); -BonoboObject *pine_intelligent_importer_new(void); -BonoboObject *netscape_intelligent_importer_new(void); - -BonoboObject *mbox_importer_new(void); -BonoboObject *outlook_importer_new(void); - -BonoboObject *mail_importer_factory_cb(BonoboGenericFactory *factory, const gchar *iid, gpointer data); - /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */ /* Evolution only cares about these headers I think */ #define MSG_FLAG_READ 0x0001 |