diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/component-factory.c | 3 | ||||
| -rw-r--r-- | mail/component-factory.h | 3 | ||||
| -rw-r--r-- | mail/mail-mt.c | 6 |
4 files changed, 16 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8314002f7c..46ce9bdaf6 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2001-10-22 Ettore Perazzoli <ettore@ximian.com> + + * mail-mt.c: #include "component-factory.h". + (do_op_status): Pass the component ID instead of the msg ID. + + * component-factory.h (COMPONENT_ID): #define here instead of + `component-factory.c'. + (SUMMARY_FACTORY_ID): Likewise. + 2001-10-22 Jeffrey Stedfast <fejj@ximian.com> * mail-format.c (format_mime_part): Don't wrap error text with diff --git a/mail/component-factory.c b/mail/component-factory.c index 7962dcdd11..d6603cb9cc 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -64,9 +64,6 @@ char *evolution_dir; EvolutionShellClient *global_shell_client = NULL; -#define COMPONENT_ID "OAFIID:GNOME_Evolution_Mail_ShellComponent" -#define SUMMARY_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory" - static GHashTable *storages_hash; static EvolutionShellComponent *shell_component; diff --git a/mail/component-factory.h b/mail/component-factory.h index 5e583109ea..15e655eb74 100644 --- a/mail/component-factory.h +++ b/mail/component-factory.h @@ -24,6 +24,9 @@ #ifndef COMPONENT_FACTORY_H #define COMPONENT_FACTORY_H +#define COMPONENT_ID "OAFIID:GNOME_Evolution_Mail_ShellComponent" +#define SUMMARY_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ExecutiveSummaryComponentFactory" + void component_factory_init (void); #endif diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 9c3decf0e4..8743f42dd8 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -31,6 +31,8 @@ #include "camel/camel-url.h" #include "mail-mt.h" +#include "component-factory.h" + /*#define MALLOC_CHECK*/ #define LOG_OPS #define d(x) @@ -1057,14 +1059,14 @@ static void do_op_status(struct _mail_msg *mm) progress_icon[0] = gdk_pixbuf_new_from_xpm_data ((const char **)mail_new_xpm); MAIL_MT_UNLOCK (mail_msg_lock); - clientid = g_strdup_printf ("%p", msg); if (msg->ops->describe_msg) what = msg->ops->describe_msg (msg, FALSE); else what = _("Working"); if (global_shell_client) { - activity = evolution_activity_client_new (global_shell_client, clientid, + activity = evolution_activity_client_new (global_shell_client, + COMPONENT_ID, progress_icon, what, TRUE, &display); } else { |