Fix number of /'s in URI.

2006-01-17  Christian Persch  <chpe@cvs.gnome.org>

	* data/chrome/epiphany.manifest.in:

	Fix number of /'s in URI.

	* data/epiphany.schemas.in:

	Add new entries.

	* embed/mozilla/EphyAboutModule.cpp:

	Fix title.

	* data/glade/prefs-dialog.glade:
	* embed/ephy-embed-prefs.h:
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* embed/mozilla/mozilla-notifiers.h:
	* lib/eel-gconf-extensions.c: (eel_gconf_unset_key),
	(eel_gconf_notify):
	* lib/eel-gconf-extensions.h:
	* lib/egg/egg-editable-toolbar.c: (popup_context_menu_cb),
	(button_press_event_cb), (egg_editable_toolbar_set_ui_manager),
	(egg_editable_toolbar_set_selected):
	* lib/ephy-dialog.c: (set_value_from_pref), (set_pref_from_value),
	(set_value_from_togglebutton), (strcmp_with_null),
	(get_index_from_value), (compare_values),
	(set_togglebutton_from_value), (set_pref_from_info_and_emit),
	(spinbutton_changed_cb), (save_info):
	* lib/ephy-dialog.h:
	* lib/ephy-file-helpers.c: (ephy_file_monitor_timeout_cb),
	(ephy_file_monitor_cb), (ephy_file_monitor_add),
	(ephy_file_monitor_cancel):
	* lib/ephy-file-helpers.h:
	* src/ephy-extensions-manager.c:
	(ephy_extensions_manager_load_file):
	* src/ephy-window.c:
	* src/popup-commands.c: (popup_cmd_bookmark_link):
	* src/prefs-dialog.c: (prefs_dialog_finalize), (setup_font_combo),
	(fonts_language_changed_cb), (font_prefs_dialog_response_cb),
	(row_is_separator), (setup_fonts_dialog),
	(font_prefs_button_clicked_cb), (css_checkbox_toggled),
	(css_edit_button_clicked_cb), (prefs_dialog_init):

	Rework font prefs, and add user stylesheet setting.

	* src/bookmarks/ephy-bookmark-action-group.c: (node_added_cb):
	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_get_local):
	* src/window-commands.c: (window_cmd_file_bookmark_page):

	Some build fixes.

5 files changed, 671 insertions, 88 deletions

diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index 090770724..fe2d4ee7f 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -6,6 +6,7 @@
 #define CONF_RENDERING_LANGUAGE "/apps/epiphany/web/language"
 #define CONF_RENDERING_USE_OWN_COLORS "/apps/epiphany/web/use_own_colors"
 #define CONF_RENDERING_USE_OWN_FONTS "/apps/epiphany/web/use_own_fonts"
+#define CONF_USER_CSS_ENABLED "/apps/epiphany/web/user_css_enabled"
 #define CONF_SECURITY_ALLOW_POPUPS "/apps/epiphany/web/allow_popups"
 #define CONF_SECURITY_JAVA_ENABLED "/apps/epiphany/web/java_enabled"
 #define CONF_SECURITY_JAVASCRIPT_ENABLED "/apps/epiphany/web/javascript_enabled"
@@ -13,6 +14,8 @@
 #define CONF_LANGUAGE_AUTODETECT_ENCODING "/apps/epiphany/web/autodetect_encoding"
 #define CONF_LANGUAGE_DEFAULT_ENCODING "/apps/epiphany/web/default_encoding"
 #define CONF_BROWSE_WITH_CARET "/apps/epiphany/web/browse_with_caret"
+#define CONF_IMAGE_ANIMATION_MODE "/apps/epiphany/web/image_animation"
+#define CONF_IMAGE_LOADING_MODE "/apps/epiphany/web/image_loading"
 
 /* These are defined gnome wide now */
 #define CONF_NETWORK_PROXY_MODE "/system/proxy/mode"
@@ -26,9 +29,13 @@
 #define CONF_NETWORK_SOCKS_PROXY_PORT "/system/proxy/socks_port"
 #define CONF_NETWORK_PROXY_AUTO_URL "/system/proxy/autoconfig_url"
 #define CONF_NETWORK_PROXY_IGNORE_HOSTS "/system/http_proxy/ignore_hosts"
+#define CONF_DESKTOP_FONT_VARIABLE "/desktop/gnome/interface/font_name"
+#define CONF_DESKTOP_FONT_MONOSPACE "/desktop/gnome/interface/monospace_font_name"
 
 /* DEPRECATED, we migrate them */
 #define CONF_RENDERING_FONT_VAR_SIZE_OLD "/apps/epiphany/web/font_var_size"
 #define CONF_RENDERING_FONT_FIXED_SIZE_OLD "/apps/epiphany/web/font_fixed_size"
 #define CONF_RENDERING_FONT_MIN_SIZE_OLD "/apps/epiphany/web/font_min_size"
 #define CONF_RENDERING_FONT_TYPE_OLD "/apps/epiphany/web/default_font_type"
+
+#define USER_STYLESHEET_FILENAME	"user-stylesheet.css"
diff --git a/embed/mozilla/EphyAboutModule.cpp b/embed/mozilla/EphyAboutModule.cpp
index 6f916b848..350fa8569 100644
--- a/embed/mozilla/EphyAboutModule.cpp
+++ b/embed/mozilla/EphyAboutModule.cpp
@@ -580,7 +580,7 @@ EphyAboutModule::WritePage(nsIURI *aOriginalURI,
 	       "\">\n"
 		"<div id=\"body\">"
 		"<h1>");
-	Write (stream, aTitle);
+	Write (stream, aPrimary);
 	Write (stream,
 	       "</h1>\n");
 	if (aSecondary)
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index d542dc20c..21b9d7462 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -102,22 +102,26 @@
 #include <nsIIDNService.h>
 #endif /* ALLOW_PRIVATE_API */
 
-#ifdef HAVE_GECKO_1_8
-#include <nsIStyleSheetService.h>
-#include "EphyUtils.h"
-#endif
-
 #include <stdlib.h>
 
 #ifdef ENABLE_NETWORK_MANAGER
 #include <libnm_glib.h>
 #endif
 
+#ifdef HAVE_GECKO_1_8
+#include <nsIURI.h>
+#include <nsIStyleSheetService.h>
+#include "EphyUtils.h"
+#include "ephy-file-helpers.h"
+#endif
+
 #define MOZILLA_PROFILE_DIR  "/mozilla"
 #define MOZILLA_PROFILE_NAME "epiphany"
 #define MOZILLA_PROFILE_FILE "prefs.js"
 #define DEFAULT_PROFILE_FILE SHARE_DIR"/default-prefs.js"
 
+#define USER_CSS_LOAD_DELAY 500 /* ms */
+
 #define MOZILLA_EMBED_SINGLE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), MOZILLA_TYPE_EMBED_SINGLE, MozillaEmbedSinglePrivate))
 
 struct MozillaEmbedSinglePrivate
@@ -133,6 +137,12 @@ struct MozillaEmbedSinglePrivate
 	libnm_glib_ctx *nm_context;
 	guint nm_callback_id;
 #endif
+#ifdef HAVE_GECKO_1_8
+        char *user_css_uri;
+        guint user_css_enabled_notifier_id;
+        EphyFileMonitor *user_css_file_monitor;
+        guint user_css_enabled : 1;
+#endif
 
 	guint online : 1;
 };
@@ -592,6 +602,156 @@ mozilla_init_network_manager (MozillaEmbedSingle *single)
 
 #endif /* ENABLE_NETWORK_MANAGER */
 
+#ifdef HAVE_GECKO_1_8
+
+static void
+user_css_register (MozillaEmbedSingle *single)
+{
+	MozillaEmbedSinglePrivate *priv = single->priv;
+
+	nsresult rv;
+	nsCOMPtr<nsIURI> uri;
+	rv = EphyUtils::NewURI (getter_AddRefs (uri),
+				nsDependentCString (priv->user_css_uri));
+	NS_ENSURE_SUCCESS (rv, );
+
+	nsCOMPtr<nsIStyleSheetService> service
+			(do_GetService ("@mozilla.org/content/style-sheet-service;1", &rv));
+	NS_ENSURE_SUCCESS (rv, );
+
+	rv = service->LoadAndRegisterSheet (uri, nsIStyleSheetService::AGENT_SHEET);
+	if (NS_FAILED (rv))
+	{
+		g_warning ("Registering the user stylesheet failed (rv=%x)!\n", rv);
+	}
+}
+
+static void
+user_css_unregister (MozillaEmbedSingle *single)
+{
+	MozillaEmbedSinglePrivate *priv = single->priv;
+
+	nsresult rv;
+	nsCOMPtr<nsIURI> uri;
+	rv = EphyUtils::NewURI (getter_AddRefs (uri),
+				nsDependentCString (priv->user_css_uri));
+	NS_ENSURE_SUCCESS (rv, );
+
+	nsCOMPtr<nsIStyleSheetService> service
+			(do_GetService ("@mozilla.org/content/style-sheet-service;1", &rv));
+	NS_ENSURE_SUCCESS (rv, );
+
+	PRBool isRegistered = PR_FALSE;
+	rv = service->SheetRegistered (uri, nsIStyleSheetService::USER_SHEET,
+				       &isRegistered);
+	if (NS_SUCCEEDED (rv) && isRegistered)
+	{
+		rv = service->UnregisterSheet (uri, nsIStyleSheetService::USER_SHEET);
+	}
+	if (NS_FAILED (rv))
+	{
+		g_warning ("Unregistering the user stylesheet failed (rv=%x)!\n", rv);
+	}
+}
+
+static void
+user_css_file_monitor_func (EphyFileMonitor *,
+			    const char *,
+			    MozillaEmbedSingle *single)
+{
+	LOG ("Reregistering the user style sheet");
+
+	user_css_unregister (single);
+	user_css_register (single);
+}
+
+static void
+user_css_enabled_notify (GConfClient *client,
+			 guint cnxn_id,
+			 GConfEntry *entry,
+			 MozillaEmbedSingle *single)
+{
+	MozillaEmbedSinglePrivate *priv = single->priv;
+	guint enabled;
+
+	enabled = eel_gconf_get_boolean (CONF_USER_CSS_ENABLED) != FALSE;
+	if (priv->user_css_enabled == enabled) return;
+
+	LOG ("User stylesheet enabled: %s", enabled ? "t" : "f");
+
+	priv->user_css_enabled = enabled;
+
+        if (enabled)
+	{
+		user_css_register (single);
+
+		g_assert (priv->user_css_file_monitor == NULL);
+		priv->user_css_file_monitor =
+			ephy_file_monitor_add (priv->user_css_uri,
+						GNOME_VFS_MONITOR_FILE,
+						USER_CSS_LOAD_DELAY,
+						(EphyFileMonitorFunc) user_css_file_monitor_func,
+						NULL,
+						single);
+	}
+        else
+	{
+		if (priv->user_css_file_monitor != NULL)
+		{
+			ephy_file_monitor_cancel (priv->user_css_file_monitor);
+			priv->user_css_file_monitor = NULL;
+		}
+
+		user_css_unregister (single);
+	}
+}
+
+static void
+mozilla_stylesheet_init (MozillaEmbedSingle *single)
+{
+	MozillaEmbedSinglePrivate *priv = single->priv;
+	char *user_css_file;
+
+	user_css_file = g_build_filename (ephy_dot_dir (),
+					  USER_STYLESHEET_FILENAME,
+					  NULL);
+	priv->user_css_uri = gnome_vfs_get_uri_from_local_path (user_css_file);
+	g_free (user_css_file);
+
+	user_css_enabled_notify (NULL, 0, NULL, single);
+	priv->user_css_enabled_notifier_id =
+		eel_gconf_notification_add
+			(CONF_USER_CSS_ENABLED,
+			 (GConfClientNotifyFunc) user_css_enabled_notify,
+			 single);
+}
+
+static void
+mozilla_stylesheet_shutdown (MozillaEmbedSingle *single)
+{
+	MozillaEmbedSinglePrivate *priv = single->priv;
+
+	if (priv->user_css_enabled_notifier_id != 0)
+	{
+		eel_gconf_notification_remove (priv->user_css_enabled_notifier_id);
+		priv->user_css_enabled_notifier_id = 0;
+	}
+
+	if (priv->user_css_file_monitor != NULL)
+	{
+		ephy_file_monitor_cancel (priv->user_css_file_monitor);
+		priv->user_css_file_monitor = NULL;
+	}
+
+	if (priv->user_css_uri != NULL)
+	{
+		g_free (priv->user_css_uri);
+		priv->user_css_uri = NULL;
+	}
+}
+
+#endif /* HAVE_GECKO_1_8 */
+
 static gboolean
 init_services (MozillaEmbedSingle *single)
 {
@@ -641,6 +801,10 @@ init_services (MozillaEmbedSingle *single)
 	mozilla_init_network_manager (single);
 #endif
 
+#ifdef HAVE_GECKO_1_8
+        mozilla_stylesheet_init (single);
+#endif
+
 	return TRUE;
 }
 
@@ -697,6 +861,10 @@ mozilla_embed_single_dispose (GObject *object)
 	MozillaEmbedSingle *single = MOZILLA_EMBED_SINGLE (object);
 	MozillaEmbedSinglePrivate *priv = single->priv;
 
+#ifdef HAVE_GECKO_1_8
+        mozilla_stylesheet_shutdown (single);
+#endif
+
 	if (priv->mSingleObserver)
 	{
 		priv->mSingleObserver->Detach ();
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index db227962b..711d401eb 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -45,13 +45,15 @@
 #include <nsCOMPtr.h>
 #include <nsIServiceManager.h>
 #include <nsIPrefService.h>
+#include <nsMemory.h>
 
 /* define to migrate epiphany 1.0 font preferences */
 #define MIGRATE_PIXEL_SIZE
 
 /* Keeps the list of the notifiers we installed for mozilla prefs */
 /* to be able to remove them when exiting */
-GList *notifiers = NULL;
+static GList *notifiers = NULL;
+static nsIPrefBranch *gPrefBranch;
 
 typedef struct
 {
@@ -71,15 +73,18 @@ free_pref_data (PrefData *data)
 }
 
 static gboolean
-transform_accept_languages_list (GConfValue *gcvalue,
+transform_accept_languages_list (GConfEntry *gcentry,
 				 GValue *value,
 				 gpointer user_data)
 {
+	GConfValue *gcvalue;
 	GArray *array;
 	GSList *languages, *l;
 	char **langs;
 
-	if (gcvalue->type != GCONF_VALUE_LIST ||
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_LIST ||
 	    gconf_value_get_list_type (gcvalue) != GCONF_VALUE_STRING) return FALSE;
 
 	languages = gconf_value_get_list (gcvalue);
@@ -117,11 +122,15 @@ transform_accept_languages_list (GConfValue *gcvalue,
 }
 
 static gboolean
-transform_cache_size (GConfValue *gcvalue,
+transform_cache_size (GConfEntry *gcentry,
 		      GValue *value,
 		      gpointer user_data)
 {
-	if (gcvalue->type != GCONF_VALUE_INT) return FALSE;
+	GConfValue *gcvalue;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_INT) return FALSE;
 
 	g_value_init (value, G_TYPE_INT);
 	g_value_set_int (value, gconf_value_get_int (gcvalue) * 1024);
@@ -130,15 +139,18 @@ transform_cache_size (GConfValue *gcvalue,
 }
 
 static gboolean
-transform_cookies_accept_mode (GConfValue *gcvalue,
+transform_cookies_accept_mode (GConfEntry *gcentry,
 			       GValue *value,
 			       gpointer user_data)
 
 {
+	GConfValue *gcvalue;
 	const char *mode;
 	int mozilla_mode = 0;
 
-	if (gcvalue->type != GCONF_VALUE_STRING) return FALSE;
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	     gcvalue->type != GCONF_VALUE_STRING) return FALSE;
 
 	mode = gconf_value_get_string (gcvalue);
 	if (mode == NULL) return FALSE;
@@ -163,16 +175,19 @@ transform_cookies_accept_mode (GConfValue *gcvalue,
 }
 
 static gboolean
-transform_encoding (GConfValue *gcvalue,
+transform_encoding (GConfEntry *gcentry,
 		    GValue *value,
 		    gpointer user_data)
 {
+	GConfValue *gcvalue;
 	EphyEncodings *encodings;
 	EphyNode *node;
 	const char *code;
 	gboolean is_autodetector;
 
-	if (gcvalue->type != GCONF_VALUE_STRING) return FALSE;
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_STRING) return FALSE;
 
 	code = gconf_value_get_string (gcvalue);
 	if (code == NULL) return FALSE;
@@ -191,28 +206,54 @@ transform_encoding (GConfValue *gcvalue,
 }
 
 static gboolean
-transform_font_size (GConfValue *gcvalue,
-		     GValue *value,
-		     gpointer user_data)
+transform_image_animation_mode (GConfEntry *gcentry,
+			        GValue *value,
+			        gpointer user_data)
+
 {
-	if (gcvalue->type != GCONF_VALUE_INT) return FALSE;
+	GConfValue *gcvalue;
+	const char *mode;
+	int mozilla_mode = 0;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_STRING) return FALSE;
+
+	mode = gconf_value_get_string (gcvalue);
+	if (mode == NULL) return FALSE;
+
+	if (strcmp (mode, "normal") == 0)
+	{
+		mozilla_mode = 0;
+	}
+	else if (strcmp (mode, "once") == 0)
+	{
+		mozilla_mode = 1;
+	}
+	else if (strcmp (mode, "disabled") == 0)
+	{
+		mozilla_mode = 2;
+	}
 
 	g_value_init (value, G_TYPE_INT);
-	g_value_set_int (value, MAX (1, gconf_value_get_int (gcvalue)));
+	g_value_set_int (value, mozilla_mode);
 
 	return TRUE;
 }
 
 static gboolean
-transform_proxy_ignore_list (GConfValue *gcvalue,
+transform_proxy_ignore_list (GConfEntry *gcentry,
 			     GValue *value,
 			     gpointer user_data)
 {
+	GConfValue *gcvalue;
 	GArray *array;
 	GSList *hosts, *l;
 	char **strings;
 
-	if (gcvalue->type != GCONF_VALUE_LIST ||
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_LIST ||
 	    gconf_value_get_list_type (gcvalue) != GCONF_VALUE_STRING) return FALSE;
 
 	hosts = gconf_value_get_list (gcvalue);
@@ -243,14 +284,17 @@ transform_proxy_ignore_list (GConfValue *gcvalue,
 }
 
 static gboolean
-transform_proxy_mode (GConfValue *gcvalue,
+transform_proxy_mode (GConfEntry *gcentry,
 		      GValue *value,
 		      gpointer user_data)
 {
+	GConfValue *gcvalue;
 	const char *mode;
 	int mozilla_mode = 0;
 
-	if (gcvalue->type != GCONF_VALUE_STRING) return FALSE;
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_STRING) return FALSE;
 
 	mode = gconf_value_get_string (gcvalue);
 	if (mode == NULL) return FALSE;
@@ -271,11 +315,15 @@ transform_proxy_mode (GConfValue *gcvalue,
 }
 
 static gboolean
-transform_use_own_fonts (GConfValue *gcvalue,
+transform_use_own_fonts (GConfEntry *gcentry,
 			 GValue *value,
 			 gpointer user_data)
 {
-	if (gcvalue->type != GCONF_VALUE_BOOL) return FALSE;
+	GConfValue *gcvalue;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_BOOL) return FALSE;
 
 	g_value_init (value, G_TYPE_INT);
 	g_value_set_int (value, gconf_value_get_bool (gcvalue) ? 0 : 1);
@@ -284,11 +332,15 @@ transform_use_own_fonts (GConfValue *gcvalue,
 }
 
 extern "C" gboolean
-mozilla_notifier_transform_bool (GConfValue *gcvalue,
+mozilla_notifier_transform_bool (GConfEntry *gcentry,
 				 GValue *value,
 				 gpointer user_data)
 {
-	if (gcvalue->type != GCONF_VALUE_BOOL) return FALSE;
+	GConfValue *gcvalue;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_BOOL) return FALSE;
 
 	g_value_init (value, G_TYPE_BOOLEAN);
 	g_value_set_boolean (value, gconf_value_get_bool (gcvalue));
@@ -297,11 +349,15 @@ mozilla_notifier_transform_bool (GConfValue *gcvalue,
 }
 
 extern "C" gboolean
-mozilla_notifier_transform_bool_invert (GConfValue *gcvalue,
+mozilla_notifier_transform_bool_invert (GConfEntry *gcentry,
 					GValue *value,
 					gpointer user_data)
 {
-	if (gcvalue->type != GCONF_VALUE_BOOL) return FALSE;
+	GConfValue *gcvalue;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_BOOL) return FALSE;
 
 	g_value_init (value, G_TYPE_BOOLEAN);
 	g_value_set_boolean (value, !gconf_value_get_bool (gcvalue));
@@ -310,11 +366,15 @@ mozilla_notifier_transform_bool_invert (GConfValue *gcvalue,
 }
 
 extern "C" gboolean
-mozilla_notifier_transform_int (GConfValue *gcvalue,
+mozilla_notifier_transform_int (GConfEntry *gcentry,
 				GValue *value,
 				gpointer user_data)
 {
-	if (gcvalue->type != GCONF_VALUE_INT) return FALSE;
+	GConfValue *gcvalue;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_INT) return FALSE;
 
 	g_value_init (value, G_TYPE_INT);
 	g_value_set_int (value, gconf_value_get_int (gcvalue));
@@ -323,13 +383,16 @@ mozilla_notifier_transform_int (GConfValue *gcvalue,
 }
 
 extern "C" gboolean
-mozilla_notifier_transform_string (GConfValue *gcvalue,
+mozilla_notifier_transform_string (GConfEntry *gcentry,
 				   GValue *value,
 				   gpointer user_data)
 {
+	GConfValue *gcvalue;
 	const char *str;
 
-	if (gcvalue->type != GCONF_VALUE_STRING) return FALSE;
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_STRING) return FALSE;
 
 	str = gconf_value_get_string (gcvalue);
 	if (str == NULL) return FALSE;
@@ -357,6 +420,9 @@ static const PrefData notifier_entries[] =
 	{ CONF_SECURITY_ALLOW_POPUPS,
 	  "dom.disable_open_during_load",
 	  mozilla_notifier_transform_bool_invert },
+	{ CONF_IMAGE_ANIMATION_MODE,
+	  "image.animation_mode",
+	  transform_image_animation_mode },
 	{ CONF_RENDERING_LANGUAGE,
 	  "intl.accept_languages",
 	  transform_accept_languages_list },
@@ -416,29 +482,62 @@ gboolean
 mozilla_pref_set (const char *pref,
 		  const GValue *value)
 {
+	NS_ENSURE_TRUE (gPrefBranch, FALSE);
+
 	g_return_val_if_fail (pref != NULL, FALSE);
 	g_return_val_if_fail (value != NULL, FALSE);
 
-	nsCOMPtr<nsIPrefService> prefService
-		(do_GetService (NS_PREFSERVICE_CONTRACTID));
-	NS_ENSURE_TRUE (prefService, FALSE);
-
-	nsCOMPtr<nsIPrefBranch> prefBranch;
-	prefService->GetBranch ("", getter_AddRefs (prefBranch));
-	NS_ENSURE_TRUE (prefBranch, FALSE);
-
 	nsresult rv;
 	switch (G_VALUE_TYPE (value))
 	{
 		case G_TYPE_INT:
-			rv = prefBranch->SetIntPref (pref, g_value_get_int (value));
+		{
+			PRInt32 old_value = 0;
+			PRInt32 new_value = g_value_get_int (value);
+			rv = gPrefBranch->GetIntPref (pref, &old_value);
+			if (NS_FAILED (rv) || old_value != new_value)
+			{
+				rv = gPrefBranch->SetIntPref (pref, g_value_get_int (value));
+			}
 			break;
+		}
 		case G_TYPE_BOOLEAN:
-			rv = prefBranch->SetBoolPref (pref, g_value_get_boolean (value));
+		{
+			PRBool old_value = PR_FALSE;
+			PRBool new_value = g_value_get_boolean (value);
+			rv = gPrefBranch->GetBoolPref (pref, &old_value);
+			if (NS_FAILED (rv) || old_value != new_value)
+			{
+				rv = gPrefBranch->SetBoolPref (pref, new_value);
+			}
 			break;
+		}
 		case G_TYPE_STRING:
-			rv = prefBranch->SetCharPref (pref, g_value_get_string (value));
+		{
+			const char *new_value = g_value_get_string (value);
+			if (new_value == NULL)
+			{
+				rv = gPrefBranch->ClearUserPref (pref);
+			}
+			else
+			{
+				char *old_value = nsnull;
+
+				rv = gPrefBranch->GetCharPref (pref, &old_value);
+				if (NS_FAILED (rv) ||
+				    old_value == nsnull ||
+				    strcmp (old_value, new_value) != 0)
+				{
+					rv = gPrefBranch->SetCharPref (pref, new_value);
+				}
+
+				if (old_value)
+				{
+					nsMemory::Free (old_value);
+				}
+			}
 			break;
+		}
 		default:
 			g_return_val_if_reached (FALSE);
 			rv = NS_ERROR_FAILURE;
@@ -451,31 +550,28 @@ mozilla_pref_set (const char *pref,
 static void
 notify_cb (GConfClient *client,
 	   guint cnxn_id,
-	   GConfEntry *entry,
+	   GConfEntry *gcentry,
 	   PrefData *data)
 {
-	GConfValue *gcvalue;
 	GValue value = { 0, };
 
-	g_return_if_fail (entry != NULL);
+	g_return_if_fail (gcentry != NULL);
 	g_return_if_fail (data != NULL);
 
-	gcvalue = gconf_entry_get_value (entry);
-	/* happens on initial notify if the key doesn't exist */
-	if (gcvalue == NULL) return;
-
-	if (data->func (gcvalue, &value, data->user_data))
+	if (data->func (gcentry, &value, data->user_data))
 	{
 		mozilla_pref_set (data->mozilla_pref, &value);
 		g_value_unset (&value);
 	}
 }
 
-extern "C" guint
-mozilla_notifier_add (const char *gconf_key,
-		      const char *mozilla_pref,
-		      PrefValueTransformFunc func,
-		      gpointer user_data)
+static guint
+mozilla_notifier_add_internal (const char *gconf_key,
+			       GConfClientNotifyFunc notify_func,
+			       const char *mozilla_pref,
+			       PrefValueTransformFunc func,
+			       gpointer user_data,
+			       GFreeFunc free_data_func)
 {
 	GConfClient *client;
 	PrefData *data;
@@ -489,6 +585,7 @@ mozilla_notifier_add (const char *gconf_key,
 	client = eel_gconf_client_get_global ();
 	g_return_val_if_fail (client != NULL, 0);
 
+	/* FIXME: use slice allocator */
 	data = g_new (PrefData, 1);
 	data->gconf_key = g_strdup (gconf_key);
 	data->mozilla_pref = g_strdup (mozilla_pref);
@@ -496,8 +593,8 @@ mozilla_notifier_add (const char *gconf_key,
 	data->user_data = user_data;
 
 	cnxn_id = gconf_client_notify_add (client, gconf_key,
-					   (GConfClientNotifyFunc) notify_cb,
-					   data, (GFreeFunc) free_pref_data,
+					   notify_func,
+					   data, free_data_func,
 					   &error);
 	if (eel_gconf_handle_error (&error))
 	{
@@ -517,6 +614,20 @@ mozilla_notifier_add (const char *gconf_key,
 	return cnxn_id;
 }
 
+extern "C" guint
+mozilla_notifier_add (const char *gconf_key,
+		      const char *mozilla_pref,
+		      PrefValueTransformFunc func,
+		      gpointer user_data)
+{
+	return mozilla_notifier_add_internal (gconf_key,
+					      (GConfClientNotifyFunc) notify_cb,
+					      mozilla_pref,
+					      func,
+					      user_data,
+					      (GFreeFunc) free_pref_data);
+}
+
 static int
 find_data (const PrefData *a,
 	   gconstpointer idptr)
@@ -596,15 +707,249 @@ migrate_font_gconf_key (const char *pixel_key,
 
 #endif
 
-extern "C" void
-mozilla_notifiers_init (void)
+static gboolean
+parse_pango_font (const char *font,
+		  char **name,
+		  int *size)
+{
+	PangoFontMask mask = (PangoFontMask) (PANGO_FONT_MASK_FAMILY | PANGO_FONT_MASK_SIZE);
+
+	PangoFontDescription *desc = pango_font_description_from_string (font);
+	if (desc == NULL ||
+	    (pango_font_description_get_set_fields (desc) & mask) != mask)
+	{
+		return FALSE;
+	}
+					
+	*size = PANGO_PIXELS (pango_font_description_get_size (desc));
+	*name = g_strdup (pango_font_description_get_family (desc));
+
+	return *name != NULL && *size > 0;
+}
+
+typedef struct
+{
+	guint cnxn_id;
+	char **font_name_prefs;
+	char **font_size_prefs;
+	char *font_name;
+	int font_size;
+	guint is_set : 1;
+} DesktopFontData;
+
+static gboolean
+transform_font_name (GConfEntry *gcentry,
+		     GValue *value,
+		     gpointer user_data)
+{
+	DesktopFontData *data = (DesktopFontData *) user_data;
+	GConfValue *gcvalue;
+	const char *font_name;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gconf_entry_get_is_default (gcentry) ||
+	    gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_STRING)
+	{
+		font_name = data->font_name;
+	}
+	else
+	{
+		font_name = gconf_value_get_string (gcvalue);
+		if ((font_name == NULL || font_name[0] == '\0'))
+		{
+			font_name = data->font_name;
+		}
+	}
+
+	LOG ("%s value for key '%s'",
+	     gconf_entry_get_is_default (gcentry) ? "default" : "NON-default",
+	     gconf_entry_get_key (gcentry));
+
+	if (font_name == NULL) return FALSE;
+
+	LOG ("Inferred font name '%s' for key '%s'",
+	     font_name, gconf_entry_get_key (gcentry));
+
+	g_value_init (value, G_TYPE_STRING);
+	g_value_set_string (value, font_name);
+
+	return TRUE;
+}
+
+static gboolean
+transform_font_size (GConfEntry *gcentry,
+		     GValue *value,
+		     gpointer user_data)
+{
+	DesktopFontData *data = (DesktopFontData *) user_data;
+	GConfValue *gcvalue;
+	int size = 0;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gconf_entry_get_is_default (gcentry) ||
+	    gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_INT)
+	{
+		size = data->font_size;
+	}
+	else
+	{
+		size = gconf_value_get_int (gcvalue);
+	}
+
+	if (size <= 0) return FALSE;
+
+	g_value_init (value, G_TYPE_INT);
+	g_value_set_int (value, size);
+
+	return TRUE;
+}
+
+static void
+notify_desktop_font_cb (GConfClient *client,
+			guint cnxn_id,
+			GConfEntry *gcentry,
+			DesktopFontData *data)
+{
+	GConfValue *gcvalue;
+	char *name = NULL;
+	int size = 0, i;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue != NULL &&
+	    gcvalue->type == GCONF_VALUE_STRING &&
+	    parse_pango_font (gconf_value_get_string (gcvalue), &name, &size))
+	{
+		LOG ("Desktop font %s -> name=%s, size=%d", 
+		     gconf_entry_get_key (gcentry), name, size);
+
+		data->font_name = name;
+		data->font_size = size;
+		data->is_set = TRUE;
+	}
+	else
+	{
+		g_free (name);
+		g_free (data->font_name);
+		data->font_name = NULL;
+		data->font_size = 0;
+		data->is_set = FALSE;
+	}
+
+	for (i = 0; data->font_name_prefs[i] != NULL; ++i)
+	{
+		gconf_client_notify (client, data->font_name_prefs[i]);
+	}
+	for (i = 0; data->font_size_prefs[i] != NULL; ++i)
+	{
+		gconf_client_notify (client, data->font_size_prefs[i]);
+	}
+}
+
+typedef struct
+{
+	guint cnxn_id;
+	char **prefs;
+	int size;
+} MinimumFontSizeData;
+
+static gboolean
+transform_minimum_font_size (GConfEntry *gcentry,
+			     GValue *value,
+			     gpointer user_data)
+{
+	MinimumFontSizeData *data = (MinimumFontSizeData *) user_data;
+	GConfValue *gcvalue;
+	int size = 0;
+
+	gcvalue = gconf_entry_get_value (gcentry);
+	if (gcvalue == NULL ||
+	    gcvalue->type != GCONF_VALUE_INT)
+	{
+		size = data->size;
+	}
+	else
+	{
+		size = MAX (gconf_value_get_int (gcvalue),
+			    data->size);
+	}
+
+	if (size <= 0) return FALSE;
+
+	g_value_init (value, G_TYPE_INT);
+	g_value_set_int (value, size);
+
+	return TRUE;
+}
+
+static void
+notify_minimum_size_cb (GConfClient *client,
+			guint cnxn_id,
+			GConfEntry *entry,
+			MinimumFontSizeData *data)
+{
+	GConfValue *gcvalue;
+	int i;
+
+	data->size = 0;
+
+	gcvalue = gconf_entry_get_value (entry);
+	/* happens on initial notify if the key doesn't exist */
+	if (gcvalue != NULL &&
+	    gcvalue->type == GCONF_VALUE_INT)
+	{
+		data->size = gconf_value_get_int (gcvalue);
+		data->size = MAX (data->size, 0);
+	}
+
+	LOG ("Minimum font size now %d", data->size);
+
+	for (i = 0; data->prefs[i] != NULL; ++i)
+	{
+		gconf_client_notify (client, data->prefs[i]);
+	}
+}
+
+static DesktopFontData *desktop_font_data;
+static MinimumFontSizeData *minimum_font_size_data;
+
+static void
+mozilla_font_notifiers_init (void)
 {
+	static const char *types [] = { "variable", "monospace" };
 	const EphyFontsLanguageInfo *font_languages;
 	guint n_font_languages, i;
 
-	eel_gconf_monitor_add ("/apps/epiphany/web");
-	eel_gconf_monitor_add ("/system/proxy");
-	eel_gconf_monitor_add ("/system/http_proxy");
+	font_languages = ephy_font_languages ();
+	n_font_languages = ephy_font_n_languages ();
+
+	desktop_font_data = g_new0 (DesktopFontData, 2);
+	desktop_font_data[0].font_name_prefs = g_new0 (char*, n_font_languages + 1);
+	desktop_font_data[0].font_size_prefs = g_new0 (char*, n_font_languages + 1);
+	desktop_font_data[1].font_name_prefs = g_new0 (char*, n_font_languages + 1);
+	desktop_font_data[1].font_size_prefs = g_new0 (char*, n_font_languages + 1);
+
+	desktop_font_data[0].cnxn_id =
+		eel_gconf_notification_add (CONF_DESKTOP_FONT_VARIABLE,
+					    (GConfClientNotifyFunc) notify_desktop_font_cb,
+					    &desktop_font_data[0]);
+	eel_gconf_notify (CONF_DESKTOP_FONT_VARIABLE);
+
+	desktop_font_data[1].cnxn_id =
+		eel_gconf_notification_add (CONF_DESKTOP_FONT_MONOSPACE,
+					    (GConfClientNotifyFunc) notify_desktop_font_cb,
+					    &desktop_font_data[1]);
+	eel_gconf_notify (CONF_DESKTOP_FONT_MONOSPACE);
+
+	minimum_font_size_data = g_new0 (MinimumFontSizeData, 1);
+	minimum_font_size_data->prefs = g_new0 (char*, n_font_languages + 1);
+
+	minimum_font_size_data->cnxn_id =
+		eel_gconf_notification_add (CONF_RENDERING_FONT_MIN_SIZE,
+					    (GConfClientNotifyFunc) notify_minimum_size_cb,
+					    minimum_font_size_data);
+	eel_gconf_notify (CONF_RENDERING_FONT_MIN_SIZE);
 
 #ifdef MIGRATE_PIXEL_SIZE
 	gboolean migrate_size;
@@ -617,23 +962,10 @@ mozilla_notifiers_init (void)
 	}
 #endif
 
-	for (i = 0; i < G_N_ELEMENTS (notifier_entries); i++)
-	{
-		mozilla_notifier_add (notifier_entries[i].gconf_key,
-				      notifier_entries[i].mozilla_pref,
-				      notifier_entries[i].func,
-				      notifier_entries[i].user_data);
-	}
-
-	/* fonts notifiers */
-	font_languages = ephy_font_languages ();
-	n_font_languages = ephy_font_n_languages ();
-
 	for (i=0; i < n_font_languages; i++)
 	{
 		const char *code = font_languages[i].code;
 		guint k;
-		char *types [] = { "variable", "monospace" };
 		char key[255], pref[255];
 #ifdef MIGRATE_PIXEL_SIZE
 		char old_key[255];
@@ -646,8 +978,11 @@ mozilla_notifiers_init (void)
 			g_snprintf (pref, sizeof (pref), "font.name.%s.%s",
 				    types[k], code);
 
+			desktop_font_data[k].font_name_prefs[i] = g_strdup (key);
+
 			mozilla_notifier_add (key, pref,
-					      mozilla_notifier_transform_string, NULL);
+					      transform_font_name,
+					      &desktop_font_data[k]);
 		}
 
 #ifdef MIGRATE_PIXEL_SIZE
@@ -682,7 +1017,11 @@ mozilla_notifiers_init (void)
 		g_snprintf (key, sizeof (key), "%s_%s",
 			    CONF_RENDERING_FONT_MIN_SIZE, code);
 		g_snprintf (pref, sizeof (pref), "font.minimum-size.%s", code);
-		mozilla_notifier_add (key, pref, transform_font_size, NULL);
+
+		minimum_font_size_data->prefs[i] = g_strdup (key);
+
+		mozilla_notifier_add (key, pref, transform_minimum_font_size,
+				      minimum_font_size_data);
 
 #ifdef MIGRATE_PIXEL_SIZE
 		if (migrate_size)
@@ -696,7 +1035,10 @@ mozilla_notifiers_init (void)
 		g_snprintf (key, sizeof (key), "%s_%s",
 			    CONF_RENDERING_FONT_FIXED_SIZE, code);
 		g_snprintf (pref, sizeof (pref), "font.size.fixed.%s", code);
-		mozilla_notifier_add (key, pref, transform_font_size, NULL);
+
+		desktop_font_data[1].font_size_prefs[i] = g_strdup (key);
+		mozilla_notifier_add (key, pref, transform_font_size,
+				      &desktop_font_data[1]);
 
 #ifdef MIGRATE_PIXEL_SIZE
 		if (migrate_size)
@@ -710,7 +1052,10 @@ mozilla_notifiers_init (void)
 		g_snprintf (key, sizeof (key), "%s_%s",
 			    CONF_RENDERING_FONT_VAR_SIZE, code);
 		g_snprintf (pref, sizeof (pref), "font.size.variable.%s", code);
-		mozilla_notifier_add (key, pref, transform_font_size, NULL);
+	
+		desktop_font_data[0].font_size_prefs[i] = g_strdup (key);
+		mozilla_notifier_add (key, pref, transform_font_size,
+				      &desktop_font_data[0]);
 
 #ifdef MIGRATE_PIXEL_SIZE
 		if (migrate_size)
@@ -724,6 +1069,64 @@ mozilla_notifiers_init (void)
 }
 
 static void
+mozilla_font_notifiers_shutdown (void)
+{
+	eel_gconf_notification_remove (desktop_font_data[0].cnxn_id);
+	eel_gconf_notification_remove (desktop_font_data[1].cnxn_id);
+	eel_gconf_notification_remove (minimum_font_size_data->cnxn_id);
+
+	g_free (desktop_font_data[0].font_name);
+	g_free (desktop_font_data[1].font_name);
+
+	g_strfreev (desktop_font_data[0].font_name_prefs);
+	g_strfreev (desktop_font_data[0].font_size_prefs);
+	g_strfreev (desktop_font_data[1].font_name_prefs);
+	g_strfreev (desktop_font_data[1].font_size_prefs);
+	g_strfreev (minimum_font_size_data->prefs);
+}
+
+extern "C" gboolean
+mozilla_notifiers_init (void)
+{
+	guint i;
+
+	eel_gconf_monitor_add ("/apps/epiphany/web");
+	eel_gconf_monitor_add ("/system/proxy");
+	eel_gconf_monitor_add ("/system/http_proxy");
+
+	/* Cache the pref branch */
+	nsresult rv;
+	nsCOMPtr<nsIPrefService> prefService
+		(do_GetService (NS_PREFSERVICE_CONTRACTID, &rv));
+	if (NS_FAILED (rv))
+	{
+		g_warning ("Failed to get the pref service!\n");
+		return FALSE;
+	}
+
+	/* the pref service conveniently implements the root pref branch */
+	gPrefBranch = nsnull;
+	rv = CallQueryInterface (prefService, &gPrefBranch);
+	if (NS_FAILED (rv) || !gPrefBranch)
+	{
+		g_warning ("Failed to get the pref service!\n");
+		return FALSE;
+	}
+
+	for (i = 0; i < G_N_ELEMENTS (notifier_entries); i++)
+	{
+		mozilla_notifier_add (notifier_entries[i].gconf_key,
+				      notifier_entries[i].mozilla_pref,
+				      notifier_entries[i].func,
+				      notifier_entries[i].user_data);
+	}
+
+	mozilla_font_notifiers_init ();
+
+	return TRUE;
+}
+
+static void
 remove_notification (PrefData *data)
 {
 	eel_gconf_notification_remove (data->cnxn_id);
@@ -732,6 +1135,11 @@ remove_notification (PrefData *data)
 extern "C" void
 mozilla_notifiers_shutdown (void)
 {
+	NS_IF_RELEASE (gPrefBranch);
+	gPrefBranch = nsnull;
+
+	mozilla_font_notifiers_shutdown ();
+
 	eel_gconf_monitor_remove ("/apps/epiphany/web");
 	eel_gconf_monitor_remove ("/system/proxy");
 	eel_gconf_monitor_remove ("/system/http_proxy");
diff --git a/embed/mozilla/mozilla-notifiers.h b/embed/mozilla/mozilla-notifiers.h
index 642361c29..6b6a06eda 100644
--- a/embed/mozilla/mozilla-notifiers.h
+++ b/embed/mozilla/mozilla-notifiers.h
@@ -28,15 +28,15 @@
 
 G_BEGIN_DECLS
 
-typedef gboolean (* PrefValueTransformFunc)	(GConfValue *, GValue *, gpointer);
+typedef gboolean (* PrefValueTransformFunc)	(GConfEntry*, GValue*, gpointer);
 
-gboolean mozilla_notifier_transform_bool	(GConfValue *, GValue *, gpointer);
+gboolean mozilla_notifier_transform_bool	(GConfEntry*, GValue*, gpointer);
 
-gboolean mozilla_notifier_transform_bool_invert	(GConfValue *, GValue *, gpointer);
+gboolean mozilla_notifier_transform_bool_invert	(GConfEntry*, GValue*, gpointer);
 
-gboolean mozilla_notifier_transform_int		(GConfValue *, GValue *, gpointer);
+gboolean mozilla_notifier_transform_int		(GConfEntry*, GValue*, gpointer);
 
-gboolean mozilla_notifier_transform_string	(GConfValue *, GValue *, gpointer);
+gboolean mozilla_notifier_transform_string	(GConfEntry*, GValue*, gpointer);
 
 guint	 mozilla_notifier_add		(const char *gconf_key,
 					 const char *mozilla_pref,
@@ -48,7 +48,7 @@ void	 mozilla_notifier_remove	(guint id);
 gboolean mozilla_pref_set		(const char *pref,
 					 const GValue *value);
 
-void	 mozilla_notifiers_init		(void);
+gboolean mozilla_notifiers_init		(void);
 
 void	 mozilla_notifiers_shutdown	(void);