diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-16 23:25:08 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-16 23:42:26 +0800 |
| commit | 672adf12a0923437e90d08ab7925bd9329fcce0d (patch) | |
| tree | 53c076d56359c111085dad615295ecf0f5be7342 /mail/importers | |
| parent | c4716bf2e904a4bcf573ee30841378c1f53092ee (diff) | |
| download | gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.gz gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.bz2 gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.lz gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.xz gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.zst gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.zip | |
Fix compiler warnings and deprecated GTK+ API usage.
Diffstat (limited to 'mail/importers')
| -rw-r--r-- | mail/importers/mail-importer.c | 17 | ||||
| -rw-r--r-- | mail/importers/mail-importer.h | 20 |
2 files changed, 1 insertions, 36 deletions
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index dd4de6370b..61726dd37f 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -114,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; diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index b0dfbb3f08..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.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 |