mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:937669e1c537
+:20f8b5f0aea6
 rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, ArrayLength(specialFiles));
 if (NS_FAILED(rv))
 NS_WARNING("Error parsing application default preferences.");
 // Load jar:$app/omni.jar!/defaults/preferences/*.js
-nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
+nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
 if (appJarReader) {
 rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr);
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
 +
 #ifdef XP_MACOSX
 #include <CoreFoundation/CoreFoundation.h>
 #endif
-#ifdef ANDROID
+#ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 #endif
 @@ -2214,16 +2218,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 +          }
 }
 }
 +      }
-#if defined(XP_WIN) || defined(XP_MACOSX) || defined(ANDROID)
+#if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID)
 nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
 nsCOMPtr<nsIFile> file;
 nsAutoString path;
 if (fileURL &&
 +#    PrefWindow I   (June 4, 1999)
 +#
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -44,32 +44,35 @@
+@@ -45,16 +45,18 @@
-#include "nsIURI.h"
 #include "nsReadableUtils.h"
 #include "nsArrayUtils.h"
 #include "prnetdb.h"
 #include "prenv.h"
 #include "nsPrintfCString.h"
 #include "nsNetUtil.h"
 #include "nsISupportsPrimitives.h"
+#include "nsIGSettingsService.h"
 +#include "nsVoidArray.h"
 +#include "nsKDEUtils.h"
 class nsUnixSystemProxySettings : public nsISystemProxySettings {
 public:
 NS_DECL_ISUPPORTS
 NS_DECL_NSISYSTEMPROXYSETTINGS
 nsUnixSystemProxySettings() {}
 nsresult Init();
+@@ -64,16 +66,17 @@ private:
-private:
-~nsUnixSystemProxySettings() {}
 nsCOMPtr<nsIGConfService> mGConf;
+nsCOMPtr<nsIGSettingsService> mGSettings;
 bool IsProxyMode(const char* aMode);
 nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult);
 nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
+nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
+nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
 +  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
 };
 NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
 nsresult
 nsUnixSystemProxySettings::Init()
 {
-mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+// If this is a GNOME session, load gconf and try to use its preferences.
-@@ -408,16 +411,19 @@ nsUnixSystemProxySettings::GetProxyForUR
+@@ -526,16 +529,19 @@ nsUnixSystemProxySettings::GetProxyForUR
 nsCAutoString host;
 rv = aURI->GetHost(host);
 NS_ENSURE_SUCCESS(rv, rv);
 PRInt32 port;
 rv = aURI->GetPort(&port);
 NS_ENSURE_SUCCESS(rv, rv);
 +  if( nsKDEUtils::kdeSupport())
-+    return GetProxyFromKDE( scheme, host, port, aResult );
++    return GetProxyFromKDE(scheme, host, port, aResult);
 +
-if (!mGConf)
+if (mGSettings) {
-return GetProxyFromEnvironment(scheme, host, port, aResult);
+rv = GetProxyFromGSettings(scheme, host, port, aResult);
+if (rv == NS_OK)
-return GetProxyFromGConf(scheme, host, port, aResult);
+return rv;
 }
+if (mGConf)
-#define NS_UNIXSYSTEMPROXYSERVICE_CID  /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\
+return GetProxyFromGConf(scheme, host, port, aResult);
-{ 0x0fa3158c, 0xd5a7, 0x43de, \
-@@ -438,8 +444,34 @@ static const mozilla::Module::ContractID
+@@ -561,8 +567,34 @@ static const mozilla::Module::ContractID
 static const mozilla::Module kUnixProxyModule = {
 mozilla::Module::kVersion,
 kUnixProxyCIDs,
 kUnixProxyContracts
 +}
 +
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -95,17 +95,18 @@ else
+@@ -96,17 +96,18 @@ else
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CMMSRCS = nsNativeAppSupportCocoa.mm
-EXPORTS = MacQuirks.h
+EXPORTS += MacQuirks.h
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS += nsNativeAppSupportOS2.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 +
 +#endif // nsKDEUtils
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -88,18 +88,19 @@ LOCAL_INCLUDES = -I$(srcdir)
+@@ -92,18 +92,19 @@ LOCAL_INCLUDES = -I$(srcdir)
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
 -I$(topsrcdir)/dom/ipc \
 -I$(topsrcdir)/content/base/src \
 -I$(topsrcdir)/content/events/src \
 -I$(topsrcdir)/netwerk/base/src \
 CopyUTF16toUTF8(aFilter, filter);
 CopyUTF16toUTF8(aTitle, name);
 mFilters.AppendElement(filter);
 mFilterNames.AppendElement(name);
-@@ -433,16 +437,19 @@ confirm_overwrite_file(GtkWidget *parent
+@@ -390,16 +394,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
-gtk_widget_destroy(dialog);
+return NS_ERROR_FAILURE;
-return result;
 }
 NS_IMETHODIMP
 nsFilePicker::Show(PRInt16 *aReturn)
 {
+NS_ENSURE_ARG_POINTER(aReturn);
 +  if( nsKDEUtils::kdeSupport())
-+      return kdeFileDialog( aReturn );
++    return kdeFileDialog(aReturn);
 +
-NS_ENSURE_ARG_POINTER(aReturn);
 nsXPIDLCString title;
 title.Adopt(ToNewUTF8String(mTitle));
 GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
 GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-@@ -583,8 +590,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
+? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
+@@ -538,8 +545,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
 *aReturn = nsIFilePicker::returnCancel;
 break;
 }
 gtk_widget_destroy(file_chooser);
 #endif
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -94,10 +94,11 @@ FORCE_STATIC_LIB = 1
+@@ -92,10 +92,11 @@ LOCAL_INCLUDES	= \
+# we don't want the shared lib, but we want to force the creation of a static lib.
-# Force use of PIC
+FORCE_STATIC_LIB = 1
-FORCE_USE_PIC	= 1
 include $(topsrcdir)/config/rules.mk
 DEFINES	+= -D_IMPL_NS_COM
 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 struct ManifestDirective
 {
 const char* directive;
 int argc;
-@@ -434,16 +435,17 @@ ParseManifestCommon(NSLocationType aType
+@@ -429,16 +430,17 @@ ParseManifest(NSLocationType type, FileL
 NS_NAMED_LITERAL_STRING(kPlatform, "platform");
 NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
 NS_NAMED_LITERAL_STRING(kApplication, "application");
 NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");
 NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion");
 NS_NAMED_LITERAL_STRING(kOs, "os");
 NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");
 NS_NAMED_LITERAL_STRING(kABI, "abi");
 +  NS_NAMED_LITERAL_STRING(kDesktop, "desktop");
-#if defined(ANDROID)
+#if defined(MOZ_WIDGET_ANDROID)
 NS_NAMED_LITERAL_STRING(kTablet, "tablet");
 #endif
 // Obsolete
 NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
 nsAutoString appID;
-@@ -481,41 +483,46 @@ ParseManifestCommon(NSLocationType aType
+@@ -476,41 +478,46 @@ ParseManifest(NSLocationType type, FileL
 CopyUTF8toUTF16(s, abi);
 abi.Insert(PRUnichar('_'), 0);
 abi.Insert(osTarget, 0);
 }
 }
 #elif defined(MOZ_WIDGET_GTK2)
 nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
 gtk_major_version,
 gtk_minor_version);
 +  desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome");
-#elif defined(ANDROID)
+#elif defined(MOZ_WIDGET_ANDROID)
 bool isTablet = false;
 if (mozilla::AndroidBridge::Bridge()) {
 mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", "RELEASE", osVersion);
 isTablet = mozilla::AndroidBridge::Bridge()->IsTablet();
 }
 // at the end.
 nsTArray<CachedDirective> contracts;
 char *token;
 char *newline = buf;
-@@ -597,24 +604,26 @@ ParseManifestCommon(NSLocationType aType
+@@ -592,24 +599,26 @@ ParseManifest(NSLocationType type, FileL
 TriState stOsVersion = eUnspecified;
 TriState stOs = eUnspecified;
 TriState stABI = eUnspecified;
-#if defined(ANDROID)
+#if defined(MOZ_WIDGET_ANDROID)
 TriState stTablet = eUnspecified;
 #endif
 bool platform = false;
 bool contentAccessible = false;
 +    TriState stDesktop = eUnspecified;
 CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
 CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
 CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion))
 continue;
-#if defined(ANDROID)
+#if defined(MOZ_WIDGET_ANDROID)
 bool tablet = false;
 if (CheckFlag(kTablet, wtoken, tablet)) {
-@@ -643,16 +652,17 @@ ParseManifestCommon(NSLocationType aType
+@@ -638,16 +647,17 @@ ParseManifest(NSLocationType type, FileL
 }
 if (!ok ||
 stApp == eBad ||
 stAppVersion == eBad ||
 stGeckoVersion == eBad ||
 stOs == eBad ||
 stOsVersion == eBad ||
 +        stDesktop == eBad ||
-#ifdef ANDROID
+#ifdef MOZ_WIDGET_ANDROID
 stTablet == eBad ||
 #endif
 stABI == eBad)
 continue;
 if (directive->regfunc) {
 if (GeckoProcessType_Default != XRE_GetProcessType())
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -190,17 +190,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -188,17 +188,17 @@ include $(topsrcdir)/ipc/chromium/chromi
 DEFINES		+= -D_IMPL_NS_COM
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring lib64,$(libdir)))
 DEFINES     += -DHAVE_USR_LIB64_DIR

changeset 399	20f8b5f0aea6
parent 398	937669e1c537
child 400	6a1811ef3174