aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-04-24 15:45:19 +0800
committerChristian Persch <chpe@src.gnome.org>2006-04-24 15:45:19 +0800
commitd5d5bc4bbc013e4e2666af943b79778ba6c30dd2 (patch)
tree694709f26f9b8402dd0107da63d2a2d82c9783c5 /embed
parent55915473b815a7ea214210a4a13a7db0ac7b7a38 (diff)
downloadgsoc2013-epiphany-d5d5bc4bbc013e4e2666af943b79778ba6c30dd2.tar
gsoc2013-epiphany-d5d5bc4bbc013e4e2666af943b79778ba6c30dd2.tar.gz
gsoc2013-epiphany-d5d5bc4bbc013e4e2666af943b79778ba6c30dd2.tar.bz2
gsoc2013-epiphany-d5d5bc4bbc013e4e2666af943b79778ba6c30dd2.tar.lz
gsoc2013-epiphany-d5d5bc4bbc013e4e2666af943b79778ba6c30dd2.tar.xz
gsoc2013-epiphany-d5d5bc4bbc013e4e2666af943b79778ba6c30dd2.tar.zst
gsoc2013-epiphany-d5d5bc4bbc013e4e2666af943b79778ba6c30dd2.zip
=== Release 2.15.1 ===RELEASE_2_15_1
2006-04-24 Christian Persch <chpe@cvs.gnome.org> === Release 2.15.1 === * configure.ac: * embed/mozilla/Makefile.am: * embed/mozilla/mozilla-embed-single.cpp: * src/window-commands.c: (window_cmd_help_about): Update for 2.15.1. * help/eu/eu.po: * help/fi/fi.po: * help/ja/ja.po: Fix the build by adding bogus translator-credits strings.
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/Makefile.am2
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 5658c8571..f7285d45e 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -144,7 +144,7 @@ libephymozillaembed_la_CPPFLAGS = \
-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
-DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \
-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \
- -DEPIPHANY_MAJOR=\"$(EPIPHANY_MAJOR)\" \
+ -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \
-DALLOW_PRIVATE_API \
$(AM_CPPFLAGS)
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index ba0f93115..1269075d3 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -296,14 +296,14 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes)
}
#ifdef HAVE_GECKO_1_8
- pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" EPIPHANY_MAJOR);
+ pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" UA_VERSION);
/* Unset old prefs, otherwise they end up in the user agent string too */
pref->ClearUserPref ("general.useragent.vendor");
pref->ClearUserPref ("general.useragent.vendorSub");
#else
pref->SetCharPref ("general.useragent.vendor", "Epiphany");
- pref->SetCharPref ("general.useragent.vendorSub", EPIPHANY_MAJOR);
+ pref->SetCharPref ("general.useragent.vendorSub", UA_VERSION);
#endif
/* Don't open ftp uris with an external handler if one is setup */