mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:38c67b6b2f37
+:fa96cf6ffd14
 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
-@@ -56,14 +56,15 @@ endif
+@@ -49,14 +49,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)
 #include "prefapi.h"
 #include "prefread.h"
 #include "prefapi_private_data.h"
-@@ -966,16 +967,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -972,16 +973,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;
-@@ -991,17 +1010,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -997,17 +1016,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);
-@@ -1095,28 +1114,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1101,28 +1120,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)
 self.base = base
 self.flags = Flags(*flags)
 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
-@@ -32,9 +32,11 @@ ifndef MOZ_SUITE
+@@ -23,9 +23,11 @@ ifndef MOZ_SUITE
-EXTRA_COMPONENTS = \
+DISABLED_EXTRA_COMPONENTS = \
 nsDownloadManagerUI.js \
 nsDownloadManagerUI.manifest \
 $(NULL)
 endif
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 #endif
-@@ -2603,16 +2607,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2609,16 +2613,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 // Master pref to control this function.
 bool showTaskbarAlert = true;
 if (pref)
 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
 int64_t goat = PR_Now() - mStartTime;
 showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2639,19 +2652,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2645,19 +2658,20 @@ nsDownload::SetState(DownloadState aStat
 // retention policy, there's no reason to make the text clickable
 // because if it is, they'll click open the download manager and
 // the items they downloaded will have been removed.
 alerts->ShowAlertNotification(
 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
 +    return NS_ERROR_FAILURE;
 +  aResult = result[0];
 +  return NS_OK;
 +}
 +
-diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
+diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
---- a/toolkit/xre/Makefile.in
+--- a/toolkit/xre/moz.build
-+++ b/toolkit/xre/Makefile.in
++++ b/toolkit/xre/moz.build
-@@ -60,17 +60,18 @@ DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICO
+@@ -38,18 +38,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
-else
+'nsNativeAppSupportQt.cpp',
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+'nsQAppInstance.cpp',
-CMMSRCS = nsNativeAppSupportCocoa.mm
+]
-else
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CPP_SOURCES += [
-CPPSRCS += nsNativeAppSupportOS2.cpp
+'nsNativeAppSupportOS2.cpp',
-else
+]
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+elif CONFIG['MOZ_ENABLE_GTK']:
--CPPSRCS += nsNativeAppSupportUnix.cpp
++    EXPORTS += ['nsKDEUtils.h']
-+CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp
+CPP_SOURCES += [
-+EXPORTS += nsKDEUtils.h
+'nsNativeAppSupportUnix.cpp',
-else
++	'nsKDEUtils.cpp'
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+]
-MOCSRCS += moc_nsNativeAppSupportQt.cpp
+else:
-CPPSRCS += $(MOCSRCS)
+CPP_SOURCES += [
-CPPSRCS += nsNativeAppSupportQt.cpp
+'nsNativeAppSupportDefault.cpp',
-CPPSRCS += nsQAppInstance.cpp
+]
-else
-CPPSRCS += nsNativeAppSupportDefault.cpp
+if CONFIG['MOZ_X11']:
+CPP_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
-@@ -53,18 +53,19 @@ LOCAL_INCLUDES = -I$(srcdir)
+@@ -86,9 +86,10 @@ EXTRA_COMPONENTS = \
-LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
+# we don't want the shared lib, but we want to force the creation of a static lib.
--I$(topsrcdir)/dom/ipc \
+FORCE_STATIC_LIB = 1
--I$(topsrcdir)/content/base/src \
+include $(topsrcdir)/config/config.mk
--I$(topsrcdir)/content/events/src \
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
--I$(topsrcdir)/netwerk/base/src \
+include $(topsrcdir)/config/rules.mk
--I$(topsrcdir)/netwerk/protocol/http
+ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
--OSHELPER	+= nsGNOMERegistry.cpp
-+OSHELPER	+= nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp
-OSHELPER  += nsMIMEInfoUnix.cpp
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
+diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+--- a/uriloader/exthandler/moz.build
-OSHELPER += nsMIMEInfoAndroid.cpp
++++ b/uriloader/exthandler/moz.build
-OSHELPER += nsAndroidHandlerApp.cpp
+@@ -68,16 +68,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
-OSHELPER += nsExternalSharingAppService.cpp
+pass
-OSHELPER += nsExternalURLHandlerService.cpp
+else:
-endif
+CPP_SOURCES += [
+'nsOSHelperAppService.cpp',
+]
+if CONFIG['MOZ_ENABLE_GTK']:
+CPP_SOURCES += [
++        'nsCommonRegistry.cpp',
++	'nsKDERegistry.cpp',
+'nsGNOMERegistry.cpp',
+'nsMIMEInfoUnix.cpp',
+]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+CPP_SOURCES += [
+'nsMIMEInfoAndroid.cpp',
+'nsAndroidHandlerApp.cpp',
+'nsExternalSharingAppService.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 @@
 +};
 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
 new file mode 100644
 --- /dev/null
 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,88 @@
 +/* -*- 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/. */
 +
 +        nsCString description = output[ 1 ];
 +        mimeInfo->SetDescription(NS_ConvertUTF8toUTF16(description));
 +        nsCString handlerAppName = output[ 2 ];
 +        mimeInfo->SetDefaultDescription(NS_ConvertUTF8toUTF16(handlerAppName));
 +        mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault);
-+        nsMIMEInfoBase* retval;
++        return mimeInfo.forget();
-+        NS_ADDREF((retval = mimeInfo));
-+        return retval;
 +        }
 +    return nullptr;
 +}
 diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
 new file mode 100644
 #include <QString>
 #endif
 #include "nsOSHelperAppService.h"
 #include "nsMIMEInfoUnix.h"
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 -#include "nsGNOMERegistry.h"
 +#include "nsCommonRegistry.h"
 #endif
 #include "nsISupports.h"
 #include "nsString.h"
 if (action.isValid())
 *aHandlerExists = true;
 #endif
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 // Check the GConf registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
 +  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
 #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
 *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
 return NS_OK;
 }
 NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval)
 {
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 -  nsGNOMERegistry::GetAppDescForScheme(aScheme, _retval);
 +  nsCommonRegistry::GetAppDescForScheme(aScheme, _retval);
 return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK;
 #else
 return NS_ERROR_NOT_AVAILABLE;
 mime_types_description,
 true);
 if (NS_FAILED(rv) || majorType.IsEmpty()) {
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 LOG(("Looking in GNOME registry\n"));
 nsRefPtr<nsMIMEInfoBase> gnomeInfo =
 -      nsGNOMERegistry::GetFromExtension(aFileExt);
 +      nsCommonRegistry::GetFromExtension(aFileExt);
 if (gnomeInfo) {
 #endif
 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
 majorType,
 @@ -1389,17 +1389,17 @@ nsOSHelperAppService::GetFromType(const
-#ifdef MOZ_WIDGET_GTK2
+#ifdef MOZ_WIDGET_GTK
 nsRefPtr<nsMIMEInfoBase> gnomeInfo;
 if (handler.IsEmpty()) {
 // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
 // GNOME versions no longer have type-to-extension mappings, so we might
 // get back a MIMEInfo without any extensions set.  In that case we'll have
 // Now look up our extensions
 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
 --- a/widget/gtk2/Makefile.in
 +++ b/widget/gtk2/Makefile.in
-@@ -96,11 +96,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -67,11 +67,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
 INCLUDES	+= \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/../shared \
 		-I$(topsrcdir)/layout/generic \
 #endif
 using namespace mozilla;
 #define MAX_PREVIEW_SIZE 180
-@@ -236,17 +238,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -242,17 +244,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);
-@@ -360,16 +364,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -366,16 +370,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)
-@@ -561,8 +581,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -567,8 +587,235 @@ nsFilePicker::Done(GtkWidget* file_choos
 if (mCallback) {
 mCallback->Done(result);
 mCallback = nullptr;
 } else {
 mResult = result;
 #endif
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -34,10 +34,11 @@ LOCAL_INCLUDES	= \
+@@ -28,9 +28,10 @@ LOCAL_INCLUDES	= \
-# we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk
 DEFINES	+= -D_IMPL_NS_COM
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ifdef MOZ_WIDGET_GTK
+CXXFLAGS        += $(TK_CFLAGS)
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
-CXXFLAGS += $(MOZ_GTK2_CFLAGS)
 endif
 diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
 --- a/xpcom/components/ManifestParser.cpp
 +++ b/xpcom/components/ManifestParser.cpp
 @@ -30,16 +30,17 @@
 nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
 majorVersion,
 minorVersion);
 }
 +  desktop = NS_LITERAL_STRING("macosx");
-#elif defined(MOZ_WIDGET_GTK2)
+#elif defined(MOZ_WIDGET_GTK)
 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(MOZ_WIDGET_ANDROID)
 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
-@@ -77,17 +77,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -43,17 +43,17 @@ include $(topsrcdir)/ipc/chromium/chromi
 DEFINES		+= -D_IMPL_NS_COM
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring lib64,$(libdir)))
 DEFINES     += -DHAVE_USR_LIB64_DIR
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1752,44 +1753,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1753,44 +1754,51 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -1815,16 +1823,23 @@ nsLocalFile::Launch()
+@@ -1816,16 +1824,23 @@ nsLocalFile::Launch()
 if (nullptr == connection)
 return NS_ERROR_FAILURE;
 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)

changeset 659	fa96cf6ffd14
parent 653	38c67b6b2f37
child 680	be770d3cbc02