equal
deleted
inserted
replaced
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 04c2cbd396b26a8e08980304a436e5e12fb6a205 |
6 # Parent b517aa8dfa37d729db9590fe699caa38f899dfba |
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 |
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 @@ -4566,25 +4567,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 @@ -4630,17 +4643,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; |
300 |
300 |
301 NS_IMETHODIMP |
301 NS_IMETHODIMP |
302 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
302 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
303 // dbus prevents us from being threadsafe, but this routine should not block |
303 // dbus prevents us from being threadsafe, but this routine should not block |
304 // anyhow |
304 // anyhow |
305 @@ -380,21 +383,50 @@ nsresult nsUnixSystemProxySettings::GetP |
305 @@ -384,21 +387,50 @@ nsresult nsUnixSystemProxySettings::GetP |
306 return NS_OK; |
306 return NS_OK; |
307 } |
307 } |
308 |
308 |
309 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
309 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
310 const nsACString& aScheme, |
310 const nsACString& aScheme, |
972 +#endif |
972 +#endif |
973 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp |
973 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp |
974 new file mode 100644 |
974 new file mode 100644 |
975 --- /dev/null |
975 --- /dev/null |
976 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp |
976 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp |
977 @@ -0,0 +1,87 @@ |
977 @@ -0,0 +1,86 @@ |
978 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
978 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
979 +/* This Source Code Form is subject to the terms of the Mozilla Public |
979 +/* This Source Code Form is subject to the terms of the Mozilla Public |
980 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
980 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
981 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
981 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
982 + |
982 + |
983 +#include "nsKDERegistry.h" |
983 +#include "nsKDERegistry.h" |
984 +#include "prlink.h" |
984 +#include "prlink.h" |
985 +#include "prmem.h" |
985 +#include "prmem.h" |
986 +#include "nsString.h" |
986 +#include "nsString.h" |
987 +#include "nsMIMEInfoUnix.h" |
987 +#include "nsMIMEInfoUnix.h" |
988 +#include "nsAutoPtr.h" |
|
989 +#include "nsKDEUtils.h" |
988 +#include "nsKDEUtils.h" |
990 + |
989 + |
991 +/* static */ bool |
990 +/* static */ bool |
992 +nsKDERegistry::HandlerExists(const char *aProtocolScheme) |
991 +nsKDERegistry::HandlerExists(const char *aProtocolScheme) |
993 +{ |
992 +{ |
1349 #define MAX_PREVIEW_SIZE 180 |
1348 #define MAX_PREVIEW_SIZE 180 |
1350 // bug 1184009 |
1349 // bug 1184009 |
1351 #define MAX_PREVIEW_SOURCE_SIZE 4096 |
1350 #define MAX_PREVIEW_SOURCE_SIZE 4096 |
1352 |
1351 |
1353 nsIFile* nsFilePicker::mPrevDisplayDirectory = nullptr; |
1352 nsIFile* nsFilePicker::mPrevDisplayDirectory = nullptr; |
1354 @@ -227,17 +230,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
1353 @@ -223,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
1355 mAllowURLs = !!(aFilterMask & filterAllowURLs); |
1354 mAllowURLs = !!(aFilterMask & filterAllowURLs); |
1356 return nsBaseFilePicker::AppendFilters(aFilterMask); |
1355 return nsBaseFilePicker::AppendFilters(aFilterMask); |
1357 } |
1356 } |
1358 |
1357 |
1359 NS_IMETHODIMP |
1358 NS_IMETHODIMP |
1370 CopyUTF16toUTF8(aFilter, filter); |
1369 CopyUTF16toUTF8(aFilter, filter); |
1371 CopyUTF16toUTF8(aTitle, name); |
1370 CopyUTF16toUTF8(aTitle, name); |
1372 |
1371 |
1373 mFilters.AppendElement(filter); |
1372 mFilters.AppendElement(filter); |
1374 mFilterNames.AppendElement(name); |
1373 mFilterNames.AppendElement(name); |
1375 @@ -337,16 +342,39 @@ nsresult nsFilePicker::Show(int16_t* aRe |
1374 @@ -333,16 +338,39 @@ nsresult nsFilePicker::Show(int16_t* aRe |
1376 return NS_OK; |
1375 return NS_OK; |
1377 } |
1376 } |
1378 |
1377 |
1379 NS_IMETHODIMP |
1378 NS_IMETHODIMP |
1380 nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) { |
1379 nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) { |
1410 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
1409 GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
1411 |
1410 |
1412 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
1411 GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
1413 |
1412 |
1414 const gchar* accept_button; |
1413 const gchar* accept_button; |
1415 @@ -571,16 +599,244 @@ void nsFilePicker::Done(void* file_choos |
1414 @@ -562,16 +590,244 @@ void nsFilePicker::Done(void* file_choos |
1416 mCallback->Done(result); |
1415 mCallback->Done(result); |
1417 mCallback = nullptr; |
1416 mCallback = nullptr; |
1418 } else { |
1417 } else { |
1419 mResult = result; |
1418 mResult = result; |
1420 } |
1419 } |
1829 + '/toolkit/xre', |
1828 + '/toolkit/xre', |
1830 ] |
1829 ] |
1831 |
1830 |
1832 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
1831 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
1833 CXXFLAGS += CONFIG['TK_CFLAGS'] |
1832 CXXFLAGS += CONFIG['TK_CFLAGS'] |
|
1833 if CONFIG['MOZ_ENABLE_DBUS']: |
|
1834 CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS'] |
1834 |
1835 |
1835 if CONFIG['MOZ_LAYOUT_DEBUGGER']: |
1836 if CONFIG['MOZ_LAYOUT_DEBUGGER']: |
1836 DEFINES['MOZ_LAYOUT_DEBUGGER'] = True |
|
1837 |
|
1838 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1837 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
1839 --- a/xpcom/io/nsLocalFileUnix.cpp |
1838 --- a/xpcom/io/nsLocalFileUnix.cpp |
1840 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1839 +++ b/xpcom/io/nsLocalFileUnix.cpp |
1841 @@ -46,16 +46,17 @@ |
1840 @@ -46,16 +46,17 @@ |
1842 #include "prproces.h" |
1841 #include "prproces.h" |