19 libs:: greprefs.js |
19 libs:: greprefs.js |
20 $(INSTALL) $^ $(DIST)/bin/ |
20 $(INSTALL) $^ $(DIST)/bin/ |
21 diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp |
21 diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp |
22 --- a/modules/libpref/src/nsPrefService.cpp |
22 --- a/modules/libpref/src/nsPrefService.cpp |
23 +++ b/modules/libpref/src/nsPrefService.cpp |
23 +++ b/modules/libpref/src/nsPrefService.cpp |
24 @@ -55,16 +55,17 @@ |
24 @@ -57,16 +57,17 @@ |
25 #include "nsIStringEnumerator.h" |
|
26 #include "nsIZipReader.h" |
25 #include "nsIZipReader.h" |
27 #include "nsPrefBranch.h" |
26 #include "nsPrefBranch.h" |
28 #include "nsXPIDLString.h" |
27 #include "nsXPIDLString.h" |
29 #include "nsCRT.h" |
28 #include "nsCRT.h" |
30 #include "nsCOMArray.h" |
29 #include "nsCOMArray.h" |
31 #include "nsXPCOMCID.h" |
30 #include "nsXPCOMCID.h" |
32 #include "nsAutoPtr.h" |
31 #include "nsAutoPtr.h" |
|
32 #include "nsThreadUtils.h" |
33 +#include "nsKDEUtils.h" |
33 +#include "nsKDEUtils.h" |
34 |
34 |
35 #include "nsQuickSort.h" |
35 #include "nsQuickSort.h" |
36 #include "prmem.h" |
36 #include "prmem.h" |
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 @@ -760,30 +761,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
42 @@ -798,30 +799,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 //---------------------------------------------------------------------------------------- |
91 //---------------------------------------------------------------------------------------- |
92 @@ -814,28 +833,40 @@ static nsresult pref_InitDefaults() |
92 @@ -852,28 +871,40 @@ static nsresult pref_InitDefaults() |
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_MAC) || defined(XP_MACOSX) |
95 #if defined(XP_MAC) || defined(XP_MACOSX) |
96 "macprefs.js" |
96 "macprefs.js" |
97 #elif defined(XP_WIN) |
97 #elif defined(XP_WIN) |
165 |
165 |
166 #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties" |
166 #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties" |
167 #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" |
167 #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" |
168 #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" |
168 #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" |
169 #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" |
169 #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" |
170 @@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat |
170 @@ -2199,16 +2203,25 @@ nsDownload::SetState(DownloadState aStat |
171 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
171 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
172 |
172 |
173 // Master pref to control this function. |
173 // Master pref to control this function. |
174 PRBool showTaskbarAlert = PR_TRUE; |
174 PRBool showTaskbarAlert = PR_TRUE; |
175 if (pref) |
175 if (pref) |
191 |
191 |
192 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
192 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
193 PRInt64 goat = PR_Now() - mStartTime; |
193 PRInt64 goat = PR_Now() - mStartTime; |
194 showTaskbarAlert = goat > alertIntervalUSec; |
194 showTaskbarAlert = goat > alertIntervalUSec; |
195 |
195 |
196 @@ -2227,16 +2240,17 @@ nsDownload::SetState(DownloadState aStat |
196 @@ -2234,16 +2247,17 @@ nsDownload::SetState(DownloadState aStat |
197 // because if it is, they'll click open the download manager and |
197 // because if it is, they'll click open the download manager and |
198 // the items they downloaded will have been removed. |
198 // the items they downloaded will have been removed. |
199 alerts->ShowAlertNotification( |
199 alerts->ShowAlertNotification( |
200 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
200 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
201 message, !removeWhenDone, EmptyString(), mDownloadManager, |
201 message, !removeWhenDone, EmptyString(), mDownloadManager, |
2600 ifeq ($(MOZ_WIDGET_TOOLKIT),android) |
2600 ifeq ($(MOZ_WIDGET_TOOLKIT),android) |
2601 OSHELPER += nsMIMEInfoAndroid.cpp |
2601 OSHELPER += nsMIMEInfoAndroid.cpp |
2602 OSHELPER += nsAndroidHandlerApp.cpp |
2602 OSHELPER += nsAndroidHandlerApp.cpp |
2603 OSHELPER += nsExternalSharingAppService.cpp |
2603 OSHELPER += nsExternalSharingAppService.cpp |
2604 EXPORTS += nsExternalSharingAppService.h |
2604 EXPORTS += nsExternalSharingAppService.h |
2605 endif |
2605 OSHELPER += nsExternalURLHandlerService.cpp |
2606 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2606 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2607 new file mode 100644 |
2607 new file mode 100644 |
2608 --- /dev/null |
2608 --- /dev/null |
2609 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2609 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2610 @@ -0,0 +1,87 @@ |
2610 @@ -0,0 +1,87 @@ |
3199 |
3199 |
3200 #include "nsFilePicker.h" |
3200 #include "nsFilePicker.h" |
3201 #include "nsAccessibilityHelper.h" |
3201 #include "nsAccessibilityHelper.h" |
3202 +#include "nsKDEUtils.h" |
3202 +#include "nsKDEUtils.h" |
3203 |
3203 |
3204 #ifdef MOZ_PLATFORM_MAEMO |
3204 #if (MOZ_PLATFORM_MAEMO == 5) |
3205 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h> |
3205 #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h> |
3206 #endif |
3206 #endif |
3207 |
3207 |
3208 #define MAX_PREVIEW_SIZE 180 |
3208 #define MAX_PREVIEW_SIZE 180 |
3209 |
3209 |
3210 nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull; |
3210 nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull; |
3211 @@ -270,17 +272,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil |
3211 @@ -271,17 +273,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil |
3212 return nsBaseFilePicker::AppendFilters(aFilterMask); |
3212 return nsBaseFilePicker::AppendFilters(aFilterMask); |
3213 } |
3213 } |
3214 |
3214 |
3215 NS_IMETHODIMP |
3215 NS_IMETHODIMP |
3216 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) |
3216 nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) |
3227 CopyUTF16toUTF8(aFilter, filter); |
3227 CopyUTF16toUTF8(aFilter, filter); |
3228 CopyUTF16toUTF8(aTitle, name); |
3228 CopyUTF16toUTF8(aTitle, name); |
3229 |
3229 |
3230 mFilters.AppendElement(filter); |
3230 mFilters.AppendElement(filter); |
3231 mFilterNames.AppendElement(name); |
3231 mFilterNames.AppendElement(name); |
3232 @@ -418,16 +422,19 @@ confirm_overwrite_file(GtkWidget *parent |
3232 @@ -419,16 +423,19 @@ confirm_overwrite_file(GtkWidget *parent |
3233 gtk_widget_destroy(dialog); |
3233 gtk_widget_destroy(dialog); |
3234 |
3234 |
3235 return result; |
3235 return result; |
3236 } |
3236 } |
3237 |
3237 |
3247 title.Adopt(ToNewUTF8String(mTitle)); |
3247 title.Adopt(ToNewUTF8String(mTitle)); |
3248 |
3248 |
3249 GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); |
3249 GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); |
3250 |
3250 |
3251 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
3251 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
3252 @@ -568,8 +575,234 @@ nsFilePicker::Show(PRInt16 *aReturn) |
3252 @@ -569,8 +576,234 @@ nsFilePicker::Show(PRInt16 *aReturn) |
3253 *aReturn = nsIFilePicker::returnCancel; |
3253 *aReturn = nsIFilePicker::returnCancel; |
3254 break; |
3254 break; |
3255 } |
3255 } |
3256 |
3256 |
3257 gtk_widget_destroy(file_chooser); |
3257 gtk_widget_destroy(file_chooser); |
3750 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
3750 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
3751 ::CFRelease(url); |
3751 ::CFRelease(url); |
3752 return rv; |
3752 return rv; |
3753 } |
3753 } |
3754 return NS_ERROR_FAILURE; |
3754 return NS_ERROR_FAILURE; |
3755 @@ -1881,16 +1888,23 @@ nsLocalFile::Launch() |
3755 @@ -1883,16 +1890,23 @@ nsLocalFile::Launch() |
3756 |
3756 |
3757 if (nsnull == connection) |
3757 if (nsnull == connection) |
3758 return NS_ERROR_FAILURE; |
3758 return NS_ERROR_FAILURE; |
3759 |
3759 |
3760 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS) |
3760 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS) |