1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1559294891 -7200 |
3 # Date 1559294891 -7200 |
4 # Fri May 31 11:28:11 2019 +0200 |
4 # Fri May 31 11:28:11 2019 +0200 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
6 # Parent d942febc5733911d795d1cec027fb4f3c0a6e53b |
6 # Parent fbac8545cf6f461803505c2d1f57531798dee96a |
7 Description: Add KDE integration to Firefox (toolkit parts) |
7 Description: Add KDE integration to Firefox (toolkit parts) |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
9 Author: Lubos Lunak <lunak@suse.com> |
9 Author: Lubos Lunak <lunak@suse.com> |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
12 |
12 |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
16 @@ -84,16 +84,17 @@ |
16 @@ -83,16 +83,17 @@ |
17 #include "nsXPCOM.h" |
17 #include "nsXPCOM.h" |
18 #include "nsXULAppAPI.h" |
18 #include "nsXULAppAPI.h" |
19 #include "nsZipArchive.h" |
19 #include "nsZipArchive.h" |
20 #include "plbase64.h" |
20 #include "plbase64.h" |
21 #include "PLDHashTable.h" |
21 #include "PLDHashTable.h" |
29 #endif |
29 #endif |
30 |
30 |
31 #ifdef MOZ_MEMORY |
31 #ifdef MOZ_MEMORY |
32 # include "mozmemory.h" |
32 # include "mozmemory.h" |
33 #endif |
33 #endif |
34 @@ -4539,25 +4540,37 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4535,25 +4536,37 @@ nsresult Preferences::InitInitialObjects |
35 // application pref files for backwards compatibility. |
35 // application pref files for backwards compatibility. |
36 static const char* specialFiles[] = { |
36 static const char* specialFiles[] = { |
37 #if defined(XP_MACOSX) |
37 #if defined(XP_MACOSX) |
38 "macprefs.js" |
38 "macprefs.js" |
39 #elif defined(XP_WIN) |
39 #elif defined(XP_WIN) |
67 NS_WARNING("Error parsing application default preferences."); |
67 NS_WARNING("Error parsing application default preferences."); |
68 } |
68 } |
69 |
69 |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
72 @@ -4603,17 +4616,17 @@ nsresult Preferences::InitInitialObjects |
72 @@ -4599,17 +4612,17 @@ nsresult Preferences::InitInitialObjects |
73 } |
73 } |
74 |
74 |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
76 if (!path) { |
76 if (!path) { |
77 continue; |
77 continue; |
798 using mozilla::dom::HandlerApp; |
798 using mozilla::dom::HandlerApp; |
799 using mozilla::dom::HandlerInfo; |
799 using mozilla::dom::HandlerInfo; |
800 using mozilla::dom::RemoteHandlerApp; |
800 using mozilla::dom::RemoteHandlerApp; |
801 |
801 |
802 namespace { |
802 namespace { |
803 @@ -288,17 +288,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
803 @@ -294,17 +294,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
804 mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS( |
804 mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS( |
805 const nsCString& aProtocolScheme, bool* aHandlerExists) { |
805 const nsCString& aProtocolScheme, bool* aHandlerExists) { |
806 if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { |
806 if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { |
807 *aHandlerExists = false; |
807 *aHandlerExists = false; |
808 return IPC_OK(); |
808 return IPC_OK(); |
817 return IPC_OK(); |
817 return IPC_OK(); |
818 } |
818 } |
819 |
819 |
820 /* |
820 /* |
821 * Check if a handler exists for the provided protocol. Check the datastore |
821 * Check if a handler exists for the provided protocol. Check the datastore |
822 @@ -317,17 +317,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
822 @@ -323,17 +323,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
823 nsCOMPtr<nsIExternalProtocolService> protoSvc = |
823 nsCOMPtr<nsIExternalProtocolService> protoSvc = |
824 do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv); |
824 do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv); |
825 if (NS_WARN_IF(NS_FAILED(rv))) { |
825 if (NS_WARN_IF(NS_FAILED(rv))) { |
826 *aHandlerExists = false; |
826 *aHandlerExists = false; |
827 return IPC_OK(); |
827 return IPC_OK(); |
1293 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1293 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1294 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1294 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1295 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1295 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1296 --- a/widget/gtk/moz.build |
1296 --- a/widget/gtk/moz.build |
1297 +++ b/widget/gtk/moz.build |
1297 +++ b/widget/gtk/moz.build |
1298 @@ -128,16 +128,17 @@ include('/ipc/chromium/chromium-config.m |
1298 @@ -129,16 +129,17 @@ include('/ipc/chromium/chromium-config.m |
1299 |
1299 |
1300 FINAL_LIBRARY = 'xul' |
1300 FINAL_LIBRARY = 'xul' |
1301 |
1301 |
1302 LOCAL_INCLUDES += [ |
1302 LOCAL_INCLUDES += [ |
1303 '/layout/base', |
1303 '/layout/base', |
1402 + }, this); |
1402 + }, this); |
1403 + |
1403 + |
1404 + return NS_OK; |
1404 + return NS_OK; |
1405 + } |
1405 + } |
1406 + |
1406 + |
1407 nsCString title; |
1407 NS_ConvertUTF16toUTF8 title(mTitle); |
1408 title.Adopt(ToNewUTF8String(mTitle)); |
|
1409 |
1408 |
1410 GtkWindow* parent_widget = |
1409 GtkWindow* parent_widget = |
1411 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
1410 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
1412 |
1411 |
1413 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
1412 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
1414 |
1413 |
1415 @@ -572,16 +599,240 @@ void nsFilePicker::Done(void* file_choos |
1414 const gchar* accept_button; |
|
1415 @@ -571,16 +598,240 @@ void nsFilePicker::Done(void* file_choos |
1416 mCallback->Done(result); |
1416 mCallback->Done(result); |
1417 mCallback = nullptr; |
1417 mCallback = nullptr; |
1418 } else { |
1418 } else { |
1419 mResult = result; |
1419 mResult = result; |
1420 } |
1420 } |
1850 # include <Carbon/Carbon.h> |
1850 # include <Carbon/Carbon.h> |
1851 # include "CocoaFileUtils.h" |
1851 # include "CocoaFileUtils.h" |
1852 # include "prmem.h" |
1852 # include "prmem.h" |
1853 # include "plbase64.h" |
1853 # include "plbase64.h" |
1854 |
1854 |
1855 @@ -1904,62 +1905,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1855 @@ -1907,62 +1908,77 @@ nsLocalFile::SetPersistentDescriptor(con |
1856 |
1856 |
1857 NS_IMETHODIMP |
1857 NS_IMETHODIMP |
1858 nsLocalFile::Reveal() { |
1858 nsLocalFile::Reveal() { |
1859 if (!FilePreferences::IsAllowedPath(mPath)) { |
1859 if (!FilePreferences::IsAllowedPath(mPath)) { |
1860 return NS_ERROR_FILE_ACCESS_DENIED; |
1860 return NS_ERROR_FILE_ACCESS_DENIED; |