equal
deleted
inserted
replaced
1 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in |
1 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in |
2 --- a/modules/libpref/src/Makefile.in |
2 --- a/modules/libpref/src/Makefile.in |
3 +++ b/modules/libpref/src/Makefile.in |
3 +++ b/modules/libpref/src/Makefile.in |
4 @@ -87,14 +87,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas |
4 @@ -77,14 +77,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas |
5 # Optimizer bug with GCC 3.2.2 on OS/2 |
5 # Optimizer bug with GCC 3.2.2 on OS/2 |
6 ifeq ($(OS_ARCH), OS2) |
6 ifeq ($(OS_ARCH), OS2) |
7 nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp |
7 nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp |
8 $(REPORT_BUILD) |
8 $(REPORT_BUILD) |
9 @$(MAKE_DEPS_AUTO_CXX) |
9 @$(MAKE_DEPS_AUTO_CXX) |
37 #include "pldhash.h" |
37 #include "pldhash.h" |
38 |
38 |
39 #include "prefapi.h" |
39 #include "prefapi.h" |
40 #include "prefread.h" |
40 #include "prefread.h" |
41 #include "prefapi_private_data.h" |
41 #include "prefapi_private_data.h" |
42 @@ -822,30 +823,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
42 @@ -966,30 +967,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
43 } |
43 } |
44 |
44 |
45 static nsresult pref_LoadPrefsInDirList(const char *listId) |
45 static nsresult pref_LoadPrefsInDirList(const char *listId) |
46 { |
46 { |
47 nsresult rv; |
47 nsresult rv; |
87 } |
87 } |
88 return NS_OK; |
88 return NS_OK; |
89 } |
89 } |
90 |
90 |
91 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
91 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
92 @@ -938,28 +957,40 @@ static nsresult pref_InitInitialObjects( |
92 @@ -1082,28 +1101,40 @@ static nsresult pref_InitInitialObjects( |
93 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
93 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
94 static const char* specialFiles[] = { |
94 static const char* specialFiles[] = { |
95 #if defined(XP_MACOSX) |
95 #if defined(XP_MACOSX) |
96 "macprefs.js" |
96 "macprefs.js" |
97 #elif defined(XP_WIN) |
97 #elif defined(XP_WIN) |
131 nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
131 nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); |
132 if (appJarReader) { |
132 if (appJarReader) { |
133 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
133 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
134 --- a/toolkit/components/downloads/Makefile.in |
134 --- a/toolkit/components/downloads/Makefile.in |
135 +++ b/toolkit/components/downloads/Makefile.in |
135 +++ b/toolkit/components/downloads/Makefile.in |
136 @@ -79,8 +79,10 @@ endif |
136 @@ -77,8 +77,10 @@ EXTRA_COMPONENTS = \ |
|
137 $(NULL) |
|
138 endif |
137 |
139 |
138 ifdef ENABLE_TESTS |
140 ifdef ENABLE_TESTS |
139 DIRS += test |
141 DIRS += test |
140 endif |
142 endif |
141 |
143 |
142 include $(topsrcdir)/config/rules.mk |
144 include $(topsrcdir)/config/rules.mk |
143 |
|
144 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) |
|
145 + |
145 + |
146 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
146 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
147 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
147 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
148 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
148 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
149 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
149 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
166 |
166 |
167 #ifdef ANDROID |
167 #ifdef ANDROID |
168 #include "AndroidBridge.h" |
168 #include "AndroidBridge.h" |
169 #endif |
169 #endif |
170 |
170 |
171 @@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat |
171 @@ -2203,16 +2207,25 @@ nsDownload::SetState(DownloadState aStat |
172 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
172 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
173 |
173 |
174 // Master pref to control this function. |
174 // Master pref to control this function. |
175 PRBool showTaskbarAlert = PR_TRUE; |
175 PRBool showTaskbarAlert = PR_TRUE; |
176 if (pref) |
176 if (pref) |
192 |
192 |
193 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
193 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
194 PRInt64 goat = PR_Now() - mStartTime; |
194 PRInt64 goat = PR_Now() - mStartTime; |
195 showTaskbarAlert = goat > alertIntervalUSec; |
195 showTaskbarAlert = goat > alertIntervalUSec; |
196 |
196 |
197 @@ -2225,19 +2238,20 @@ nsDownload::SetState(DownloadState aStat |
197 @@ -2236,19 +2249,20 @@ nsDownload::SetState(DownloadState aStat |
198 // If downloads are automatically removed per the user's |
198 // If downloads are automatically removed per the user's |
199 // retention policy, there's no reason to make the text clickable |
199 // retention policy, there's no reason to make the text clickable |
200 // because if it is, they'll click open the download manager and |
200 // because if it is, they'll click open the download manager and |
201 // the items they downloaded will have been removed. |
201 // the items they downloaded will have been removed. |
202 alerts->ShowAlertNotification( |
202 alerts->ShowAlertNotification( |
2176 +} |
2176 +} |
2177 + |
2177 + |
2178 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2178 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2179 --- a/toolkit/xre/Makefile.in |
2179 --- a/toolkit/xre/Makefile.in |
2180 +++ b/toolkit/xre/Makefile.in |
2180 +++ b/toolkit/xre/Makefile.in |
2181 @@ -97,17 +97,18 @@ EXPORTS = nsWindowsDllInterceptor.h |
2181 @@ -98,17 +98,18 @@ EXPORTS = nsWindowsDllInterceptor.h |
2182 else |
2182 else |
2183 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2183 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
2184 CMMSRCS = nsNativeAppSupportCocoa.mm |
2184 CMMSRCS = nsNativeAppSupportCocoa.mm |
2185 else |
2185 else |
2186 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2186 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
3117 #include "nsReadableUtils.h" |
3117 #include "nsReadableUtils.h" |
3118 #include "nsUnicharUtils.h" |
3118 #include "nsUnicharUtils.h" |
3119 #include "nsXPIDLString.h" |
3119 #include "nsXPIDLString.h" |
3120 #include "nsIURL.h" |
3120 #include "nsIURL.h" |
3121 #include "nsIFileStreams.h" |
3121 #include "nsIFileStreams.h" |
3122 @@ -1219,29 +1219,29 @@ nsresult nsOSHelperAppService::OSProtoco |
3122 @@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco |
3123 ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); |
3123 ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); |
3124 |
3124 |
3125 if (action.isValid()) |
3125 if (action.isValid()) |
3126 *aHandlerExists = PR_TRUE; |
3126 *aHandlerExists = PR_TRUE; |
3127 #endif |
3127 #endif |
3149 #endif |
3149 #endif |
3150 } |
3150 } |
3151 |
3151 |
3152 nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) |
3152 nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) |
3153 { |
3153 { |
3154 @@ -1327,17 +1327,17 @@ nsOSHelperAppService::GetFromExtension(c |
3154 @@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c |
3155 minorType, |
3155 minorType, |
3156 mime_types_description, |
3156 mime_types_description, |
3157 PR_TRUE); |
3157 PR_TRUE); |
3158 |
3158 |
3159 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
3159 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
3168 } |
3168 } |
3169 #endif |
3169 #endif |
3170 |
3170 |
3171 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), |
3171 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), |
3172 majorType, |
3172 majorType, |
3173 @@ -1453,17 +1453,17 @@ nsOSHelperAppService::GetFromType(const |
3173 @@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const |
3174 #ifdef MOZ_WIDGET_GTK2 |
3174 #ifdef MOZ_WIDGET_GTK2 |
3175 nsMIMEInfoBase *gnomeInfo = nsnull; |
3175 nsMIMEInfoBase *gnomeInfo = nsnull; |
3176 if (handler.IsEmpty()) { |
3176 if (handler.IsEmpty()) { |
3177 // No useful data yet. Check the GNOME registry. Unfortunately, newer |
3177 // No useful data yet. Check the GNOME registry. Unfortunately, newer |
3178 // GNOME versions no longer have type-to-extension mappings, so we might |
3178 // GNOME versions no longer have type-to-extension mappings, so we might |
3190 |
3190 |
3191 // Now look up our extensions |
3191 // Now look up our extensions |
3192 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in |
3192 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in |
3193 --- a/widget/src/gtk2/Makefile.in |
3193 --- a/widget/src/gtk2/Makefile.in |
3194 +++ b/widget/src/gtk2/Makefile.in |
3194 +++ b/widget/src/gtk2/Makefile.in |
3195 @@ -158,11 +158,14 @@ endif |
3195 @@ -134,11 +134,14 @@ endif |
3196 |
3196 |
3197 DEFINES += -DCAIRO_GFX |
3197 DEFINES += -DCAIRO_GFX |
3198 |
3198 |
3199 INCLUDES += \ |
3199 INCLUDES += \ |
3200 -I$(srcdir)/../xpwidgets \ |
3200 -I$(srcdir)/../xpwidgets \ |
3244 #endif |
3244 #endif |
3245 |
3245 |
3246 #define MAX_PREVIEW_SIZE 180 |
3246 #define MAX_PREVIEW_SIZE 180 |
3247 |
3247 |
3248 nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull; |
3248 nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull; |
3249 @@ -271,17 +273,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil |
3249 @@ -282,17 +284,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil |
3250 return nsBaseFilePicker::AppendFilters(aFilterMask); |
3250 return nsBaseFilePicker::AppendFilters(aFilterMask); |
3251 } |
3251 } |
3252 |
3252 |
3253 NS_IMETHODIMP |
3253 NS_IMETHODIMP |
3254 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) |
3254 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) |
3265 CopyUTF16toUTF8(aFilter, filter); |
3265 CopyUTF16toUTF8(aFilter, filter); |
3266 CopyUTF16toUTF8(aTitle, name); |
3266 CopyUTF16toUTF8(aTitle, name); |
3267 |
3267 |
3268 mFilters.AppendElement(filter); |
3268 mFilters.AppendElement(filter); |
3269 mFilterNames.AppendElement(name); |
3269 mFilterNames.AppendElement(name); |
3270 @@ -419,16 +423,19 @@ confirm_overwrite_file(GtkWidget *parent |
3270 @@ -430,16 +434,19 @@ confirm_overwrite_file(GtkWidget *parent |
3271 gtk_widget_destroy(dialog); |
3271 gtk_widget_destroy(dialog); |
3272 |
3272 |
3273 return result; |
3273 return result; |
3274 } |
3274 } |
3275 |
3275 |
3285 title.Adopt(ToNewUTF8String(mTitle)); |
3285 title.Adopt(ToNewUTF8String(mTitle)); |
3286 |
3286 |
3287 GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); |
3287 GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); |
3288 |
3288 |
3289 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
3289 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
3290 @@ -569,8 +576,234 @@ nsFilePicker::Show(PRInt16 *aReturn) |
3290 @@ -580,8 +587,234 @@ nsFilePicker::Show(PRInt16 *aReturn) |
3291 *aReturn = nsIFilePicker::returnCancel; |
3291 *aReturn = nsIFilePicker::returnCancel; |
3292 break; |
3292 break; |
3293 } |
3293 } |
3294 |
3294 |
3295 gtk_widget_destroy(file_chooser); |
3295 gtk_widget_destroy(file_chooser); |
3688 |
3688 |
3689 if (!nsChromeRegistry::gChromeRegistry) { |
3689 if (!nsChromeRegistry::gChromeRegistry) { |
3690 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3690 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in |
3691 --- a/xpcom/io/Makefile.in |
3691 --- a/xpcom/io/Makefile.in |
3692 +++ b/xpcom/io/Makefile.in |
3692 +++ b/xpcom/io/Makefile.in |
3693 @@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3693 @@ -190,17 +190,17 @@ include $(topsrcdir)/ipc/chromium/chromi |
3694 DEFINES += -D_IMPL_NS_COM |
3694 DEFINES += -D_IMPL_NS_COM |
3695 |
3695 |
3696 ifeq ($(OS_ARCH),Linux) |
3696 ifeq ($(OS_ARCH),Linux) |
3697 ifneq (,$(findstring lib64,$(libdir))) |
3697 ifneq (,$(findstring lib64,$(libdir))) |
3698 DEFINES += -DHAVE_USR_LIB64_DIR |
3698 DEFINES += -DHAVE_USR_LIB64_DIR |