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 @@ -54,14 +54,15 @@ endif |
10 @@ -52,14 +52,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) |
182 self.base = base |
182 self.base = base |
183 self.flags = Flags(*flags) |
183 self.flags = Flags(*flags) |
184 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
184 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
185 --- a/toolkit/components/downloads/Makefile.in |
185 --- a/toolkit/components/downloads/Makefile.in |
186 +++ b/toolkit/components/downloads/Makefile.in |
186 +++ b/toolkit/components/downloads/Makefile.in |
187 @@ -42,9 +42,12 @@ EXTRA_COMPONENTS = \ |
187 @@ -32,9 +32,11 @@ ifndef MOZ_SUITE |
|
188 EXTRA_COMPONENTS = \ |
|
189 nsDownloadManagerUI.js \ |
188 nsDownloadManagerUI.manifest \ |
190 nsDownloadManagerUI.manifest \ |
189 $(NULL) |
191 $(NULL) |
190 endif |
192 endif |
191 |
193 |
192 TEST_DIRS += test |
|
193 |
|
194 include $(topsrcdir)/config/rules.mk |
194 include $(topsrcdir)/config/rules.mk |
195 |
195 |
196 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
196 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
197 + |
|
198 + |
197 + |
199 CXXFLAGS += $(TK_CFLAGS) |
198 CXXFLAGS += $(TK_CFLAGS) |
200 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
199 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
201 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
200 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
202 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
201 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
253 // the items they downloaded will have been removed. |
252 // the items they downloaded will have been removed. |
254 alerts->ShowAlertNotification( |
253 alerts->ShowAlertNotification( |
255 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
254 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
256 message, !removeWhenDone, |
255 message, !removeWhenDone, |
257 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
256 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), |
258 mDownloadManager, EmptyString()); |
257 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), EmptyString()); |
259 - } |
258 - } |
260 + } |
259 + } |
261 } |
260 } |
262 } |
261 } |
263 + } |
262 + } |
2144 |
2143 |
2145 NS_IMETHODIMP |
2144 NS_IMETHODIMP |
2146 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) |
2145 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) |
2147 { |
2146 { |
2148 // dbus prevents us from being threadsafe, but this routine should not block anyhow |
2147 // dbus prevents us from being threadsafe, but this routine should not block anyhow |
2149 @@ -499,16 +502,19 @@ nsUnixSystemProxySettings::GetProxyFromG |
2148 @@ -496,16 +499,19 @@ nsUnixSystemProxySettings::GetProxyFromG |
2150 |
2149 |
2151 nsresult |
2150 nsresult |
2152 nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, |
2151 nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, |
2153 const nsACString & aScheme, |
2152 const nsACString & aScheme, |
2154 const nsACString & aHost, |
2153 const nsACString & aHost, |
2164 return rv; |
2163 return rv; |
2165 } |
2164 } |
2166 if (mGConf) |
2165 if (mGConf) |
2167 return GetProxyFromGConf(aScheme, aHost, aPort, aResult); |
2166 return GetProxyFromGConf(aScheme, aHost, aPort, aResult); |
2168 |
2167 |
2169 @@ -534,8 +540,34 @@ static const mozilla::Module::ContractID |
2168 @@ -531,8 +537,34 @@ static const mozilla::Module::ContractID |
2170 |
2169 |
2171 static const mozilla::Module kUnixProxyModule = { |
2170 static const mozilla::Module kUnixProxyModule = { |
2172 mozilla::Module::kVersion, |
2171 mozilla::Module::kVersion, |
2173 kUnixProxyCIDs, |
2172 kUnixProxyCIDs, |
2174 kUnixProxyContracts |
2173 kUnixProxyContracts |
2202 +} |
2201 +} |
2203 + |
2202 + |
2204 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 |
2205 --- a/toolkit/xre/Makefile.in |
2204 --- a/toolkit/xre/Makefile.in |
2206 +++ b/toolkit/xre/Makefile.in |
2205 +++ b/toolkit/xre/Makefile.in |
2207 @@ -72,17 +72,18 @@ else |
2206 @@ -63,17 +63,18 @@ else |
2208 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2207 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2209 CMMSRCS = nsNativeAppSupportCocoa.mm |
2208 CMMSRCS = nsNativeAppSupportCocoa.mm |
2210 EXPORTS += MacQuirks.h |
2209 EXPORTS += MacQuirks.h |
2211 else |
2210 else |
2212 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2211 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2622 + |
2621 + |
2623 +#endif // nsKDEUtils |
2622 +#endif // nsKDEUtils |
2624 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2623 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2625 --- a/uriloader/exthandler/Makefile.in |
2624 --- a/uriloader/exthandler/Makefile.in |
2626 +++ b/uriloader/exthandler/Makefile.in |
2625 +++ b/uriloader/exthandler/Makefile.in |
2627 @@ -59,18 +59,19 @@ LOCAL_INCLUDES = -I$(srcdir) |
2626 @@ -53,18 +53,19 @@ LOCAL_INCLUDES = -I$(srcdir) |
2628 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ |
2627 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ |
2629 -I$(topsrcdir)/dom/ipc \ |
2628 -I$(topsrcdir)/dom/ipc \ |
2630 -I$(topsrcdir)/content/base/src \ |
2629 -I$(topsrcdir)/content/base/src \ |
2631 -I$(topsrcdir)/content/events/src \ |
2630 -I$(topsrcdir)/content/events/src \ |
2632 -I$(topsrcdir)/netwerk/base/src \ |
2631 -I$(topsrcdir)/netwerk/base/src \ |
2898 HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr); |
2897 HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr); |
2899 if (action) { |
2898 if (action) { |
2900 nsAutoCString spec; |
2899 nsAutoCString spec; |
2901 aURI->GetAsciiSpec(spec); |
2900 aURI->GetAsciiSpec(spec); |
2902 if (hildon_uri_open(spec.get(), action, nullptr)) |
2901 if (hildon_uri_open(spec.get(), action, nullptr)) |
2903 @@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * |
2902 @@ -67,22 +70,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo |
2904 |
|
2905 return rv; |
|
2906 } |
|
2907 |
|
2908 NS_IMETHODIMP |
|
2909 nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval) |
|
2910 { |
2903 { |
|
2904 // if mDefaultApplication is set, it means the application has been set from |
|
2905 // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to |
|
2906 // give the GNOME answer. |
|
2907 if (mDefaultApplication) |
|
2908 return nsMIMEInfoImpl::GetHasDefaultHandler(_retval); |
|
2909 |
2911 *_retval = false; |
2910 *_retval = false; |
2912 - nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType); |
2911 - nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType); |
2913 + nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType); |
2912 + nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType); |
2914 if (!mimeInfo) { |
2913 if (!mimeInfo) { |
2915 nsAutoCString ext; |
2914 nsAutoCString ext; |
2957 // nsGIOMimeApp->Launch wants a URI string instead of local file |
2956 // nsGIOMimeApp->Launch wants a URI string instead of local file |
2958 nsresult rv; |
2957 nsresult rv; |
2959 nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); |
2958 nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); |
2960 NS_ENSURE_SUCCESS(rv, rv); |
2959 NS_ENSURE_SUCCESS(rv, rv); |
2961 nsCOMPtr<nsIURI> uri; |
2960 nsCOMPtr<nsIURI> uri; |
2962 @@ -146,17 +166,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns |
2961 @@ -157,17 +177,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns |
2963 /* Fallback to GnomeVFS */ |
2962 /* Fallback to GnomeVFS */ |
2964 nsCOMPtr<nsIGnomeVFSMimeApp> app; |
2963 nsCOMPtr<nsIGnomeVFSMimeApp> app; |
2965 if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) |
2964 if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) |
2966 return app->Launch(nativePath); |
2965 return app->Launch(nativePath); |
2967 } |
2966 } |
3071 |
3070 |
3072 // Now look up our extensions |
3071 // Now look up our extensions |
3073 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 |
3074 --- a/widget/gtk2/Makefile.in |
3073 --- a/widget/gtk2/Makefile.in |
3075 +++ b/widget/gtk2/Makefile.in |
3074 +++ b/widget/gtk2/Makefile.in |
3076 @@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3075 @@ -102,11 +102,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' |
3077 |
3076 |
3078 INCLUDES += \ |
3077 INCLUDES += \ |
3079 -I$(srcdir)/../xpwidgets \ |
3078 -I$(srcdir)/../xpwidgets \ |
3080 -I$(srcdir)/../shared \ |
3079 -I$(srcdir)/../shared \ |
3081 -I$(topsrcdir)/layout/generic \ |
3080 -I$(topsrcdir)/layout/generic \ |
3437 |
3436 |
3438 #endif |
3437 #endif |
3439 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 |
3440 --- a/xpcom/components/Makefile.in |
3439 --- a/xpcom/components/Makefile.in |
3441 +++ b/xpcom/components/Makefile.in |
3440 +++ b/xpcom/components/Makefile.in |
3442 @@ -59,10 +59,11 @@ LOCAL_INCLUDES = \ |
3441 @@ -46,10 +46,11 @@ LOCAL_INCLUDES = \ |
3443 # 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. |
3444 FORCE_STATIC_LIB = 1 |
3443 FORCE_STATIC_LIB = 1 |
3445 |
3444 |
3446 include $(topsrcdir)/config/rules.mk |
3445 include $(topsrcdir)/config/rules.mk |
3447 |
3446 |
3583 if (directive->regfunc) { |
3582 if (directive->regfunc) { |
3584 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3583 if (GeckoProcessType_Default != XRE_GetProcessType()) |
3585 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 |
3586 --- a/xpcom/io/Makefile.in |
3585 --- a/xpcom/io/Makefile.in |
3587 +++ b/xpcom/io/Makefile.in |
3586 +++ b/xpcom/io/Makefile.in |
3588 @@ -161,17 +161,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3587 @@ -113,17 +113,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3589 DEFINES += -D_IMPL_NS_COM |
3588 DEFINES += -D_IMPL_NS_COM |
3590 |
3589 |
3591 ifeq ($(OS_ARCH),Linux) |
3590 ifeq ($(OS_ARCH),Linux) |
3592 ifneq (,$(findstring lib64,$(libdir))) |
3591 ifneq (,$(findstring lib64,$(libdir))) |
3593 DEFINES += -DHAVE_USR_LIB64_DIR |
3592 DEFINES += -DHAVE_USR_LIB64_DIR |