124 } |
124 } |
125 |
125 |
126 rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST); |
126 rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST); |
127 NS_ENSURE_SUCCESS(rv, rv); |
127 NS_ENSURE_SUCCESS(rv, rv); |
128 |
128 |
129 diff --git a/toolkit/components/downloads/src/Makefile.in b/toolkit/components/downloads/src/Makefile.in |
129 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in |
130 --- a/toolkit/components/downloads/src/Makefile.in |
130 --- a/toolkit/components/downloads/Makefile.in |
131 +++ b/toolkit/components/downloads/src/Makefile.in |
131 +++ b/toolkit/components/downloads/Makefile.in |
132 @@ -71,8 +71,9 @@ EXTRA_COMPONENTS = \ |
132 @@ -79,8 +79,10 @@ endif |
133 nsDownloadManagerUI.manifest \ |
133 |
134 $(NULL) |
134 ifdef ENABLE_TESTS |
|
135 DIRS += test |
135 endif |
136 endif |
136 |
137 |
137 include $(topsrcdir)/config/rules.mk |
138 include $(topsrcdir)/config/rules.mk |
138 |
139 |
139 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) |
140 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) |
140 |
141 + |
141 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
142 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
142 diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp |
143 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
143 --- a/toolkit/components/downloads/src/nsDownloadManager.cpp |
144 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
144 +++ b/toolkit/components/downloads/src/nsDownloadManager.cpp |
145 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
145 @@ -71,16 +71,20 @@ |
146 @@ -71,16 +71,20 @@ |
146 |
147 |
147 #if defined(XP_WIN) && !defined(WINCE) |
148 #if defined(XP_WIN) && !defined(WINCE) |
148 #include <shlobj.h> |
149 #include <shlobj.h> |
149 #ifdef DOWNLOAD_SCANNER |
150 #ifdef DOWNLOAD_SCANNER |
2132 #define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ |
2133 #define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ |
2133 { 0x0fa3158c, 0xd5a7, 0x43de, \ |
2134 { 0x0fa3158c, 0xd5a7, 0x43de, \ |
2134 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2135 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in |
2135 --- a/toolkit/xre/Makefile.in |
2136 --- a/toolkit/xre/Makefile.in |
2136 +++ b/toolkit/xre/Makefile.in |
2137 +++ b/toolkit/xre/Makefile.in |
2137 @@ -97,17 +97,18 @@ CMMSRCS = nsNativeAppSupportCocoa.mm |
2138 @@ -94,17 +94,18 @@ EXPORTS = nsWindowsDllInterceptor.h |
|
2139 else |
|
2140 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
|
2141 CMMSRCS = nsNativeAppSupportCocoa.mm |
2138 else |
2142 else |
2139 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2143 ifeq ($(MOZ_WIDGET_TOOLKIT),os2) |
2140 CPPSRCS += nsNativeAppSupportOS2.cpp |
2144 CPPSRCS += nsNativeAppSupportOS2.cpp |
2141 else |
|
2142 ifeq ($(MOZ_WIDGET_TOOLKIT),beos) |
|
2143 CPPSRCS += nsNativeAppSupportBeOS.cpp |
|
2144 else |
2145 else |
2145 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
2146 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
2146 -CPPSRCS += nsNativeAppSupportUnix.cpp |
2147 -CPPSRCS += nsNativeAppSupportUnix.cpp |
2147 +CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp |
2148 +CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp |
2148 +EXPORTS += nsKDEUtils.h |
2149 +EXPORTS += nsKDEUtils.h |
2570 + |
2571 + |
2571 +#endif // nsKDEUtils |
2572 +#endif // nsKDEUtils |
2572 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2573 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in |
2573 --- a/uriloader/exthandler/Makefile.in |
2574 --- a/uriloader/exthandler/Makefile.in |
2574 +++ b/uriloader/exthandler/Makefile.in |
2575 +++ b/uriloader/exthandler/Makefile.in |
2575 @@ -94,18 +94,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas |
2576 @@ -90,18 +90,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas |
2576 -I$(topsrcdir)/dom/ipc \ |
2577 -I$(topsrcdir)/dom/ipc \ |
2577 -I$(topsrcdir)/content/base/src \ |
2578 -I$(topsrcdir)/content/base/src \ |
2578 -I$(topsrcdir)/content/events/src \ |
2579 -I$(topsrcdir)/content/events/src \ |
2579 -I$(topsrcdir)/netwerk/base/src \ |
2580 -I$(topsrcdir)/netwerk/base/src \ |
2580 -I$(topsrcdir)/netwerk/protocol/http |
2581 -I$(topsrcdir)/netwerk/protocol/http |
3661 ifdef MOZ_PLATFORM_MAEMO |
3662 ifdef MOZ_PLATFORM_MAEMO |
3662 CFLAGS += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS) |
3663 CFLAGS += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS) |
3663 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3664 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3664 --- a/xpcom/io/nsLocalFileUnix.cpp |
3665 --- a/xpcom/io/nsLocalFileUnix.cpp |
3665 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3666 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3666 @@ -93,16 +93,17 @@ |
3667 @@ -88,16 +88,17 @@ |
3667 #include "prproces.h" |
3668 #include "prproces.h" |
3668 #include "nsIDirectoryEnumerator.h" |
3669 #include "nsIDirectoryEnumerator.h" |
3669 #include "nsISimpleEnumerator.h" |
3670 #include "nsISimpleEnumerator.h" |
3670 #include "nsITimelineService.h" |
3671 #include "nsITimelineService.h" |
3671 |
3672 |
3679 #include <Carbon/Carbon.h> |
3680 #include <Carbon/Carbon.h> |
3680 #include "CocoaFileUtils.h" |
3681 #include "CocoaFileUtils.h" |
3681 #include "prmem.h" |
3682 #include "prmem.h" |
3682 #include "plbase64.h" |
3683 #include "plbase64.h" |
3683 |
3684 |
3684 @@ -1822,44 +1823,50 @@ nsLocalFile::Launch() |
3685 @@ -1730,44 +1731,50 @@ nsLocalFile::SetPersistentDescriptor(con |
3685 |
3686 return InitWithNativePath(aPersistentDescriptor); |
3686 return NS_OK; |
3687 #endif |
3687 } |
3688 } |
3688 #else |
3689 |
3689 NS_IMETHODIMP |
3690 NS_IMETHODIMP |
3690 nsLocalFile::Reveal() |
3691 nsLocalFile::Reveal() |
3691 { |
3692 { |
3692 #ifdef MOZ_WIDGET_GTK2 |
3693 #ifdef MOZ_WIDGET_GTK2 |
3693 - nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); |
3694 - nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); |
3744 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
3745 nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
3745 ::CFRelease(url); |
3746 ::CFRelease(url); |
3746 return rv; |
3747 return rv; |
3747 } |
3748 } |
3748 return NS_ERROR_FAILURE; |
3749 return NS_ERROR_FAILURE; |
3749 @@ -1885,16 +1892,23 @@ nsLocalFile::Launch() |
3750 @@ -1793,16 +1800,23 @@ nsLocalFile::Launch() |
3750 |
3751 |
3751 if (nsnull == connection) |
3752 if (nsnull == connection) |
3752 return NS_ERROR_FAILURE; |
3753 return NS_ERROR_FAILURE; |
3753 |
3754 |
3754 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS) |
3755 if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS) |