diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-08-20 12:02:10 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-08-20 12:02:10 +0800 |
| commit | ac4f13b93e22cc59dbe36ff3a4825bb5077523c4 (patch) | |
| tree | 6a78647c2ac037ed920249e1b305ba1f231c0829 /mail/mail-vfolder.c | |
| parent | 4455dabad1231935ee45c9e028a2c3bafe402d62 (diff) | |
| download | gsoc2013-evolution-ac4f13b93e22cc59dbe36ff3a4825bb5077523c4.tar.gz gsoc2013-evolution-ac4f13b93e22cc59dbe36ff3a4825bb5077523c4.tar.zst gsoc2013-evolution-ac4f13b93e22cc59dbe36ff3a4825bb5077523c4.zip | |
Allow the activity to be NULL if there isn't a global_shell_client so that
2001-08-19 Jeffrey Stedfast <fejj@ximian.com>
* mail-mt.c (do_op_status): Allow the activity to be NULL if there
isn't a global_shell_client so that we don't try and report status
updates when the shell is destroyed.
* mail-config.c (add_shortcut_entry): Return if there isn't a
global_shell_client.
* component-factory.c (owner_set_cb): set the global_shell_client
here and connect to the destroy signal.
* mail-vfolder.c (vfolder_create_storage): Use an extern global_shell_client.
svn path=/trunk/; revision=12242
Diffstat (limited to 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 4af918e64d..8240b0008c 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -49,8 +49,7 @@ static GList *source_folders; /* list of source folders */ /* Ditto below */ EvolutionStorage *vfolder_storage; -/* GROSS HACK: for passing to other parts of the program */ -EvolutionShellClient *global_shell_client = NULL; +extern EvolutionShellClient *global_shell_client; /* more globals ... */ extern char *evolution_dir; @@ -265,19 +264,16 @@ vfolder_remove_cb (EvolutionStorage *storage, void vfolder_create_storage (EvolutionShellComponent *shell_component) { - EvolutionShellClient *shell_client; GNOME_Evolution_Shell corba_shell; EvolutionStorage *storage; char *user, *system; - shell_client = evolution_shell_component_get_owner (shell_component); - if (shell_client == NULL) { + if (global_shell_client == NULL) { g_warning ("We have no shell!?"); return; } - global_shell_client = shell_client; - corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)); + corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (global_shell_client)); storage = evolution_storage_new (_("VFolders"), NULL, NULL); if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) { |