Rework shell services initialization so that it happen either on every

2003-11-13  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/mozilla/mozilla-notifiers.cpp:
        * src/ephy-main.c: (main):
        * src/ephy-shell.c: (ephy_shell_init), (ephy_shell_startup),
        (ephy_shell_finalize), (ephy_shell_get_session),
        (ephy_shell_get_extensions_manager):
        * src/ephy-window.c: (ensure_default_icon), (ephy_window_init):

        Rework shell services initialization so that it happen either
        on every instance, before the automation stuff is used, either
        when they are requested. This appear to fix the crash with two
        instances runned simultaneously.
        (Christian I'm not quite sure this is ok for plugins manager, if
        there are problems let me know.)

1 files changed, 6 insertions, 0 deletions

diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index d2656e71c..955dc00bb 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -449,6 +449,9 @@ mozilla_notifiers_init (EphyEmbedSingle *single)
 	const EphyFontsLanguageInfo *font_languages;
 	guint n_font_languages;
 
+	eel_gconf_monitor_add ("/apps/epiphany/web");
+	eel_gconf_monitor_add ("/system/proxy");
+
 #ifdef MIGRATE_PIXEL_SIZE
 	gboolean migrate_size;
 
@@ -603,6 +606,9 @@ mozilla_notifiers_init (EphyEmbedSingle *single)
 void 
 mozilla_notifiers_free (void)
 {
+	eel_gconf_monitor_remove ("/apps/epiphany/web");
+	eel_gconf_monitor_remove ("/system/proxy");
+
 	g_list_foreach (mozilla_notifiers, 
 		        (GFunc)eel_gconf_notification_remove, 
 		        NULL);