diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 1 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 6 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2006-02-05 Christian Persch <chpe@cvs.gnome.org> + + * embed/mozilla/Makefile.am: + * embed/mozilla/mozilla-embed-single.cpp: + + Only use the major version in the user agent string. + 2006-02-05 Crispin Flowerday <gnome@flowerday.cx> * data/default-prefs-common.js: diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index e8c747e8f..3b118e01d 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -143,6 +143,7 @@ libephymozillaembed_la_CPPFLAGS = \ -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \ -DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \ + -DEPIPHANY_MAJOR=\"$(EPIPHANY_MAJOR)\" \ -DALLOW_PRIVATE_API \ $(AM_CPPFLAGS) diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index e4295ca94..23805315a 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -297,17 +297,17 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes) #ifdef HAVE_GECKO_1_8 /* FIXME: maybe only set the major version ("1.6", "1.8") here? */ - pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" VERSION); + pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" EPIPHANY_MAJOR); /* 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", VERSION); + pref->SetCharPref ("general.useragent.vendorSub", EPIPHANY_MAJOR); #endif - /* Open ftp uris with an external handler if one is setup */ + /* Don't open ftp uris with an external handler if one is setup */ pref->SetBoolPref ("network.protocol-handler.external.ftp", PR_FALSE); return TRUE; |