diff options
| -rw-r--r-- | mail/ChangeLog | 13 | ||||
| -rw-r--r-- | mail/Makefile.am | 6 | ||||
| -rw-r--r-- | mail/mail-component-factory.c | 7 | ||||
| -rw-r--r-- | mail/mail-session.c | 5 |
4 files changed, 21 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 732ecb35af..ae5efa8bd0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,16 @@ +2005-07-06 Vivek Jain <jvivek@novell.com> + + * em-junk-filter.c : moved to plugins/sa-junk-plugin + * em-junk-filter.h :removed + * em-junk.plugin.[ch]: removed + * em-junk-hook.[ch] : added new files to have a new hook + * Makefile.am :updated to removed/add these files. + * mail-session.c: (mail_session_init): + assign NULL to junk_plugin, remove included file + "em-junk-filter.h" + * mail-component-factory.c : (make_factory) + register type for EMJunkHook + 2005-07-05 Not Zed <NotZed@Ximian.com> * em-format-html-display.c (efhd_attachment_image): use the cache, diff --git a/mail/Makefile.am b/mail/Makefile.am index 42cd33b356..9e4cafdc2d 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -88,6 +88,7 @@ mailinclude_HEADERS = \ em-html-stream.h \ em-icon-stream.h \ em-inline-filter.h \ + em-junk-hook.h \ em-menu.h \ em-message-browser.h \ em-popup.h \ @@ -155,10 +156,7 @@ libevolution_mail_la_SOURCES = \ em-html-stream.c \ em-icon-stream.c \ em-inline-filter.c \ - em-junk-filter.c \ - em-junk-filter.h \ - em-junk-plugin.c \ - em-junk-plugin.h \ + em-junk-hook.c \ em-mailer-prefs.c \ em-mailer-prefs.h \ em-menu.c \ diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c index f0fafe58e1..cb0b10a6d0 100644 --- a/mail/mail-component-factory.c +++ b/mail/mail-component-factory.c @@ -40,6 +40,7 @@ #include "em-event.h" #include "em-config.h" #include "em-format-hook.h" +#include "em-junk-hook.h" #include "em-format-html-display.h" #include "importers/mail-importer.h" @@ -96,13 +97,15 @@ make_factory (PortableServer_POA poa, const char *iid, gpointer impl_ptr, CORBA_ e_plugin_hook_register_type(em_popup_hook_get_type()); e_plugin_hook_register_type(em_menu_hook_get_type()); e_plugin_hook_register_type(em_config_hook_get_type()); - + em_format_hook_register_type(em_format_get_type()); em_format_hook_register_type(em_format_html_get_type()); em_format_hook_register_type(em_format_html_display_get_type()); + em_junk_hook_register_type(emj_get_type()); + e_plugin_hook_register_type(em_format_hook_get_type()); - e_plugin_hook_register_type(em_event_hook_get_type()); + e_plugin_hook_register_type(em_junk_hook_get_type()); } return bonobo_shlib_factory_std (FACTORY_ID, poa, impl_ptr, factory, NULL, ev); diff --git a/mail/mail-session.c b/mail/mail-session.c index 86961c019f..7328581a89 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -54,7 +54,6 @@ #include "mail-ops.h" #include <libedataserverui/e-passwords.h> #include "libedataserver/e-msgport.h" -#include "em-junk-filter.h" #include "e-util/e-error.h" #define d(x) @@ -653,9 +652,7 @@ mail_session_init (const char *base_directory) session_check_junk_notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/junk", (GConfClientNotifyFunc) mail_session_check_junk_notify, session, NULL, NULL); - session->junk_plugin = CAMEL_JUNK_PLUGIN (em_junk_filter_get_plugin ()); - if (session->junk_plugin) - camel_junk_plugin_init (session->junk_plugin); + session->junk_plugin = NULL; /* The shell will tell us to go online. */ camel_session_set_online ((CamelSession *) session, FALSE); |