aboutsummaryrefslogtreecommitdiffstats
path: root/mail/folder-browser-factory.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-08-14 06:41:02 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-08-14 06:41:02 +0800
commitd5e7aef9f23d87f1fa3e6ff51a8d567f7539ef0b (patch)
treee2c174f31e9e83aa9220b3fd2d91e9a453f94335 /mail/folder-browser-factory.c
parent13fa05375c32edc73df82eb2ff9c44bf4d28bdac (diff)
downloadgsoc2013-evolution-d5e7aef9f23d87f1fa3e6ff51a8d567f7539ef0b.tar.gz
gsoc2013-evolution-d5e7aef9f23d87f1fa3e6ff51a8d567f7539ef0b.tar.zst
gsoc2013-evolution-d5e7aef9f23d87f1fa3e6ff51a8d567f7539ef0b.zip
Fix the ugly hack to get rid of a CORBA race condition. Yes, it's
even uglier now. svn path=/trunk/; revision=4814
Diffstat (limited to 'mail/folder-browser-factory.c')
-rw-r--r--mail/folder-browser-factory.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index c8575e6747..602cff09b4 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -26,8 +26,8 @@
#include "shell/Evolution.h"
#include "mail-config.h"
-/* The active folder browser BonoboControls. */
-static GList *active_controls = NULL;
+/* The FolderBrowser BonoboControls we have. */
+static GList *control_list = NULL;
static GnomeUIInfo gnome_toolbar [] = {
GNOMEUIINFO_ITEM_STOCK (N_("Get mail"), N_("Check for new mail"), fetch_mail, GNOME_STOCK_PIXMAP_MAIL_RCV),
@@ -61,8 +61,6 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
GtkWidget *toolbar, *toolbar_frame, *folder_browser;
char *toolbar_name = g_strdup_printf ("/Toolbar%d", fb->serial);
- active_controls = g_list_prepend (active_controls, control);
-
remote_uih = bonobo_control_get_remote_ui_handler (control);
bonobo_ui_handler_set_container (uih, remote_uih);
bonobo_object_release_unref (remote_uih, NULL);
@@ -182,8 +180,6 @@ control_deactivate (BonoboControl *control,
{
char *toolbar_name = g_strdup_printf ("/Toolbar%d", fb->serial);
- active_controls = g_list_remove (active_controls, control);
-
bonobo_ui_handler_menu_remove (uih, "/File/<Print Placeholder>/separator1");
bonobo_ui_handler_menu_remove (uih, "/File/<Print Placeholder>/Print message...");
@@ -223,7 +219,7 @@ control_destroy_cb (BonoboControl *control,
{
GtkWidget *folder_browser = user_data;
- active_controls = g_list_remove (active_controls, control);
+ control_list = g_list_remove (control_list, control);
gtk_object_destroy (GTK_OBJECT (folder_browser));
}
@@ -256,13 +252,15 @@ folder_browser_factory_new_control (const char *uri)
control_activate_cb, folder_browser);
gtk_signal_connect (GTK_OBJECT (control), "destroy",
- control_destroy_cb, folder_browser);
+ control_destroy_cb, folder_browser);
+
+ control_list = g_list_prepend (control_list, control);
return control;
}
GList *
-folder_browser_factory_get_active_control_list (void)
+folder_browser_factory_get_control_list (void)
{
- return active_controls;
+ return control_list;
}