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 9eb4df0e07175ce38fc6699b2b8544b9eda7f0ad |
6 # Parent d065e5213c971b1f80d4a13458c412a3a25f7c1c |
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 @@ -4634,16 +4635,27 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4635,16 +4636,27 @@ nsresult Preferences::InitInitialObjects |
35 "unix.js" |
35 "unix.js" |
36 # if defined(_AIX) |
36 # if defined(_AIX) |
37 , |
37 , |
38 "aix.js" |
38 "aix.js" |
39 # endif |
39 # endif |
57 NS_WARNING("Error parsing application default preferences."); |
57 NS_WARNING("Error parsing application default preferences."); |
58 } |
58 } |
59 |
59 |
60 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
60 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
61 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
61 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
62 @@ -4708,17 +4720,17 @@ nsresult Preferences::InitInitialObjects |
62 @@ -4709,17 +4721,17 @@ nsresult Preferences::InitInitialObjects |
63 } |
63 } |
64 |
64 |
65 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
65 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
66 if (!path) { |
66 if (!path) { |
67 continue; |
67 continue; |
344 return result.forget().downcast<nsISupports>(); |
344 return result.forget().downcast<nsISupports>(); |
345 } |
345 } |
346 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
346 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
347 --- a/toolkit/xre/moz.build |
347 --- a/toolkit/xre/moz.build |
348 +++ b/toolkit/xre/moz.build |
348 +++ b/toolkit/xre/moz.build |
349 @@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co |
349 @@ -92,17 +92,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co |
350 "../components/printingui", |
350 "../components/printingui", |
351 ] |
351 ] |
352 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit": |
352 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit": |
353 UNIFIED_SOURCES += [ |
353 UNIFIED_SOURCES += [ |
354 "nsNativeAppSupportDefault.cpp", |
354 "nsNativeAppSupportDefault.cpp", |
358 + EXPORTS += ['nsKDEUtils.h'] |
358 + EXPORTS += ['nsKDEUtils.h'] |
359 UNIFIED_SOURCES += [ |
359 UNIFIED_SOURCES += [ |
360 + "nsKDEUtils.cpp", |
360 + "nsKDEUtils.cpp", |
361 "nsNativeAppSupportUnix.cpp", |
361 "nsNativeAppSupportUnix.cpp", |
362 ] |
362 ] |
|
363 CXXFLAGS += CONFIG["MOZ_X11_SM_CFLAGS"] |
363 else: |
364 else: |
364 UNIFIED_SOURCES += [ |
365 UNIFIED_SOURCES += [ |
365 "nsNativeAppSupportDefault.cpp", |
366 "nsNativeAppSupportDefault.cpp", |
366 ] |
367 ] |
367 |
368 |
368 if CONFIG["MOZ_HAS_REMOTE"]: |
|
369 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
369 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
370 new file mode 100644 |
370 new file mode 100644 |
371 --- /dev/null |
371 --- /dev/null |
372 +++ b/toolkit/xre/nsKDEUtils.cpp |
372 +++ b/toolkit/xre/nsKDEUtils.cpp |
373 @@ -0,0 +1,321 @@ |
373 @@ -0,0 +1,321 @@ |