mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:e8c83b144fd1
+:38c67b6b2f37
 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
-@@ -52,14 +52,15 @@ endif
+@@ -56,14 +56,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)
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 #endif
-@@ -2590,16 +2594,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2603,16 +2607,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;
-@@ -2626,19 +2639,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2639,19 +2652,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,
 if (fileURL &&
 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) &&
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -49,29 +49,33 @@ toolkit.jar:
+@@ -50,29 +50,33 @@ toolkit.jar:
 content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
 *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
 content/global/bindings/browser.xml         (widgets/browser.xml)
 content/global/bindings/button.xml          (widgets/button.xml)
 content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
 *+ content/global/bindings/preferences.xml     (widgets/preferences.xml)
 +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
 +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
 content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
 content/global/bindings/radio.xml           (widgets/radio.xml)
+content/global/bindings/remote-browser.xml  (widgets/remote-browser.xml)
 content/global/bindings/resizer.xml         (widgets/resizer.xml)
 content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
 content/global/bindings/scale.xml           (widgets/scale.xml)
 content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
 content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
-content/global/bindings/splitter.xml        (widgets/splitter.xml)
 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/dialog-kde.xml
 @@ -0,0 +1,451 @@
 +}
 +
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -63,17 +63,18 @@ else
+@@ -60,17 +60,18 @@ DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICO
+else
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CMMSRCS = nsNativeAppSupportCocoa.mm
-EXPORTS += MacQuirks.h
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 CPPSRCS += nsNativeAppSupportOS2.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 MOCSRCS += moc_nsNativeAppSupportQt.cpp
 CPPSRCS += $(MOCSRCS)
 CPPSRCS += nsNativeAppSupportQt.cpp
 CPPSRCS += nsQAppInstance.cpp
-EXPORTS += nsQAppInstance.h
 else
+CPPSRCS += nsNativeAppSupportDefault.cpp
 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 @@
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 OSHELPER += nsMIMEInfoAndroid.cpp
 OSHELPER += nsAndroidHandlerApp.cpp
 OSHELPER += nsExternalSharingAppService.cpp
-EXPORTS += nsExternalSharingAppService.h
 OSHELPER += nsExternalURLHandlerService.cpp
+endif
 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
 }
 nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
 {
-@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1266,17 +1266,17 @@ nsOSHelperAppService::GetFromExtension(c
-minorType,
 mime_types_description,
 true);
 if (NS_FAILED(rv) || majorType.IsEmpty()) {
 #ifdef MOZ_WIDGET_GTK2
 LOG(("Looking in GNOME registry\n"));
--    nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromExtension(aFileExt).get();
+nsRefPtr<nsMIMEInfoBase> gnomeInfo =
-+    nsMIMEInfoBase *gnomeInfo = nsCommonRegistry::GetFromExtension(aFileExt).get();
+-      nsGNOMERegistry::GetFromExtension(aFileExt);
++      nsCommonRegistry::GetFromExtension(aFileExt);
 if (gnomeInfo) {
 LOG(("Got MIMEInfo from GNOME registry\n"));
-return gnomeInfo;
+return gnomeInfo.forget();
 }
 #endif
 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
 majorType,
-@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const
+@@ -1389,17 +1389,17 @@ nsOSHelperAppService::GetFromType(const
 #ifdef MOZ_WIDGET_GTK2
-nsMIMEInfoBase *gnomeInfo = nullptr;
+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
 // to look in our mime.types files for the extensions.
 LOG(("Looking in GNOME registry\n"));
--    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get();
+-    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
-+    gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType).get();
++    gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
 if (gnomeInfo && gnomeInfo->HasExtensions()) {
 LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
-return gnomeInfo;
+return gnomeInfo.forget();
 }
 }
 #endif
 // 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
-@@ -102,11 +102,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -96,11 +96,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
 INCLUDES	+= \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/../shared \
 		-I$(topsrcdir)/layout/generic \
 #endif
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -46,10 +46,11 @@ LOCAL_INCLUDES	= \
+@@ -34,10 +34,11 @@ 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
 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
-@@ -113,17 +113,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -77,17 +77,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 653	38c67b6b2f37
parent 650	e8c83b144fd1
child 659	fa96cf6ffd14