aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-01-25 22:09:18 +0800
committerChristian Persch <chpe@src.gnome.org>2006-01-25 22:09:18 +0800
commit747b7aa955e23144e11af6c0456ffb01a6ed8a20 (patch)
treecc8528b98410c548e148a5d78d83d2737e8b310d /embed
parent56ffb6c1afda74feb0edcd10cedb5b5f0537d474 (diff)
downloadgsoc2013-epiphany-747b7aa955e23144e11af6c0456ffb01a6ed8a20.tar
gsoc2013-epiphany-747b7aa955e23144e11af6c0456ffb01a6ed8a20.tar.gz
gsoc2013-epiphany-747b7aa955e23144e11af6c0456ffb01a6ed8a20.tar.bz2
gsoc2013-epiphany-747b7aa955e23144e11af6c0456ffb01a6ed8a20.tar.lz
gsoc2013-epiphany-747b7aa955e23144e11af6c0456ffb01a6ed8a20.tar.xz
gsoc2013-epiphany-747b7aa955e23144e11af6c0456ffb01a6ed8a20.tar.zst
gsoc2013-epiphany-747b7aa955e23144e11af6c0456ffb01a6ed8a20.zip
Set the "browser.display.use_system_colors" pref on gecko 1.8, instead of
2006-01-25 Christian Persch <chpe@cvs.gnome.org> * data/default-prefs-gecko-1-8.js: * embed/mozilla/mozilla-embed-single.cpp: Set the "browser.display.use_system_colors" pref on gecko 1.8, instead of monitoring the theme ourself.
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index a7b3b0d49..62809590a 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -129,15 +129,18 @@ struct MozillaEmbedSinglePrivate
{
char *user_prefs;
+ EphySingle *mSingleObserver;
+
+#ifndef HAVE_GECKO_1_8
/* monitor this widget for theme changes*/
GtkWidget *theme_window;
-
- EphySingle *mSingleObserver;
+#endif
#ifdef ENABLE_NETWORK_MANAGER
libnm_glib_ctx *nm_context;
guint nm_callback_id;
#endif
+
#ifdef HAVE_GECKO_1_8
char *user_css_file;
guint user_css_enabled_notifier_id;
@@ -319,6 +322,7 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes)
return TRUE;
}
+#ifndef HAVE_GECKO_1_8
static char *
color_to_string (GdkColor color)
{
@@ -381,6 +385,7 @@ mozilla_setup_colors (MozillaEmbedSingle *mes)
mes->priv->theme_window = window;
}
+#endif
static void
mozilla_embed_single_new_window_orphan_cb (GtkMozEmbedSingle *moz_single,
@@ -819,10 +824,12 @@ impl_init (EphyEmbedSingle *esingle)
return FALSE;
}
+#ifndef HAVE_GECKO_1_8
/* FIXME: This should be removed when mozilla
* bugs 207000 and 207001 are fixed.
*/
mozilla_setup_colors (single);
+#endif
START_PROFILER ("Mozilla prefs notifiers")
mozilla_notifiers_init ();
@@ -922,10 +929,12 @@ mozilla_embed_single_finalize (GObject *object)
g_free (mes->priv->user_prefs);
+#ifndef HAVE_GECKO_1_8
if (mes->priv->theme_window)
{
gtk_widget_destroy (mes->priv->theme_window);
}
+#endif
}
static void