From d5d5bc4bbc013e4e2666af943b79778ba6c30dd2 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 24 Apr 2006 07:45:19 +0000 Subject: === Release 2.15.1 === 2006-04-24 Christian Persch === 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. --- embed/mozilla/Makefile.am | 2 +- embed/mozilla/mozilla-embed-single.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'embed') 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 */ -- cgit v1.2.3