94 |
94 |
95 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
95 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
96 diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp |
96 diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp |
97 --- a/toolkit/components/downloads/src/nsDownloadManager.cpp |
97 --- a/toolkit/components/downloads/src/nsDownloadManager.cpp |
98 +++ b/toolkit/components/downloads/src/nsDownloadManager.cpp |
98 +++ b/toolkit/components/downloads/src/nsDownloadManager.cpp |
99 @@ -76,16 +76,20 @@ |
99 @@ -71,16 +71,20 @@ |
100 |
100 |
101 #if defined(XP_WIN) && !defined(WINCE) |
101 #if defined(XP_WIN) && !defined(WINCE) |
102 #include <shlobj.h> |
102 #include <shlobj.h> |
103 #ifdef DOWNLOAD_SCANNER |
103 #ifdef DOWNLOAD_SCANNER |
104 #include "nsDownloadScanner.h" |
104 #include "nsDownloadScanner.h" |
115 |
115 |
116 #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties" |
116 #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties" |
117 #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" |
117 #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" |
118 #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" |
118 #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" |
119 #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" |
119 #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" |
120 @@ -2193,16 +2197,25 @@ nsDownload::SetState(DownloadState aStat |
120 @@ -2188,16 +2192,25 @@ nsDownload::SetState(DownloadState aStat |
121 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
121 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
122 |
122 |
123 // Master pref to control this function. |
123 // Master pref to control this function. |
124 PRBool showTaskbarAlert = PR_TRUE; |
124 PRBool showTaskbarAlert = PR_TRUE; |
125 if (pref) |
125 if (pref) |
141 |
141 |
142 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
142 PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC; |
143 PRInt64 goat = PR_Now() - mStartTime; |
143 PRInt64 goat = PR_Now() - mStartTime; |
144 showTaskbarAlert = goat > alertIntervalUSec; |
144 showTaskbarAlert = goat > alertIntervalUSec; |
145 |
145 |
146 @@ -2228,16 +2241,17 @@ nsDownload::SetState(DownloadState aStat |
146 @@ -2223,16 +2236,17 @@ nsDownload::SetState(DownloadState aStat |
147 // because if it is, they'll click open the download manager and |
147 // because if it is, they'll click open the download manager and |
148 // the items they downloaded will have been removed. |
148 // the items they downloaded will have been removed. |
149 alerts->ShowAlertNotification( |
149 alerts->ShowAlertNotification( |
150 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
150 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, |
151 message, !removeWhenDone, EmptyString(), mDownloadManager, |
151 message, !removeWhenDone, EmptyString(), mDownloadManager, |
153 } |
153 } |
154 } |
154 } |
155 + } // end non-KDE block |
155 + } // end non-KDE block |
156 } |
156 } |
157 |
157 |
|
158 #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) |
158 nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); |
159 nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); |
159 if (fileURL) { |
160 nsCOMPtr<nsIFile> file; |
160 nsCOMPtr<nsIFile> file; |
161 nsAutoString path; |
161 if (NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && file ) { |
162 |
162 |
163 if (fileURL && |
163 #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) |
|
164 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
164 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
165 --- a/toolkit/content/jar.mn |
165 --- a/toolkit/content/jar.mn |
166 +++ b/toolkit/content/jar.mn |
166 +++ b/toolkit/content/jar.mn |
167 @@ -40,29 +40,33 @@ toolkit.jar: |
167 @@ -40,29 +40,33 @@ toolkit.jar: |
168 *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) |
168 *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) |
2530 + |
2530 + |
2531 +#endif // nsKDEUtils |
2531 +#endif // nsKDEUtils |
2532 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2532 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2533 --- a/uriloader/exthandler/Makefile.in |
2533 --- a/uriloader/exthandler/Makefile.in |
2534 +++ b/uriloader/exthandler/Makefile.in |
2534 +++ b/uriloader/exthandler/Makefile.in |
2535 @@ -85,18 +85,19 @@ CMMSRCS = nsOSHelperAppService.mm \ |
2535 @@ -94,18 +94,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas |
2536 $(NULL) |
2536 -I$(topsrcdir)/dom/ipc \ |
2537 else |
2537 -I$(topsrcdir)/content/base/src \ |
2538 OSHELPER = nsOSHelperAppService.cpp |
2538 -I$(topsrcdir)/content/events/src \ |
|
2539 -I$(topsrcdir)/netwerk/base/src \ |
|
2540 -I$(topsrcdir)/netwerk/protocol/http |
2539 endif |
2541 endif |
2540 |
|
2541 LOCAL_INCLUDES = -I$(srcdir) |
|
2542 |
2542 |
2543 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
2543 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
2544 -OSHELPER += nsGNOMERegistry.cpp |
2544 -OSHELPER += nsGNOMERegistry.cpp |
2545 +OSHELPER += nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp |
2545 +OSHELPER += nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp |
2546 OSHELPER += nsMIMEInfoUnix.cpp |
2546 OSHELPER += nsMIMEInfoUnix.cpp |
3102 |
3102 |
3103 // Now look up our extensions |
3103 // Now look up our extensions |
3104 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in |
3104 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in |
3105 --- a/widget/src/gtk2/Makefile.in |
3105 --- a/widget/src/gtk2/Makefile.in |
3106 +++ b/widget/src/gtk2/Makefile.in |
3106 +++ b/widget/src/gtk2/Makefile.in |
3107 @@ -156,8 +156,11 @@ endif |
3107 @@ -155,11 +155,14 @@ endif |
3108 |
3108 |
3109 DEFINES += -DCAIRO_GFX |
3109 DEFINES += -DCAIRO_GFX |
3110 |
3110 |
3111 INCLUDES += \ |
3111 INCLUDES += \ |
3112 -I$(srcdir)/../xpwidgets \ |
3112 -I$(srcdir)/../xpwidgets \ |
3114 -I$(topsrcdir)/other-licenses/atk-1.0 \ |
3114 -I$(topsrcdir)/other-licenses/atk-1.0 \ |
3115 $(NULL) |
3115 $(NULL) |
3116 + |
3116 + |
3117 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
3117 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
3118 + |
3118 + |
|
3119 ifdef MOZ_X11 |
|
3120 INCLUDES += -I$(srcdir)/../shared/x11 |
|
3121 endif |
3119 diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp |
3122 diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp |
3120 --- a/widget/src/gtk2/nsFilePicker.cpp |
3123 --- a/widget/src/gtk2/nsFilePicker.cpp |
3121 +++ b/widget/src/gtk2/nsFilePicker.cpp |
3124 +++ b/widget/src/gtk2/nsFilePicker.cpp |
3122 @@ -31,16 +31,17 @@ |
3125 @@ -31,16 +31,17 @@ |
3123 * decision by deleting the provisions above and replace them with the notice |
3126 * decision by deleting the provisions above and replace them with the notice |