aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-notifiers.cpp
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-11-14 01:28:04 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-11-14 01:28:04 +0800
commit62caa3e6eec7b6109703071179ed260aac507db7 (patch)
tree9ccf963ec55954e7adab7b4a68eac776d9114ca1 /embed/mozilla/mozilla-notifiers.cpp
parent00c81d309184a49f6e711c4ce0b61ae8f94b42ae (diff)
downloadgsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar
gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.gz
gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.bz2
gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.lz
gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.xz
gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.tar.zst
gsoc2013-epiphany-62caa3e6eec7b6109703071179ed260aac507db7.zip
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.)
Diffstat (limited to 'embed/mozilla/mozilla-notifiers.cpp')
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp6
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);