evolution-rss r324 - trunk/src

[lucilanga svn gnome org]

Author: lucilanga
Date: Tue Jul  1 11:52:28 2008
New Revision: 324
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=324&view=rev

Log:
2008-07-01  Lucian Langa  <lucilanga gnome org>

* fix building with firefox-devel

Modified:
   trunk/src/gecko-utils.cpp

Modified: trunk/src/gecko-utils.cpp
==============================================================================
--- trunk/src/gecko-utils.cpp	(original)
+++ trunk/src/gecko-utils.cpp	Tue Jul  1 11:52:28 2008
@@ -66,6 +66,42 @@
 	return NS_SUCCEEDED(gPrefBranch->SetIntPref (key, value));
 }
 
+static nsresult
+gecko_utils_init_chrome (void)
+{
+/* FIXME: can we just omit this on new-toolkit ? */
+#if defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN) || defined(HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
+        nsresult rv;
+        nsEmbedString uiLang;
+
+#ifdef HAVE_CHROME_NSICHROMEREGISTRYSEA_H
+        nsCOMPtr<nsIChromeRegistrySea> chromeRegistry = do_GetService (NS_CHROMEREGISTRY_CONTRACTID);
+#else
+        nsCOMPtr<nsIXULChromeRegistry> chromeRegistry = do_GetService (NS_CHROMEREGISTRY_CONTRACTID);
+#endif
+        NS_ENSURE_TRUE (chromeRegistry, NS_ERROR_FAILURE);
+
+	// Set skin to 'classic' so we get native scrollbars.
+	rv = chromeRegistry->SelectSkin (nsEmbedCString("classic/1.0"), PR_FALSE);
+        NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
+
+	// set locale
+        rv = chromeRegistry->SetRuntimeProvider(PR_TRUE);
+        NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
+
+	rv = getUILang(uiLang);
+        NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
+
+        nsEmbedCString cUILang;
+        NS_UTF16ToCString (uiLang, NS_CSTRING_ENCODING_UTF8, cUILang);
+
+        return chromeRegistry->SelectLocale (cUILang, PR_FALSE);
+#else
+        return NS_OK;
+#endif
+}
+
+
 extern "C" gboolean
 gecko_init (void)
 {
@@ -87,6 +123,11 @@
 
 	rv = CallQueryInterface (prefService, &gPrefBranch);
 	NS_ENSURE_SUCCESS (rv, FALSE);
+	
+#ifndef HAVE_GECKO_1_8
+	g_print("init\n");
+        gecko_utils_init_chrome ();
+#endif
 
 	return TRUE;
 }