diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2003-12-15 00:19:40 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2003-12-15 00:19:40 +0800 |
| commit | deab0d1c914913ae0615eec1cd1dc170255275a5 (patch) | |
| tree | da652af5a61920e256db92e2aa8a1d22bfebac7d /embed/mozilla/mozilla-embed-single.cpp | |
| parent | f21911f22afd1bb0838010ac61fe3c3297657098 (diff) | |
| download | gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.gz gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.bz2 gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.lz gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.xz gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.zst gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.zip | |
Adapt to changed mozilla APIs for 1.6. (Ported from HEAD).
2003-12-14 Christian Persch <chpe@cvs.gnome.org>
* NEWS:
* configure.in:
* embed/mozilla/EphyEventListener.cpp:
* embed/mozilla/EphyWrapper.cpp:
* embed/mozilla/EventContext.cpp:
* embed/mozilla/ExternalProtocolService.cpp:
* embed/mozilla/MozRegisterComponents.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* src/ephy-window.c: (show_embed_popup):
Adapt to changed mozilla APIs for 1.6. (Ported from HEAD).
Diffstat (limited to 'embed/mozilla/mozilla-embed-single.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index a38eef3af..cdb26f90d 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -14,10 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include "glib.h" @@ -49,12 +51,14 @@ #include <nsIFontEnumerator.h> #include <nsISupportsPrimitives.h> #include <nsReadableUtils.h> -#include <nsICookieManager.h> #include <nsIPasswordManager.h> #include <nsIPassword.h> #include <nsICookie.h> -#include <nsCCookieManager.h> #include <nsCPasswordManager.h> +#include <nsICookieManager.h> +#if MOZILLA_SNAPSHOT < 13 +#include <nsCCookieManager.h> +#endif // FIXME: For setting the locale. hopefully gtkmozembed will do itself soon #include <nsIChromeRegistry.h> @@ -553,9 +557,14 @@ getUILang (nsAString& aUILang) return NS_ERROR_FAILURE; } +#if MOZILLA_SNAPSHOT >= 12 + result = localeService->GetLocaleComponentForUserAgent (aUILang); +#else nsXPIDLString uiLang; result = localeService->GetLocaleComponentForUserAgent (getter_Copies(uiLang)); aUILang = uiLang; +#endif + if (NS_FAILED (result)) { g_warning ("Could not determine locale!\n"); |