mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:ab25aac2aa83
+:18c2dc922e51
 https://bugzilla.novell.com/show_bug.cgi?id=170055
 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
 --- a/modules/libpref/src/Makefile.in
 +++ b/modules/libpref/src/Makefile.in
-@@ -35,14 +35,15 @@ endif
+@@ -33,14 +33,15 @@ endif
 # Optimizer bug with GCC 3.2.2 on OS/2
 ifeq ($(OS_ARCH), OS2)
 nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
 	$(REPORT_BUILD)
 	@$(MAKE_DEPS_AUTO_CXX)
 libs:: greprefs.js
 	$(INSTALL) $^ $(DIST)/bin/
 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
 --- a/modules/libpref/src/Preferences.cpp
 +++ b/modules/libpref/src/Preferences.cpp
-@@ -26,16 +26,17 @@
+@@ -27,16 +27,17 @@
 #include "nsIZipReader.h"
 #include "nsPrefBranch.h"
 #include "nsXPIDLString.h"
 #include "nsCRT.h"
 #include "nsCOMArray.h"
 #include "prefapi.h"
 #include "prefread.h"
 #include "prefapi_private_data.h"
-@@ -1098,16 +1099,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1100,16 +1101,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
 static nsresult pref_LoadPrefsInDirList(const char *listId)
 {
 nsresult rv;
 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
 getter_AddRefs(list));
 if (!list)
 return NS_OK;
 bool hasMore;
-@@ -1123,17 +1142,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1125,17 +1144,17 @@ static nsresult pref_LoadPrefsInDirList(
 nsAutoCString leaf;
 path->GetNativeLeafName(leaf);
 // Do we care if a file provided by this process fails to load?
 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
 {
 nsZipItemPtr<char> manifest(jarReader, name, true);
 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1227,28 +1246,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1229,28 +1248,40 @@ static nsresult pref_InitInitialObjects(
 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 NS_IMETHODIMP
 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
 {
 // dbus prevents us from being threadsafe, but this routine should not block anyhow
-@@ -498,16 +501,19 @@ nsUnixSystemProxySettings::GetProxyFromG
+@@ -504,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG
 nsresult
 nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
 const nsACString & aScheme,
 const nsACString & aHost,
 return rv;
 }
 if (mGConf)
 return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
-@@ -533,8 +539,34 @@ static const mozilla::Module::ContractID
+@@ -539,8 +545,34 @@ static const mozilla::Module::ContractID
 static const mozilla::Module kUnixProxyModule = {
 mozilla::Module::kVersion,
 kUnixProxyCIDs,
 kUnixProxyContracts
 +}
 +
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -44,18 +44,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -43,18 +43,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
 'nsNativeAppSupportQt.cpp',
 'nsQAppInstance.cpp',
 ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
-CPP_SOURCES += [
+SOURCES += [
 'nsNativeAppSupportOS2.cpp',
 ]
 elif CONFIG['MOZ_ENABLE_GTK']:
 +    EXPORTS += ['nsKDEUtils.h']
-CPP_SOURCES += [
+SOURCES += [
-'nsNativeAppSupportUnix.cpp',
+-        'nsNativeAppSupportUnix.cpp',
-+	'nsKDEUtils.cpp'
++        'nsKDEUtils.cpp',
++        'nsNativeAppSupportUnix.cpp'
 ]
 else:
-CPP_SOURCES += [
+SOURCES += [
 'nsNativeAppSupportDefault.cpp',
 ]
 if CONFIG['MOZ_X11']:
-CPP_SOURCES += [
+SOURCES += [
 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/xre/nsKDEUtils.cpp
 @@ -0,0 +1,339 @@
 +
 +#endif // nsKDEUtils
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -45,9 +45,10 @@ ifdef MOZ_ENABLE_DBUS
+@@ -44,9 +44,10 @@ endif
+ifdef MOZ_ENABLE_DBUS
 LOCAL_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
 endif
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
 CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -73,16 +73,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -73,17 +73,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 ]
 else:
-CPP_SOURCES += [
+SOURCES += [
-'nsOSHelperAppService.cpp',
+osdir + '/nsOSHelperAppService.cpp',
 ]
 if CONFIG['MOZ_ENABLE_GTK']:
-CPP_SOURCES += [
+SOURCES += [
-+        'nsCommonRegistry.cpp',
++        'unix/nsCommonRegistry.cpp',
-+	'nsKDERegistry.cpp',
+'unix/nsGNOMERegistry.cpp',
-'nsGNOMERegistry.cpp',
++        'unix/nsKDERegistry.cpp',
-'nsMIMEInfoUnix.cpp',
+'unix/nsMIMEInfoUnix.cpp',
 ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-CPP_SOURCES += [
+SOURCES += [
-'nsMIMEInfoAndroid.cpp',
+'android/nsAndroidHandlerApp.cpp',
-'nsAndroidHandlerApp.cpp',
+'android/nsExternalSharingAppService.cpp',
-'nsExternalSharingAppService.cpp',
+'android/nsExternalURLHandlerService.cpp',
+'android/nsMIMEInfoAndroid.cpp',
 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
 new file mode 100644
 --- /dev/null
 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp
 @@ -0,0 +1,54 @@
 }
 }
 #endif
 // Now look up our extensions
-diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
+diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
---- a/widget/gtk2/Makefile.in
+--- a/widget/gtk/Makefile.in
-+++ b/widget/gtk2/Makefile.in
++++ b/widget/gtk/Makefile.in
-@@ -38,11 +38,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -26,11 +26,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
 INCLUDES	+= \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/../shared \
 		-I$(topsrcdir)/layout/generic \
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 +
 ifdef MOZ_X11
 INCLUDES   	+= -I$(srcdir)/../shared/x11
 endif
-diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
+diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
---- a/widget/gtk2/nsFilePicker.cpp
+--- a/widget/gtk/nsFilePicker.cpp
-+++ b/widget/gtk2/nsFilePicker.cpp
++++ b/widget/gtk/nsFilePicker.cpp
 @@ -1,32 +1,34 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #define MAX_PREVIEW_SIZE 180
 nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
 void
-@@ -225,17 +227,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -226,17 +228,19 @@ nsFilePicker::AppendFilters(int32_t aFil
 return nsBaseFilePicker::AppendFilters(aFilterMask);
 }
 NS_IMETHODIMP
 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter)
 CopyUTF16toUTF8(aFilter, filter);
 CopyUTF16toUTF8(aTitle, name);
 mFilters.AppendElement(filter);
 mFilterNames.AppendElement(name);
-@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -350,16 +354,32 @@ nsFilePicker::Show(int16_t *aReturn)
 NS_IMETHODIMP
 nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
 {
 // Can't show two dialogs concurrently with the same filepicker
 GtkWindow *parent_widget =
 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
 GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
 const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -538,8 +558,235 @@ nsFilePicker::Done(GtkWidget* file_choos
 if (mCallback) {
 mCallback->Done(result);
 mCallback = nullptr;
 } else {
 mResult = result;
 +        *aReturn = nsIFilePicker::returnCancel;
 +        }
 +    return NS_OK;
 +    }
 +
-diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
+diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
---- a/widget/gtk2/nsFilePicker.h
+--- a/widget/gtk/nsFilePicker.h
-+++ b/widget/gtk2/nsFilePicker.h
++++ b/widget/gtk/nsFilePicker.h
 @@ -66,11 +66,17 @@ protected:
 nsString  mDefault;
 nsString  mDefaultExtension;
 nsTArray<nsCString> mFilters;
 #endif
 bool platform = false;
 bool contentAccessible = false;
 +    TriState stDesktop = eUnspecified;
-while (NULL != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
+while (nullptr != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
 ToLowerCase(token);
 NS_ConvertASCIItoUTF16 wtoken(token);
 if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||
 CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
 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
-@@ -7,9 +7,9 @@ include $(topsrcdir)/config/rules.mk
+@@ -6,9 +6,9 @@ MOZILLA_INTERNAL_API = 1
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
+include $(topsrcdir)/config/rules.mk
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring lib64,$(libdir)))
 DEFINES     += -DHAVE_USR_LIB64_DIR
 endif
 -LOCAL_INCLUDES	+= -I..
 +LOCAL_INCLUDES	+= -I.. -I$(topsrcdir)/toolkit/xre
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -42,16 +42,17 @@
+@@ -43,16 +43,17 @@
-#include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsISimpleEnumerator.h"
 #include "private/pprio.h"
+#include "prlink.h"
 #ifdef MOZ_WIDGET_GTK
 #include "nsIGIOService.h"
 #include "nsIGnomeVFSService.h"
 +#include "nsKDEUtils.h"
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1727,44 +1728,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1728,44 +1729,51 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -1772,16 +1780,23 @@ nsLocalFile::Reveal()
+@@ -1773,16 +1781,23 @@ nsLocalFile::Reveal()
 return NS_ERROR_FAILURE;
 #endif
 }
 NS_IMETHODIMP

changeset 691	18c2dc922e51
parent 686	ab25aac2aa83
child 703	c4aab80e472f