diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-09-21 19:09:32 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-09-21 19:09:32 +0800 |
| commit | 5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f (patch) | |
| tree | 6fb8fd3d114376d615725f54e73f3da8d51b95ca /embed/mozilla/mozilla-embed-single.cpp | |
| parent | 695c95a8a47d6d2c1092bd6a379743d3939961bc (diff) | |
| download | gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.gz gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.bz2 gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.lz gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.xz gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.tar.zst gsoc2013-epiphany-5e58a03b8d5fb6e18e8c56d0e86ac96d90522b6f.zip | |
Fix mozilla API checks to correctly detect firefox libraries.
2004-09-21 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/EphyContentPolicy.cpp:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/GlobalHistory.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/mozilla-download.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed.cpp:
* embed/mozilla/mozilla-notifiers.cpp:
Fix mozilla API checks to correctly detect firefox libraries.
Diffstat (limited to 'embed/mozilla/mozilla-embed-single.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 356a83dc4..025d3347d 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -26,7 +26,6 @@ #endif #include "mozilla-embed-single.h" -#include "mozilla-version.h" #include "ephy-cookie-manager.h" #include "ephy-password-manager.h" @@ -404,6 +403,8 @@ getUILang (nsAString& aUILang) static nsresult mozilla_init_chrome (void) { +/* FIXME: can we just omit this on new-toolkit ? */ +#ifdef MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN nsresult rv; nsEmbedString uiLang; @@ -425,6 +426,9 @@ mozilla_init_chrome (void) NS_UTF16ToCString (uiLang, NS_CSTRING_ENCODING_UTF8, cUILang); return chromeRegistry->SelectLocale (cUILang, PR_FALSE); +#else + return NS_OK; +#endif } static void |