equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent d153e2141b97a77b90ba0b9befe2d80330dcd472 |
2 # Parent 972c67cdd5dd4463abbee60036b686d4cb78e616 |
3 Description: Add KDE integration to Firefox (toolkit parts) |
3 Description: Add KDE integration to Firefox (toolkit parts) |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
5 Author: Lubos Lunak <lunak@suse.com> |
5 Author: Lubos Lunak <lunak@suse.com> |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
25 |
25 |
26 #include "prefapi.h" |
26 #include "prefapi.h" |
27 #include "prefread.h" |
27 #include "prefread.h" |
28 #include "prefapi_private_data.h" |
28 #include "prefapi_private_data.h" |
29 |
29 |
30 @@ -1138,16 +1139,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
30 @@ -1145,16 +1146,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char |
31 |
31 |
32 static nsresult pref_LoadPrefsInDirList(const char *listId) |
32 static nsresult pref_LoadPrefsInDirList(const char *listId) |
33 { |
33 { |
34 nsresult rv; |
34 nsresult rv; |
35 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
35 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); |
60 getter_AddRefs(list)); |
60 getter_AddRefs(list)); |
61 if (!list) |
61 if (!list) |
62 return NS_OK; |
62 return NS_OK; |
63 |
63 |
64 bool hasMore; |
64 bool hasMore; |
65 @@ -1163,17 +1182,17 @@ static nsresult pref_LoadPrefsInDirList( |
65 @@ -1170,17 +1189,17 @@ static nsresult pref_LoadPrefsInDirList( |
66 |
66 |
67 nsAutoCString leaf; |
67 nsAutoCString leaf; |
68 path->GetNativeLeafName(leaf); |
68 path->GetNativeLeafName(leaf); |
69 |
69 |
70 // Do we care if a file provided by this process fails to load? |
70 // Do we care if a file provided by this process fails to load? |
79 |
79 |
80 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
80 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) |
81 { |
81 { |
82 nsZipItemPtr<char> manifest(jarReader, name, true); |
82 nsZipItemPtr<char> manifest(jarReader, name, true); |
83 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
83 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); |
84 @@ -1267,24 +1286,36 @@ static nsresult pref_InitInitialObjects( |
84 @@ -1274,24 +1293,36 @@ static nsresult pref_InitInitialObjects( |
85 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
85 /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ |
86 static const char* specialFiles[] = { |
86 static const char* specialFiles[] = { |
87 #if defined(XP_MACOSX) |
87 #if defined(XP_MACOSX) |
88 "macprefs.js" |
88 "macprefs.js" |
89 #elif defined(XP_WIN) |
89 #elif defined(XP_WIN) |
185 self.base = base |
185 self.base = base |
186 self.flags = Flags(*flags) |
186 self.flags = Flags(*flags) |
187 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
187 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
188 --- a/toolkit/components/downloads/moz.build |
188 --- a/toolkit/components/downloads/moz.build |
189 +++ b/toolkit/components/downloads/moz.build |
189 +++ b/toolkit/components/downloads/moz.build |
190 @@ -64,15 +64,16 @@ if not CONFIG['MOZ_SUITE']: |
190 @@ -60,15 +60,16 @@ if not CONFIG['MOZ_SUITE']: |
191 'nsDownloadManagerUI.js', |
191 'nsDownloadManagerUI.js', |
192 'nsDownloadManagerUI.manifest', |
192 'nsDownloadManagerUI.manifest', |
193 ] |
193 ] |
194 |
194 |
195 FINAL_LIBRARY = 'xul' |
195 FINAL_LIBRARY = 'xul' |
2294 SOURCES += [ |
2294 SOURCES += [ |
2295 '!moc_nsNativeAppSupportQt.cpp', |
2295 '!moc_nsNativeAppSupportQt.cpp', |
2296 'nsNativeAppSupportQt.cpp', |
2296 'nsNativeAppSupportQt.cpp', |
2297 'nsQAppInstance.cpp', |
2297 'nsQAppInstance.cpp', |
2298 ] |
2298 ] |
2299 elif CONFIG['MOZ_ENABLE_GTK']: |
2299 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
2300 + EXPORTS += ['nsKDEUtils.h'] |
2300 + EXPORTS += ['nsKDEUtils.h'] |
2301 UNIFIED_SOURCES += [ |
2301 UNIFIED_SOURCES += [ |
2302 + 'nsKDEUtils.cpp', |
2302 + 'nsKDEUtils.cpp', |
2303 'nsNativeAppSupportUnix.cpp', |
2303 'nsNativeAppSupportUnix.cpp', |
2304 ] |
2304 ] |
2713 # These files can't be built in unified mode because they redefine LOG. |
2713 # These files can't be built in unified mode because they redefine LOG. |
2714 SOURCES += [ |
2714 SOURCES += [ |
2715 osdir + '/nsOSHelperAppService.cpp', |
2715 osdir + '/nsOSHelperAppService.cpp', |
2716 ] |
2716 ] |
2717 |
2717 |
2718 if CONFIG['MOZ_ENABLE_GTK']: |
2718 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
2719 UNIFIED_SOURCES += [ |
2719 UNIFIED_SOURCES += [ |
2720 + 'unix/nsCommonRegistry.cpp', |
2720 + 'unix/nsCommonRegistry.cpp', |
2721 'unix/nsGNOMERegistry.cpp', |
2721 'unix/nsGNOMERegistry.cpp', |
2722 + 'unix/nsKDERegistry.cpp', |
2722 + 'unix/nsKDERegistry.cpp', |
2723 'unix/nsMIMEInfoUnix.cpp', |
2723 'unix/nsMIMEInfoUnix.cpp', |
2724 ] |
2724 ] |
2725 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': |
2725 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': |
2726 UNIFIED_SOURCES += [ |
2726 UNIFIED_SOURCES += [ |
2727 'android/nsAndroidHandlerApp.cpp', |
2727 'android/nsAndroidHandlerApp.cpp', |
3162 return gnomeInfo.forget(); |
3162 return gnomeInfo.forget(); |
3163 } |
3163 } |
3164 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
3164 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
3165 --- a/widget/gtk/moz.build |
3165 --- a/widget/gtk/moz.build |
3166 +++ b/widget/gtk/moz.build |
3166 +++ b/widget/gtk/moz.build |
3167 @@ -86,16 +86,17 @@ else: |
3167 @@ -90,16 +90,17 @@ else: |
3168 include('/ipc/chromium/chromium-config.mozbuild') |
3168 include('/ipc/chromium/chromium-config.mozbuild') |
3169 |
3169 |
3170 FINAL_LIBRARY = 'xul' |
3170 FINAL_LIBRARY = 'xul' |
3171 |
3171 |
3172 LOCAL_INCLUDES += [ |
3172 LOCAL_INCLUDES += [ |
3682 '/chrome', |
3682 '/chrome', |
3683 '/modules/libjar', |
3683 '/modules/libjar', |
3684 + '/toolkit/xre' |
3684 + '/toolkit/xre' |
3685 ] |
3685 ] |
3686 |
3686 |
3687 if CONFIG['MOZ_WIDGET_GTK']: |
3687 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
3688 CXXFLAGS += CONFIG['TK_CFLAGS'] |
3688 CXXFLAGS += CONFIG['TK_CFLAGS'] |
3689 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3689 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
3690 --- a/xpcom/io/nsLocalFileUnix.cpp |
3690 --- a/xpcom/io/nsLocalFileUnix.cpp |
3691 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3691 +++ b/xpcom/io/nsLocalFileUnix.cpp |
3692 @@ -44,16 +44,17 @@ |
3692 @@ -44,16 +44,17 @@ |