callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#include "component-factory.h". (do_op_status): Pass the component ID

Browse Source 
* 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.

svn path=/trunk/; revision=13895
This commit is contained in:
Ettore Perazzoli
2001-10-22 21:16:10 +00:00
parent 7429141682
commit 739e7cd1da
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mail/ChangeLog
View File

@ -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

3
mail/component-factory.c
View File

@ -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;

3
mail/component-factory.h
View File

@ -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

6
mail/mail-mt.c
View File

@ -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 {