5 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
5 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
6 |
6 |
7 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in |
7 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in |
8 --- a/modules/libpref/src/Makefile.in |
8 --- a/modules/libpref/src/Makefile.in |
9 +++ b/modules/libpref/src/Makefile.in |
9 +++ b/modules/libpref/src/Makefile.in |
10 @@ -52,14 +52,15 @@ endif |
10 @@ -56,14 +56,15 @@ endif |
11 # Optimizer bug with GCC 3.2.2 on OS/2 |
11 # Optimizer bug with GCC 3.2.2 on OS/2 |
12 ifeq ($(OS_ARCH), OS2) |
12 ifeq ($(OS_ARCH), OS2) |
13 nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp |
13 nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp |
14 $(REPORT_BUILD) |
14 $(REPORT_BUILD) |
15 @$(MAKE_DEPS_AUTO_CXX) |
15 @$(MAKE_DEPS_AUTO_CXX) |
244 |
244 |
245 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
245 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
246 int64_t goat = PR_Now() - mStartTime; |
246 int64_t goat = PR_Now() - mStartTime; |
247 showTaskbarAlert = goat > alertIntervalUSec; |
247 showTaskbarAlert = goat > alertIntervalUSec; |
248 |
248 |
249 @@ -2626,19 +2639,20 @@ nsDownload::SetState(DownloadState aStat |
249 @@ -2639,19 +2652,20 @@ nsDownload::SetState(DownloadState aStat |
250 // retention policy, there's no reason to make the text clickable |
250 // retention policy, there's no reason to make the text clickable |
251 // because if it is, they'll click open the download manager and |
251 // because if it is, they'll click open the download manager and |
252 // the items they downloaded will have been removed. |
252 // the items they downloaded will have been removed. |
253 alerts->ShowAlertNotification( |
253 alerts->ShowAlertNotification( |
254 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
254 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
269 if (fileURL && |
269 if (fileURL && |
270 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
270 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
271 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
271 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
272 --- a/toolkit/content/jar.mn |
272 --- a/toolkit/content/jar.mn |
273 +++ b/toolkit/content/jar.mn |
273 +++ b/toolkit/content/jar.mn |
274 @@ -49,29 +49,33 @@ toolkit.jar: |
274 @@ -50,29 +50,33 @@ toolkit.jar: |
275 content/global/viewZoomOverlay.js (viewZoomOverlay.js) |
275 content/global/viewZoomOverlay.js (viewZoomOverlay.js) |
276 *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
276 *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
277 content/global/bindings/browser.xml (widgets/browser.xml) |
277 content/global/bindings/browser.xml (widgets/browser.xml) |
278 content/global/bindings/button.xml (widgets/button.xml) |
278 content/global/bindings/button.xml (widgets/button.xml) |
279 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
279 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
297 *+ content/global/bindings/preferences.xml (widgets/preferences.xml) |
297 *+ content/global/bindings/preferences.xml (widgets/preferences.xml) |
298 +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml) |
298 +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml) |
299 +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde |
299 +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde |
300 content/global/bindings/progressmeter.xml (widgets/progressmeter.xml) |
300 content/global/bindings/progressmeter.xml (widgets/progressmeter.xml) |
301 content/global/bindings/radio.xml (widgets/radio.xml) |
301 content/global/bindings/radio.xml (widgets/radio.xml) |
|
302 content/global/bindings/remote-browser.xml (widgets/remote-browser.xml) |
302 content/global/bindings/resizer.xml (widgets/resizer.xml) |
303 content/global/bindings/resizer.xml (widgets/resizer.xml) |
303 content/global/bindings/richlistbox.xml (widgets/richlistbox.xml) |
304 content/global/bindings/richlistbox.xml (widgets/richlistbox.xml) |
304 content/global/bindings/scale.xml (widgets/scale.xml) |
305 content/global/bindings/scale.xml (widgets/scale.xml) |
305 content/global/bindings/scrollbar.xml (widgets/scrollbar.xml) |
306 content/global/bindings/scrollbar.xml (widgets/scrollbar.xml) |
306 content/global/bindings/scrollbox.xml (widgets/scrollbox.xml) |
307 content/global/bindings/scrollbox.xml (widgets/scrollbox.xml) |
307 content/global/bindings/splitter.xml (widgets/splitter.xml) |
|
308 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml |
308 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml |
309 new file mode 100644 |
309 new file mode 100644 |
310 --- /dev/null |
310 --- /dev/null |
311 +++ b/toolkit/content/widgets/dialog-kde.xml |
311 +++ b/toolkit/content/widgets/dialog-kde.xml |
312 @@ -0,0 +1,451 @@ |
312 @@ -0,0 +1,451 @@ |
2201 +} |
2201 +} |
2202 + |
2202 + |
2203 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2203 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2204 --- a/toolkit/xre/Makefile.in |
2204 --- a/toolkit/xre/Makefile.in |
2205 +++ b/toolkit/xre/Makefile.in |
2205 +++ b/toolkit/xre/Makefile.in |
2206 @@ -63,17 +63,18 @@ else |
2206 @@ -60,17 +60,18 @@ DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICO |
|
2207 else |
2207 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2208 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2208 CMMSRCS = nsNativeAppSupportCocoa.mm |
2209 CMMSRCS = nsNativeAppSupportCocoa.mm |
2209 EXPORTS += MacQuirks.h |
|
2210 else |
2210 else |
2211 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2211 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2212 CPPSRCS += nsNativeAppSupportOS2.cpp |
2212 CPPSRCS += nsNativeAppSupportOS2.cpp |
2213 else |
2213 else |
2214 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
2214 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
2219 ifeq ($(MOZ_WIDGET_TOOLKIT),qt) |
2219 ifeq ($(MOZ_WIDGET_TOOLKIT),qt) |
2220 MOCSRCS += moc_nsNativeAppSupportQt.cpp |
2220 MOCSRCS += moc_nsNativeAppSupportQt.cpp |
2221 CPPSRCS += $(MOCSRCS) |
2221 CPPSRCS += $(MOCSRCS) |
2222 CPPSRCS += nsNativeAppSupportQt.cpp |
2222 CPPSRCS += nsNativeAppSupportQt.cpp |
2223 CPPSRCS += nsQAppInstance.cpp |
2223 CPPSRCS += nsQAppInstance.cpp |
2224 EXPORTS += nsQAppInstance.h |
|
2225 else |
2224 else |
|
2225 CPPSRCS += nsNativeAppSupportDefault.cpp |
2226 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
2226 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
2227 new file mode 100644 |
2227 new file mode 100644 |
2228 --- /dev/null |
2228 --- /dev/null |
2229 +++ b/toolkit/xre/nsKDEUtils.cpp |
2229 +++ b/toolkit/xre/nsKDEUtils.cpp |
2230 @@ -0,0 +1,339 @@ |
2230 @@ -0,0 +1,339 @@ |
2640 |
2640 |
2641 ifeq ($(MOZ_WIDGET_TOOLKIT),android) |
2641 ifeq ($(MOZ_WIDGET_TOOLKIT),android) |
2642 OSHELPER += nsMIMEInfoAndroid.cpp |
2642 OSHELPER += nsMIMEInfoAndroid.cpp |
2643 OSHELPER += nsAndroidHandlerApp.cpp |
2643 OSHELPER += nsAndroidHandlerApp.cpp |
2644 OSHELPER += nsExternalSharingAppService.cpp |
2644 OSHELPER += nsExternalSharingAppService.cpp |
2645 EXPORTS += nsExternalSharingAppService.h |
|
2646 OSHELPER += nsExternalURLHandlerService.cpp |
2645 OSHELPER += nsExternalURLHandlerService.cpp |
|
2646 endif |
2647 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2647 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2648 new file mode 100644 |
2648 new file mode 100644 |
2649 --- /dev/null |
2649 --- /dev/null |
2650 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2650 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2651 @@ -0,0 +1,54 @@ |
2651 @@ -0,0 +1,54 @@ |
3029 #endif |
3029 #endif |
3030 } |
3030 } |
3031 |
3031 |
3032 nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) |
3032 nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) |
3033 { |
3033 { |
3034 @@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c |
3034 @@ -1266,17 +1266,17 @@ nsOSHelperAppService::GetFromExtension(c |
3035 minorType, |
|
3036 mime_types_description, |
3035 mime_types_description, |
3037 true); |
3036 true); |
3038 |
3037 |
3039 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
3038 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
3040 |
3039 |
3041 #ifdef MOZ_WIDGET_GTK2 |
3040 #ifdef MOZ_WIDGET_GTK2 |
3042 LOG(("Looking in GNOME registry\n")); |
3041 LOG(("Looking in GNOME registry\n")); |
3043 - nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromExtension(aFileExt).get(); |
3042 nsRefPtr<nsMIMEInfoBase> gnomeInfo = |
3044 + nsMIMEInfoBase *gnomeInfo = nsCommonRegistry::GetFromExtension(aFileExt).get(); |
3043 - nsGNOMERegistry::GetFromExtension(aFileExt); |
|
3044 + nsCommonRegistry::GetFromExtension(aFileExt); |
3045 if (gnomeInfo) { |
3045 if (gnomeInfo) { |
3046 LOG(("Got MIMEInfo from GNOME registry\n")); |
3046 LOG(("Got MIMEInfo from GNOME registry\n")); |
3047 return gnomeInfo; |
3047 return gnomeInfo.forget(); |
3048 } |
3048 } |
3049 #endif |
3049 #endif |
3050 |
3050 |
3051 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), |
3051 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), |
3052 majorType, |
3052 majorType, |
3053 @@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const |
3053 @@ -1389,17 +1389,17 @@ nsOSHelperAppService::GetFromType(const |
3054 #ifdef MOZ_WIDGET_GTK2 |
3054 #ifdef MOZ_WIDGET_GTK2 |
3055 nsMIMEInfoBase *gnomeInfo = nullptr; |
3055 nsRefPtr<nsMIMEInfoBase> gnomeInfo; |
3056 if (handler.IsEmpty()) { |
3056 if (handler.IsEmpty()) { |
3057 // No useful data yet. Check the GNOME registry. Unfortunately, newer |
3057 // No useful data yet. Check the GNOME registry. Unfortunately, newer |
3058 // GNOME versions no longer have type-to-extension mappings, so we might |
3058 // GNOME versions no longer have type-to-extension mappings, so we might |
3059 // get back a MIMEInfo without any extensions set. In that case we'll have |
3059 // get back a MIMEInfo without any extensions set. In that case we'll have |
3060 // to look in our mime.types files for the extensions. |
3060 // to look in our mime.types files for the extensions. |
3061 LOG(("Looking in GNOME registry\n")); |
3061 LOG(("Looking in GNOME registry\n")); |
3062 - gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); |
3062 - gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType); |
3063 + gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType).get(); |
3063 + gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType); |
3064 if (gnomeInfo && gnomeInfo->HasExtensions()) { |
3064 if (gnomeInfo && gnomeInfo->HasExtensions()) { |
3065 LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n")); |
3065 LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n")); |
3066 return gnomeInfo; |
3066 return gnomeInfo.forget(); |
3067 } |
3067 } |
3068 } |
3068 } |
3069 #endif |
3069 #endif |
3070 |
3070 |
3071 // Now look up our extensions |
3071 // Now look up our extensions |
3072 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3072 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in |
3073 --- a/widget/gtk2/Makefile.in |
3073 --- a/widget/gtk2/Makefile.in |
3074 +++ b/widget/gtk2/Makefile.in |
3074 +++ b/widget/gtk2/Makefile.in |
3075 @@ -102,11 +102,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3075 @@ -96,11 +96,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3076 |
3076 |
3077 INCLUDES += \ |
3077 INCLUDES += \ |
3078 -I$(srcdir)/../xpwidgets \ |
3078 -I$(srcdir)/../xpwidgets \ |
3079 -I$(srcdir)/../shared \ |
3079 -I$(srcdir)/../shared \ |
3080 -I$(topsrcdir)/layout/generic \ |
3080 -I$(topsrcdir)/layout/generic \ |
3436 |
3436 |
3437 #endif |
3437 #endif |
3438 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in |
3438 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in |
3439 --- a/xpcom/components/Makefile.in |
3439 --- a/xpcom/components/Makefile.in |
3440 +++ b/xpcom/components/Makefile.in |
3440 +++ b/xpcom/components/Makefile.in |
3441 @@ -46,10 +46,11 @@ LOCAL_INCLUDES = \ |
3441 @@ -34,10 +34,11 @@ LOCAL_INCLUDES = \ |
3442 # we don't want the shared lib, but we want to force the creation of a static lib. |
3442 # we don't want the shared lib, but we want to force the creation of a static lib. |
3443 FORCE_STATIC_LIB = 1 |
3443 FORCE_STATIC_LIB = 1 |
3444 |
3444 |
3445 include $(topsrcdir)/config/rules.mk |
3445 include $(topsrcdir)/config/rules.mk |
3446 |
3446 |
3582 if (directive->regfunc) { |
3582 if (directive->regfunc) { |
3583 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3583 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3584 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3584 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3585 --- a/xpcom/io/Makefile.in |
3585 --- a/xpcom/io/Makefile.in |
3586 +++ b/xpcom/io/Makefile.in |
3586 +++ b/xpcom/io/Makefile.in |
3587 @@ -113,17 +113,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3587 @@ -77,17 +77,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3588 DEFINES += -D_IMPL_NS_COM |
3588 DEFINES += -D_IMPL_NS_COM |
3589 |
3589 |
3590 ifeq ($(OS_ARCH),Linux) |
3590 ifeq ($(OS_ARCH),Linux) |
3591 ifneq (,$(findstring lib64,$(libdir))) |
3591 ifneq (,$(findstring lib64,$(libdir))) |
3592 DEFINES += -DHAVE_USR_LIB64_DIR |
3592 DEFINES += -DHAVE_USR_LIB64_DIR |