author | Wolfgang Rosenauer <wr@rosenauer.org> |
Wed, 15 May 2019 19:43:42 +0200 | |
branch | firefox67 |
changeset 1093 | 3942c205588b |
parent 1089 | eca1c1f2fe50 |
child 1097 | 840132a4a9b3 |
permissions | -rw-r--r-- |
828 | 1 |
# HG changeset patch |
1093 | 2 |
# Parent cafacdb0b7c50666e5dcc927684a23e8733206a5 |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
3 |
Description: Add KDE integration to Firefox (toolkit parts) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
4 |
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
5 |
Author: Lubos Lunak <lunak@suse.com> |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
6 |
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
7 |
https://bugzilla.novell.com/show_bug.cgi?id=170055 |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
8 |
|
779 | 9 |
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
10 |
--- a/modules/libpref/Preferences.cpp |
|
11 |
+++ b/modules/libpref/Preferences.cpp |
|
1082 | 12 |
@@ -81,16 +81,17 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
#include "nsXPCOMCID.h" |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
14 |
#include "nsXPCOM.h" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
15 |
#include "nsXULAppAPI.h" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
16 |
#include "nsZipArchive.h" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
17 |
#include "plbase64.h" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
18 |
#include "PLDHashTable.h" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
19 |
#include "plstr.h" |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
20 |
#include "prlink.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
23 |
#ifdef MOZ_MEMORY |
1089 | 24 |
# include "mozmemory.h" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
25 |
#endif |
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
26 |
|
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
27 |
#ifdef XP_WIN |
1089 | 28 |
# include "windows.h" |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
29 |
#endif |
1093 | 30 |
@@ -4493,25 +4494,37 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
31 |
// application pref files for backwards compatibility. |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
32 |
static const char* specialFiles[] = { |
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
284
diff
changeset
|
33 |
#if defined(XP_MACOSX) |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
34 |
"macprefs.js" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
35 |
#elif defined(XP_WIN) |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
36 |
"winpref.js" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
37 |
#elif defined(XP_UNIX) |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
38 |
"unix.js" |
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
39 |
+ , "" // placeholder for KDE (empty is otherwise harmless) |
1089 | 40 |
# if defined(_AIX) |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
41 |
, |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
42 |
"aix.js" |
1089 | 43 |
# endif |
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
284
diff
changeset
|
44 |
#elif defined(XP_BEOS) |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
45 |
"beos.js" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
#endif |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
47 |
}; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
|
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
49 |
+ if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
50 |
+ for(int i = 0; |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
51 |
+ i < MOZ_ARRAY_LENGTH(specialFiles); |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
52 |
+ ++i ) { |
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
53 |
+ if( *specialFiles[ i ] == '\0' ) { |
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
54 |
+ specialFiles[ i ] = "kde.js"; |
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
55 |
+ break; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
+ } |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
57 |
+ } |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
58 |
+ } |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
59 |
+ |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
60 |
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
61 |
ArrayLength(specialFiles)); |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
62 |
if (NS_FAILED(rv)) { |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
63 |
NS_WARNING("Error parsing application default preferences."); |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
64 |
} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
284
diff
changeset
|
66 |
// Load jar:$app/omni.jar!/defaults/preferences/*.js |
438
7d934b2f5014
rebased and removed upstreamed and obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
419
diff
changeset
|
67 |
// or jar:$gre/omni.jar!/defaults/preferences/*.js. |
1093 | 68 |
@@ -4559,17 +4572,17 @@ float MOZ_MAYBE_UNUSED GetPref<float>(co |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
69 |
} |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
70 |
|
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
71 |
nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
72 |
if (!path) { |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
73 |
continue; |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
74 |
} |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
75 |
|
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
76 |
// Do we care if a file provided by this process fails to load? |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
77 |
- pref_LoadPrefsInDir(path, nullptr, 0); |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
78 |
+ pref_LoadPrefsInDir(path, specialFiles, ArrayLength(specialFiles)); |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
79 |
} |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
80 |
} |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
81 |
|
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1050
diff
changeset
|
82 |
if (XRE_IsParentProcess()) { |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1050
diff
changeset
|
83 |
SetupTelemetryPref(); |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1050
diff
changeset
|
84 |
} |
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1050
diff
changeset
|
85 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
86 |
NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, nullptr, |
904 | 87 |
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
88 |
--- a/modules/libpref/moz.build |
|
89 |
+++ b/modules/libpref/moz.build |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
90 |
@@ -31,16 +31,20 @@ EXPORTS.mozilla += [ |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1050
diff
changeset
|
91 |
'StaticPrefs.h', |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
92 |
] |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
93 |
|
985 | 94 |
UNIFIED_SOURCES += [ |
95 |
'Preferences.cpp', |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
96 |
'SharedPrefMap.cpp', |
904 | 97 |
] |
98 |
||
99 |
+LOCAL_INCLUDES += [ |
|
1093 | 100 |
+ '/toolkit/xre' |
904 | 101 |
+] |
102 |
+ |
|
1093 | 103 |
XPCOM_MANIFESTS += [ |
104 |
'components.conf', |
|
105 |
] |
|
106 |
||
904 | 107 |
include('/ipc/chromium/chromium-config.mozbuild') |
108 |
||
109 |
FINAL_LIBRARY = 'xul' |
|
110 |
||
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
111 |
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
112 |
--- a/python/mozbuild/mozpack/chrome/flags.py |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
113 |
+++ b/python/mozbuild/mozpack/chrome/flags.py |
1093 | 114 |
@@ -223,16 +223,17 @@ class Flags(OrderedDict): |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
115 |
'contentaccessible': Flag, |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
116 |
'os': StringFlag, |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
117 |
'osversion': VersionFlag, |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
118 |
'abi': StringFlag, |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
119 |
'platform': Flag, |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
120 |
'xpcnativewrappers': Flag, |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
121 |
'tablet': Flag, |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
122 |
'process': StringFlag, |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
123 |
+ 'desktop': StringFlag, |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
124 |
} |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
125 |
RE = re.compile(r'([!<>=]+)') |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
126 |
|
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
127 |
def __init__(self, *flags): |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
128 |
''' |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
129 |
Initialize a set of flags given in string form. |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
130 |
flags = Flags('contentaccessible=yes', 'appversion>=3.5') |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
131 |
''' |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
132 |
diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
133 |
--- a/python/mozbuild/mozpack/chrome/manifest.py |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
134 |
+++ b/python/mozbuild/mozpack/chrome/manifest.py |
1067 | 135 |
@@ -39,16 +39,17 @@ class ManifestEntry(object): |
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
136 |
'platformversion', |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
137 |
'os', |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
138 |
'osversion', |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
139 |
'abi', |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
140 |
'xpcnativewrappers', |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
141 |
'tablet', |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
142 |
'process', |
1005 | 143 |
'contentaccessible', |
144 |
+ 'desktop', |
|
637
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
145 |
] |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
146 |
|
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
147 |
def __init__(self, base, *flags): |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
148 |
''' |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
149 |
Initialize a manifest entry with the given base path and flags. |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
150 |
''' |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
151 |
self.base = base |
73640b76d6c3
first building version of FF21
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
612
diff
changeset
|
152 |
self.flags = Flags(*flags) |
779 | 153 |
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
154 |
--- a/toolkit/components/downloads/moz.build |
|
155 |
+++ b/toolkit/components/downloads/moz.build |
|
1093 | 156 |
@@ -41,10 +41,14 @@ XPCOM_MANIFESTS += [ |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
157 |
|
1045 | 158 |
if CONFIG['MOZ_PLACES']: |
159 |
EXTRA_JS_MODULES += [ |
|
160 |
'DownloadHistory.jsm', |
|
161 |
] |
|
779 | 162 |
|
163 |
FINAL_LIBRARY = 'xul' |
|
251
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
244
diff
changeset
|
164 |
|
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
165 |
+LOCAL_INCLUDES += [ |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
166 |
+ '/toolkit/xre' |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
167 |
+] |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
168 |
+ |
1045 | 169 |
with Files('**'): |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
170 |
BUG_COMPONENT = ('Toolkit', 'Downloads API') |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
171 |
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
172 |
--- a/toolkit/content/jar.mn |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
173 |
+++ b/toolkit/content/jar.mn |
1093 | 174 |
@@ -63,16 +63,18 @@ toolkit.jar: |
175 |
content/global/widgets.css |
|
176 |
content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
|
1089 | 177 |
content/global/bindings/button.xml (widgets/button.xml) |
1082 | 178 |
content/global/bindings/calendar.js (widgets/calendar.js) |
961
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
179 |
content/global/bindings/datekeeper.js (widgets/datekeeper.js) |
4665fe34fbce
revert manually previously wrong rebases
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
960
diff
changeset
|
180 |
content/global/bindings/datepicker.js (widgets/datepicker.js) |
942
66115255ad6f
prepare FF51 (currently 51.0b5)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
935
diff
changeset
|
181 |
content/global/bindings/datetimebox.css (widgets/datetimebox.css) |
909 | 182 |
* content/global/bindings/dialog.xml (widgets/dialog.xml) |
183 |
+* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml) |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
184 |
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde |
515 | 185 |
content/global/bindings/general.xml (widgets/general.xml) |
186 |
content/global/bindings/menu.xml (widgets/menu.xml) |
|
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
187 |
content/global/bindings/popup.xml (widgets/popup.xml) |
1082 | 188 |
content/global/bindings/radio.xml (widgets/radio.xml) |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
189 |
content/global/bindings/richlistbox.xml (widgets/richlistbox.xml) |
1089 | 190 |
content/global/bindings/scrollbox.xml (widgets/scrollbox.xml) |
1093 | 191 |
content/global/bindings/spinner.js (widgets/spinner.js) |
192 |
content/global/bindings/tabbox.xml (widgets/tabbox.xml) |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
193 |
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
194 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
195 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
196 |
+++ b/toolkit/content/widgets/dialog-kde.xml |
1089 | 197 |
@@ -0,0 +1,507 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
198 |
+<?xml version="1.0"?> |
515 | 199 |
+<!-- This Source Code Form is subject to the terms of the Mozilla Public |
200 |
+ - License, v. 2.0. If a copy of the MPL was not distributed with this |
|
201 |
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
|
202 |
+ |
|
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
203 |
+<!DOCTYPE bindings [ |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
204 |
+ <!ENTITY % globalKeysDTD SYSTEM "chrome://global/locale/globalKeys.dtd"> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
205 |
+ %globalKeysDTD; |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
206 |
+]> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
207 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
208 |
+<bindings id="dialogBindings" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
209 |
+ xmlns="http://www.mozilla.org/xbl" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
210 |
+ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
211 |
+ xmlns:xbl="http://www.mozilla.org/xbl"> |
916 | 212 |
+ |
1045 | 213 |
+ <binding id="dialog"> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
214 |
+ <content> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
215 |
+ <xul:vbox class="box-inherit dialog-content-box" flex="1"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
216 |
+ <children/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
217 |
+ </xul:vbox> |
916 | 218 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
219 |
+ <xul:hbox class="dialog-button-box" anonid="buttons" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
220 |
+ xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient" |
918
0f93e8da34b6
boo#984403 - OK and cancel button reversed in FF47
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
916
diff
changeset
|
221 |
+#ifdef XP_UNIX_GNOME |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
222 |
+ > |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
223 |
+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
224 |
+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
225 |
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
226 |
+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
227 |
+ <xul:spacer anonid="spacer" flex="1"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
228 |
+ <xul:button dlgtype="cancel" class="dialog-button"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
229 |
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
230 |
+#elif XP_UNIX |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
231 |
+ > |
1089 | 232 |
+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> |
916 | 233 |
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> |
234 |
+ <xul:spacer anonid="spacer" flex="1"/> |
|
235 |
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> |
|
236 |
+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> |
|
237 |
+ <xul:button dlgtype="cancel" class="dialog-button"/> |
|
238 |
+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
239 |
+#else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
240 |
+ pack="end"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
241 |
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
242 |
+ <xul:spacer anonid="spacer" flex="1" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
243 |
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
244 |
+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
245 |
+ <xul:button dlgtype="cancel" class="dialog-button"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
246 |
+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
247 |
+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
248 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
249 |
+ </xul:hbox> |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
250 |
+ |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
251 |
+ <xul:keyset> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
252 |
+ <xul:key phase="capturing" oncommand="document.documentElement.openHelp(event)" |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
253 |
+#ifdef XP_MACOSX |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
254 |
+ key="&openHelpMac.commandkey;" modifiers="accel"/> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
255 |
+#else |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
256 |
+ keycode="&openHelp.commandkey;"/> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
257 |
+#endif |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
258 |
+ </xul:keyset> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
259 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
260 |
+ </content> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
261 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
262 |
+ <implementation> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
263 |
+ <field name="_mStrBundle">null</field> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
264 |
+ <field name="_closeHandler">(function(event) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
265 |
+ if (!document.documentElement.cancelDialog()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
266 |
+ event.preventDefault(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
267 |
+ })</field> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
268 |
+ |
1089 | 269 |
+ <!-- Gets populated by elements that are passed to document.l10n.setAttributes |
270 |
+ to localize the dialog buttons. Needed to properly size the dialog after |
|
271 |
+ the asynchronous translation. --> |
|
272 |
+ <field name="_l10nButtons">[]</field> |
|
273 |
+ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
274 |
+ <property name="buttons" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
275 |
+ onget="return this.getAttribute('buttons');" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
276 |
+ onset="this._configureButtons(val); return val;"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
277 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
278 |
+ <property name="defaultButton"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
279 |
+ <getter> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
280 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
281 |
+ if (this.hasAttribute("defaultButton")) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
282 |
+ return this.getAttribute("defaultButton"); |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
283 |
+ return "accept"; // default to the accept button |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
284 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
285 |
+ </getter> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
286 |
+ <setter> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
287 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
288 |
+ this._setDefaultButton(val); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
289 |
+ return val; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
290 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
291 |
+ </setter> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
292 |
+ </property> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
293 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
294 |
+ <method name="acceptDialog"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
295 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
296 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
297 |
+ return this._doButtonCommand("accept"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
298 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
299 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
300 |
+ </method> |
916 | 301 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
302 |
+ <method name="cancelDialog"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
303 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
304 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
305 |
+ return this._doButtonCommand("cancel"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
306 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
307 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
308 |
+ </method> |
916 | 309 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
310 |
+ <method name="getButton"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
311 |
+ <parameter name="aDlgType"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
312 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
313 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
314 |
+ return this._buttons[aDlgType]; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
315 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
316 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
317 |
+ </method> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
318 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
319 |
+ <method name="moveToAlertPosition"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
320 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
321 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
322 |
+ // hack. we need this so the window has something like its final size |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
323 |
+ if (window.outerWidth == 1) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
324 |
+ dump("Trying to position a sizeless window; caller should have called sizeToContent() or sizeTo(). See bug 75649.\n"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
325 |
+ sizeToContent(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
326 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
327 |
+ |
868 | 328 |
+ if (opener) { |
329 |
+ var xOffset = (opener.outerWidth - window.outerWidth) / 2; |
|
330 |
+ var yOffset = opener.outerHeight / 5; |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
331 |
+ |
868 | 332 |
+ var newX = opener.screenX + xOffset; |
333 |
+ var newY = opener.screenY + yOffset; |
|
334 |
+ } else { |
|
335 |
+ newX = (screen.availWidth - window.outerWidth) / 2; |
|
336 |
+ newY = (screen.availHeight - window.outerHeight) / 2; |
|
337 |
+ } |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
338 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
339 |
+ // ensure the window is fully onscreen (if smaller than the screen) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
340 |
+ if (newX < screen.availLeft) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
341 |
+ newX = screen.availLeft + 20; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
342 |
+ if ((newX + window.outerWidth) > (screen.availLeft + screen.availWidth)) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
343 |
+ newX = (screen.availLeft + screen.availWidth) - window.outerWidth - 20; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
344 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
345 |
+ if (newY < screen.availTop) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
346 |
+ newY = screen.availTop + 20; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
347 |
+ if ((newY + window.outerHeight) > (screen.availTop + screen.availHeight)) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
348 |
+ newY = (screen.availTop + screen.availHeight) - window.outerHeight - 60; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
349 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
350 |
+ window.moveTo( newX, newY ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
351 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
352 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
353 |
+ </method> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
354 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
355 |
+ <method name="centerWindowOnScreen"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
356 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
357 |
+ <![CDATA[ |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
358 |
+ var xOffset = screen.availWidth / 2 - window.outerWidth / 2; |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
359 |
+ var yOffset = screen.availHeight / 2 - window.outerHeight / 2; |
916 | 360 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
361 |
+ xOffset = xOffset > 0 ? xOffset : 0; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
362 |
+ yOffset = yOffset > 0 ? yOffset : 0; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
363 |
+ window.moveTo(xOffset, yOffset); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
364 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
365 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
366 |
+ </method> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
367 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
368 |
+ <constructor> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
369 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
370 |
+ this._configureButtons(this.buttons); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
371 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
372 |
+ // listen for when window is closed via native close buttons |
1089 | 373 |
+ window.addEventListener("close", this); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
374 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
375 |
+ // for things that we need to initialize after onload fires |
1089 | 376 |
+ window.addEventListener("load", this); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
377 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
378 |
+ window.moveToAlertPosition = this.moveToAlertPosition; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
379 |
+ window.centerWindowOnScreen = this.centerWindowOnScreen; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
380 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
381 |
+ </constructor> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
382 |
+ |
1089 | 383 |
+ <method name="handleEvent"> |
384 |
+ <parameter name="aEvent"/> |
|
385 |
+ <body><![CDATA[ |
|
386 |
+ switch (aEvent.type) { |
|
387 |
+ case "close": { |
|
388 |
+ this._closeHandler(aEvent); |
|
389 |
+ break; |
|
390 |
+ } |
|
391 |
+ case "load": { |
|
392 |
+ this.postLoadInit(aEvent); |
|
393 |
+ break; |
|
394 |
+ } |
|
395 |
+ } |
|
396 |
+ ]]></body> |
|
397 |
+ </method> |
|
398 |
+ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
399 |
+ <method name="postLoadInit"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
400 |
+ <parameter name="aEvent"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
401 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
402 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
403 |
+ function focusInit() { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
404 |
+ const dialog = document.documentElement; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
405 |
+ const defaultButton = dialog.getButton(dialog.defaultButton); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
406 |
+ // give focus to the first focusable element in the dialog |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
407 |
+ if (!document.commandDispatcher.focusedElement) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
408 |
+ document.commandDispatcher.advanceFocusIntoSubtree(dialog); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
409 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
410 |
+ var focusedElt = document.commandDispatcher.focusedElement; |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
411 |
+ if (focusedElt) { |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
412 |
+ var initialFocusedElt = focusedElt; |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
413 |
+ while (focusedElt.localName == "tab" || |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
414 |
+ focusedElt.getAttribute("noinitialfocus") == "true") { |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
415 |
+ document.commandDispatcher.advanceFocusIntoSubtree(focusedElt); |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
416 |
+ focusedElt = document.commandDispatcher.focusedElement; |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
417 |
+ if (focusedElt == initialFocusedElt) { |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
418 |
+ if (focusedElt.getAttribute("noinitialfocus") == "true") { |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
419 |
+ focusedElt.blur(); |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
420 |
+ } |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
421 |
+ break; |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
422 |
+ } |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
423 |
+ } |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
424 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
425 |
+ if (initialFocusedElt.localName == "tab") { |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
426 |
+ if (focusedElt.hasAttribute("dlgtype")) { |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
427 |
+ // We don't want to focus on anonymous OK, Cancel, etc. buttons, |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
428 |
+ // so return focus to the tab itself |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
429 |
+ initialFocusedElt.focus(); |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
430 |
+ } |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
431 |
+ } else if (!/Mac/.test(navigator.platform) && |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
432 |
+ focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) { |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
433 |
+ defaultButton.focus(); |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
434 |
+ } |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
435 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
436 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
437 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
438 |
+ try { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
439 |
+ if (defaultButton) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
440 |
+ window.notifyDefaultButtonLoaded(defaultButton); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
441 |
+ } catch (e) { } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
442 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
443 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
444 |
+ // Give focus after onload completes, see bug 103197. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
445 |
+ setTimeout(focusInit, 0); |
1089 | 446 |
+ |
447 |
+ if (this._l10nButtons.length) { |
|
448 |
+ document.l10n.translateElements(this._l10nButtons).then(() => { |
|
449 |
+ window.sizeToContent(); |
|
450 |
+ }); |
|
451 |
+ } |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
452 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
453 |
+ </body> |
916 | 454 |
+ </method> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
455 |
+ |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
456 |
+ <method name="openHelp"> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
457 |
+ <parameter name="event"/> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
458 |
+ <body> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
459 |
+ <![CDATA[ |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
460 |
+ var helpButton = document.documentElement.getButton("help"); |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
461 |
+ if (helpButton.disabled || helpButton.hidden) |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
462 |
+ return; |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
463 |
+ this._fireButtonEvent("help"); |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
464 |
+ event.stopPropagation(); |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
465 |
+ event.preventDefault(); |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
466 |
+ ]]> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
467 |
+ </body> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
468 |
+ </method> |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
469 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
470 |
+ <property name="mStrBundle"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
471 |
+ <getter> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
472 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
473 |
+ if (!this._mStrBundle) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
474 |
+ // need to create string bundle manually instead of using <xul:stringbundle/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
475 |
+ // see bug 63370 for details |
1045 | 476 |
+ this._mStrBundle = Cc["@mozilla.org/intl/stringbundle;1"] |
477 |
+ .getService(Ci.nsIStringBundleService) |
|
478 |
+ .createBundle("chrome://global/locale/dialog.properties"); |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
479 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
480 |
+ return this._mStrBundle; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
481 |
+ ]]></getter> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
482 |
+ </property> |
916 | 483 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
484 |
+ <method name="_configureButtons"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
485 |
+ <parameter name="aButtons"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
486 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
487 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
488 |
+ // by default, get all the anonymous button elements |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
489 |
+ var buttons = {}; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
490 |
+ this._buttons = buttons; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
491 |
+ buttons.accept = document.getAnonymousElementByAttribute(this, "dlgtype", "accept"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
492 |
+ buttons.cancel = document.getAnonymousElementByAttribute(this, "dlgtype", "cancel"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
493 |
+ buttons.extra1 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra1"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
494 |
+ buttons.extra2 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra2"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
495 |
+ buttons.help = document.getAnonymousElementByAttribute(this, "dlgtype", "help"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
496 |
+ buttons.disclosure = document.getAnonymousElementByAttribute(this, "dlgtype", "disclosure"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
497 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
498 |
+ // look for any overriding explicit button elements |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
499 |
+ var exBtns = this.getElementsByAttribute("dlgtype", "*"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
500 |
+ var dlgtype; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
501 |
+ var i; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
502 |
+ for (i = 0; i < exBtns.length; ++i) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
503 |
+ dlgtype = exBtns[i].getAttribute("dlgtype"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
504 |
+ buttons[dlgtype].hidden = true; // hide the anonymous button |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
505 |
+ buttons[dlgtype] = exBtns[i]; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
506 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
507 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
508 |
+ // add the label and oncommand handler to each button |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
509 |
+ for (dlgtype in buttons) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
510 |
+ var button = buttons[dlgtype]; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
511 |
+ button.addEventListener("command", this._handleButtonCommand, true); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
512 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
513 |
+ // don't override custom labels with pre-defined labels on explicit buttons |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
514 |
+ if (!button.hasAttribute("label")) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
515 |
+ // dialog attributes override the default labels in dialog.properties |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
516 |
+ if (this.hasAttribute("buttonlabel" + dlgtype)) { |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
517 |
+ button.setAttribute("label", this.getAttribute("buttonlabel" + dlgtype)); |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
518 |
+ if (this.hasAttribute("buttonaccesskey" + dlgtype)) |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
519 |
+ button.setAttribute("accesskey", this.getAttribute("buttonaccesskey" + dlgtype)); |
1089 | 520 |
+ } else if (this.hasAttribute("buttonid" + dlgtype)) { |
521 |
+ document.l10n.setAttributes(button, this.getAttribute("buttonid" + dlgtype)); |
|
522 |
+ this._l10nButtons.push(button); |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
523 |
+ } else if (dlgtype != "extra1" && dlgtype != "extra2") { |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
524 |
+ button.setAttribute("label", this.mStrBundle.GetStringFromName("button-" + dlgtype)); |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
525 |
+ var accessKey = this.mStrBundle.GetStringFromName("accesskey-" + dlgtype); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
526 |
+ if (accessKey) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
527 |
+ button.setAttribute("accesskey", accessKey); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
528 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
529 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
530 |
+ // allow specifying alternate icons in the dialog header |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
531 |
+ if (!button.hasAttribute("icon")) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
532 |
+ // if there's an icon specified, use that |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
533 |
+ if (this.hasAttribute("buttonicon" + dlgtype)) |
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
534 |
+ button.setAttribute("icon", this.getAttribute("buttonicon" + dlgtype)); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
535 |
+ // otherwise set defaults |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
536 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
537 |
+ switch (dlgtype) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
538 |
+ case "accept": |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
539 |
+ button.setAttribute("icon", "accept"); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
540 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
541 |
+ case "cancel": |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
542 |
+ button.setAttribute("icon", "cancel"); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
543 |
+ break; |
194 | 544 |
+ case "disclosure": |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
545 |
+ button.setAttribute("icon", "properties"); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
546 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
547 |
+ case "help": |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
548 |
+ button.setAttribute("icon", "help"); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
549 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
550 |
+ default: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
551 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
552 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
553 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
554 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
555 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
556 |
+ // ensure that hitting enter triggers the default button command |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
557 |
+ this.defaultButton = this.defaultButton; |
916 | 558 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
559 |
+ // if there is a special button configuration, use it |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
560 |
+ if (aButtons) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
561 |
+ // expect a comma delimited list of dlgtype values |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
562 |
+ var list = aButtons.split(","); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
563 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
564 |
+ // mark shown dlgtypes as true |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
565 |
+ var shown = { accept: false, cancel: false, help: false, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
566 |
+ disclosure: false, extra1: false, extra2: false }; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
567 |
+ for (i = 0; i < list.length; ++i) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
568 |
+ shown[list[i].replace(/ /g, "")] = true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
569 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
570 |
+ // hide/show the buttons we want |
916 | 571 |
+ for (dlgtype in buttons) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
572 |
+ buttons[dlgtype].hidden = !shown[dlgtype]; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
573 |
+ |
909 | 574 |
+ // show the spacer on Windows only when the extra2 button is present |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
575 |
+ if (/Win/.test(navigator.platform)) { |
909 | 576 |
+ var spacer = document.getAnonymousElementByAttribute(this, "anonid", "spacer"); |
577 |
+ spacer.removeAttribute("hidden"); |
|
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
578 |
+ spacer.setAttribute("flex", shown.extra2 ? "1" : "0"); |
909 | 579 |
+ } |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
580 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
581 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
582 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
583 |
+ </method> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
584 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
585 |
+ <method name="_setDefaultButton"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
586 |
+ <parameter name="aNewDefault"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
587 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
588 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
589 |
+ // remove the default attribute from the previous default button, if any |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
590 |
+ var oldDefaultButton = this.getButton(this.defaultButton); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
591 |
+ if (oldDefaultButton) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
592 |
+ oldDefaultButton.removeAttribute("default"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
593 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
594 |
+ var newDefaultButton = this.getButton(aNewDefault); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
595 |
+ if (newDefaultButton) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
596 |
+ this.setAttribute("defaultButton", aNewDefault); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
597 |
+ newDefaultButton.setAttribute("default", "true"); |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
598 |
+ } else { |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
599 |
+ this.setAttribute("defaultButton", "none"); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
600 |
+ if (aNewDefault != "none") |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
601 |
+ dump("invalid new default button: " + aNewDefault + ", assuming: none\n"); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
602 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
603 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
604 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
605 |
+ </method> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
606 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
607 |
+ <method name="_handleButtonCommand"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
608 |
+ <parameter name="aEvent"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
609 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
610 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
611 |
+ return document.documentElement._doButtonCommand( |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
612 |
+ aEvent.target.getAttribute("dlgtype")); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
613 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
614 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
615 |
+ </method> |
916 | 616 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
617 |
+ <method name="_doButtonCommand"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
618 |
+ <parameter name="aDlgType"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
619 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
620 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
621 |
+ var button = this.getButton(aDlgType); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
622 |
+ if (!button.disabled) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
623 |
+ var noCancel = this._fireButtonEvent(aDlgType); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
624 |
+ if (noCancel) { |
766 | 625 |
+ if (aDlgType == "accept" || aDlgType == "cancel") { |
626 |
+ var closingEvent = new CustomEvent("dialogclosing", { |
|
627 |
+ bubbles: true, |
|
628 |
+ detail: { button: aDlgType }, |
|
629 |
+ }); |
|
630 |
+ this.dispatchEvent(closingEvent); |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
631 |
+ window.close(); |
766 | 632 |
+ } |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
633 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
634 |
+ return noCancel; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
635 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
636 |
+ return true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
637 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
638 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
639 |
+ </method> |
916 | 640 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
641 |
+ <method name="_fireButtonEvent"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
642 |
+ <parameter name="aDlgType"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
643 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
644 |
+ <![CDATA[ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
645 |
+ var event = document.createEvent("Events"); |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
646 |
+ event.initEvent("dialog" + aDlgType, true, true); |
916 | 647 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
648 |
+ // handle dom event handlers |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
649 |
+ var noCancel = this.dispatchEvent(event); |
916 | 650 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
651 |
+ // handle any xml attribute event handlers |
955
55662cbdb950
update KDE variants for UI
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
952
diff
changeset
|
652 |
+ var handler = this.getAttribute("ondialog" + aDlgType); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
653 |
+ if (handler != "") { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
654 |
+ var fn = new Function("event", handler); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
655 |
+ var returned = fn(event); |
1045 | 656 |
+ // eslint-disable-next-line mozilla/no-compare-against-boolean-literals |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
657 |
+ if (returned == false) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
658 |
+ noCancel = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
659 |
+ } |
916 | 660 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
661 |
+ return noCancel; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
662 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
663 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
664 |
+ </method> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
665 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
666 |
+ <method name="_hitEnter"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
667 |
+ <parameter name="evt"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
668 |
+ <body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
669 |
+ <![CDATA[ |
400 | 670 |
+ if (evt.defaultPrevented) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
671 |
+ return; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
672 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
673 |
+ var btn = this.getButton(this.defaultButton); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
674 |
+ if (btn) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
675 |
+ this._doButtonCommand(this.defaultButton); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
676 |
+ ]]> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
677 |
+ </body> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
678 |
+ </method> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
679 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
680 |
+ </implementation> |
916 | 681 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
682 |
+ <handlers> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
683 |
+ <handler event="keypress" keycode="VK_RETURN" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
684 |
+ group="system" action="this._hitEnter(event);"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
685 |
+ <handler event="keypress" keycode="VK_ESCAPE" group="system"> |
400 | 686 |
+ if (!event.defaultPrevented) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
687 |
+ this.cancelDialog(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
688 |
+ </handler> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
689 |
+#ifdef XP_MACOSX |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
690 |
+ <handler event="keypress" key="." modifiers="meta" phase="capturing" action="this.cancelDialog();"/> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
691 |
+#else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
692 |
+ <handler event="focus" phase="capturing"> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
693 |
+ var btn = this.getButton(this.defaultButton); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
694 |
+ if (btn) |
1089 | 695 |
+ btn.setAttribute("default", event.originalTarget == btn || |
696 |
+ !(event.originalTarget.localName == "button" || |
|
697 |
+ event.originalTarget.localName == "toolbarbutton")); |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
698 |
+ </handler> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
699 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
700 |
+ </handlers> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
701 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
702 |
+ </binding> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
703 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
704 |
+</bindings> |
1093 | 705 |
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
706 |
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
|
707 |
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
|
708 |
@@ -1030,30 +1030,60 @@ nsUnknownContentTypeDialog.prototype = { |
|
994 | 709 |
|
710 |
if (params.handlerApp && |
|
944 | 711 |
params.handlerApp.executable && |
712 |
params.handlerApp.executable.isFile()) { |
|
713 |
// Remember the file they chose to run. |
|
714 |
this.chosenApp = params.handlerApp; |
|
715 |
} |
|
1045 | 716 |
} else if ("@mozilla.org/applicationchooser;1" in Cc) { |
717 |
- var nsIApplicationChooser = Ci.nsIApplicationChooser; |
|
718 |
- var appChooser = Cc["@mozilla.org/applicationchooser;1"] |
|
719 |
- .createInstance(nsIApplicationChooser); |
|
944 | 720 |
- appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle")); |
721 |
- var contentTypeDialogObj = this; |
|
722 |
- let appChooserCallback = function appChooserCallback_done(aResult) { |
|
723 |
- if (aResult) { |
|
1045 | 724 |
- contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp); |
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
725 |
- } |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
726 |
- contentTypeDialogObj.finishChooseApp(); |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
727 |
- }; |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
728 |
- appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback); |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
729 |
- // The finishChooseApp is called from appChooserCallback |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
730 |
- return; |
944 | 731 |
+ // handle the KDE case which is implemented in the filepicker |
732 |
+ // therefore falling back to Gtk2 like behaviour if KDE is running |
|
994 | 733 |
+ // FIXME this should be better handled in the nsIApplicationChooser |
734 |
+ // interface |
|
944 | 735 |
+ var env = Components.classes["@mozilla.org/process/environment;1"] |
736 |
+ .getService(Components.interfaces.nsIEnvironment); |
|
737 |
+ if (env.get('KDE_FULL_SESSION') == "true") |
|
738 |
+ { |
|
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
739 |
+ var nsIFilePicker = Ci.nsIFilePicker; |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
740 |
+ var fp = Cc["@mozilla.org/filepicker;1"] |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
741 |
+ .createInstance(nsIFilePicker); |
944 | 742 |
+ fp.init(this.mDialog, |
743 |
+ this.dialogElement("strings").getString("chooseAppFilePickerTitle"), |
|
744 |
+ nsIFilePicker.modeOpen); |
|
745 |
+ |
|
746 |
+ fp.appendFilters(nsIFilePicker.filterApps); |
|
747 |
+ |
|
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
748 |
+ fp.open(aResult => { |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
749 |
+ if (aResult == nsIFilePicker.returnOK && fp.file) { |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
750 |
+ // Remember the file they chose to run. |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
751 |
+ var localHandlerApp = |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
752 |
+ Cc["@mozilla.org/uriloader/local-handler-app;1"]. |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
753 |
+ createInstance(Ci.nsILocalHandlerApp); |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
754 |
+ localHandlerApp.executable = fp.file; |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
755 |
+ this.chosenApp = localHandlerApp; |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
756 |
+ } |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
757 |
+ this.finishChooseApp(); |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
758 |
+ }); |
944 | 759 |
+ } else { |
1045 | 760 |
+ var nsIApplicationChooser = Ci.nsIApplicationChooser; |
761 |
+ var appChooser = Cc["@mozilla.org/applicationchooser;1"] |
|
762 |
+ .createInstance(nsIApplicationChooser); |
|
944 | 763 |
+ appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle")); |
764 |
+ var contentTypeDialogObj = this; |
|
765 |
+ let appChooserCallback = function appChooserCallback_done(aResult) { |
|
766 |
+ if (aResult) { |
|
1045 | 767 |
+ contentTypeDialogObj.chosenApp = aResult.QueryInterface(Ci.nsILocalHandlerApp); |
944 | 768 |
+ } |
769 |
+ contentTypeDialogObj.finishChooseApp(); |
|
770 |
+ }; |
|
771 |
+ appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback); |
|
772 |
+ // The finishChooseApp is called from appChooserCallback |
|
773 |
+ return; |
|
774 |
+ } |
|
994 | 775 |
} else { |
1045 | 776 |
var nsIFilePicker = Ci.nsIFilePicker; |
777 |
var fp = Cc["@mozilla.org/filepicker;1"] |
|
778 |
.createInstance(nsIFilePicker); |
|
944 | 779 |
fp.init(this.mDialog, |
780 |
this.dialogElement("strings").getString("chooseAppFilePickerTitle"), |
|
781 |
nsIFilePicker.modeOpen); |
|
782 |
||
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
783 |
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
784 |
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
785 |
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
885 | 786 |
@@ -15,16 +15,17 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
787 |
#include "nsPrintfCString.h" |
885 | 788 |
#include "nsNetCID.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
789 |
#include "nsNetUtil.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
790 |
#include "nsISupportsPrimitives.h" |
399
20f8b5f0aea6
port KDE patches to Gecko 11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
398
diff
changeset
|
791 |
#include "nsIGSettingsService.h" |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
792 |
#include "nsInterfaceHashtable.h" |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
793 |
#include "mozilla/Attributes.h" |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
794 |
#include "nsIURI.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
795 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
796 |
|
1093 | 797 |
using namespace mozilla; |
798 |
||
850 | 799 |
class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
800 |
public: |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
801 |
NS_DECL_ISUPPORTS |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
802 |
NS_DECL_NSISYSTEMPROXYSETTINGS |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
803 |
|
1093 | 804 |
@@ -44,16 +45,18 @@ class nsUnixSystemProxySettings final : |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
805 |
nsACString& aResult); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
806 |
nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
807 |
int32_t aPort, nsACString& aResult); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
808 |
nsresult GetProxyFromGSettings(const nsACString& aScheme, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
809 |
const nsACString& aHost, int32_t aPort, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
810 |
nsACString& aResult); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
811 |
nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
812 |
nsACString& aResult); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
813 |
+ nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
814 |
+ PRInt32 aPort, nsACString& aResult); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
815 |
}; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
816 |
|
738 | 817 |
NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
818 |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
819 |
NS_IMETHODIMP |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
820 |
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
821 |
// dbus prevents us from being threadsafe, but this routine should not block |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
822 |
// anyhow |
1093 | 823 |
@@ -487,22 +490,51 @@ nsresult nsUnixSystemProxySettings::GetP |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
824 |
return NS_OK; |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
825 |
} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
826 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
827 |
nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
828 |
const nsACString& aScheme, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
829 |
const nsACString& aHost, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
830 |
const int32_t aPort, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
831 |
nsACString& aResult) { |
596 | 832 |
+ if (nsKDEUtils::kdeSupport()) |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
833 |
+ return GetProxyFromKDE(aScheme, aHost, aPort, aResult); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
834 |
+ |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
835 |
if (mProxySettings) { |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
836 |
nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult); |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
837 |
if (NS_SUCCEEDED(rv)) return rv; |
399
20f8b5f0aea6
port KDE patches to Gecko 11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
398
diff
changeset
|
838 |
} |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
839 |
if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
840 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
841 |
return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
842 |
} |
284
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
843 |
|
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
844 |
+nsresult |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
845 |
+nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme, |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
846 |
+ const nsACString& aHost, |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
847 |
+ PRInt32 aPort, |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
848 |
+ nsACString& aResult) |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
849 |
+{ |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
850 |
+ nsAutoCString url; |
284
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
851 |
+ url = aScheme; |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
852 |
+ url += "://"; |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
853 |
+ url += aHost; |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
854 |
+ if( aPort >= 0 ) |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
855 |
+ { |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
856 |
+ url += ":"; |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
857 |
+ url += nsPrintfCString("%d", aPort); |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
858 |
+ } |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
859 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
860 |
+ command.AppendElement( NS_LITERAL_CSTRING( "GETPROXY" )); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
861 |
+ command.AppendElement( url ); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
862 |
+ nsTArray<nsCString> result; |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
863 |
+ if( !nsKDEUtils::command( command, &result ) || result.Length() != 1 ) |
284
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
864 |
+ return NS_ERROR_FAILURE; |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
865 |
+ aResult = result[0]; |
284
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
866 |
+ return NS_OK; |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
867 |
+} |
ccddc8555cdb
readd lost method for non libproxy builds
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
260
diff
changeset
|
868 |
+ |
1093 | 869 |
+ |
870 |
NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) { |
|
871 |
auto result = MakeRefPtr<nsUnixSystemProxySettings>(); |
|
872 |
result->Init(); |
|
873 |
return result.forget().downcast<nsISupports>(); |
|
874 |
} |
|
659 | 875 |
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
876 |
--- a/toolkit/xre/moz.build |
|
877 |
+++ b/toolkit/xre/moz.build |
|
1093 | 878 |
@@ -83,17 +83,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
879 |
'../components/printingui', |
932 | 880 |
] |
881 |
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
|
882 |
UNIFIED_SOURCES += [ |
|
883 |
'nsNativeAppSupportDefault.cpp', |
|
884 |
'UIKitDirProvider.mm', |
|
659 | 885 |
] |
923 | 886 |
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
659 | 887 |
+ EXPORTS += ['nsKDEUtils.h'] |
703 | 888 |
UNIFIED_SOURCES += [ |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
889 |
+ 'nsKDEUtils.cpp', |
703 | 890 |
'nsNativeAppSupportUnix.cpp', |
659 | 891 |
] |
892 |
else: |
|
703 | 893 |
UNIFIED_SOURCES += [ |
659 | 894 |
'nsNativeAppSupportDefault.cpp', |
895 |
] |
|
896 |
||
1093 | 897 |
if CONFIG['MOZ_HAS_REMOTE']: |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
898 |
diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
899 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
900 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
901 |
+++ b/toolkit/xre/nsKDEUtils.cpp |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
902 |
@@ -0,0 +1,344 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
903 |
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ |
546 | 904 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
905 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
906 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
907 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
908 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
909 |
+#include "nsIWidget.h" |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
910 |
+#include "nsISupportsPrimitives.h" |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
911 |
+#include "nsIMutableArray.h" |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
912 |
+#include "nsComponentManagerUtils.h" |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
913 |
+#include "nsArrayUtils.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
914 |
+ |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
915 |
+#include <gtk/gtk.h> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
916 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
917 |
+#include <limits.h> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
918 |
+#include <stdio.h> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
919 |
+#include <sys/wait.h> |
517
fa93154734b8
Fix mozilla-kde.patch to include sys/resource.h for getrlimit etc (glibc 2.16)
Andreas Jaeger <aj@suse.de>
parents:
515
diff
changeset
|
920 |
+#include <sys/resource.h> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
921 |
+#include <unistd.h> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
922 |
+#include <X11/Xlib.h> |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
923 |
+// copied from X11/X.h as a hack since for an unknown |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
924 |
+// reason it's not picked up from X11/X.h |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
925 |
+#ifndef None |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
926 |
+#define None 0L /* universal null resource or null atom */ |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
927 |
+#endif |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
928 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
929 |
+//#define DEBUG_KDE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
930 |
+#ifdef DEBUG_KDE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
931 |
+#define KMOZILLAHELPER "kmozillahelper" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
932 |
+#else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
933 |
+// not need for lib64, it's a binary |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
934 |
+#define KMOZILLAHELPER "/usr/lib/mozilla/kmozillahelper" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
935 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
936 |
+ |
538
be682f8c9361
revert API version change for kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
537
diff
changeset
|
937 |
+#define KMOZILLAHELPER_VERSION 6 |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
938 |
+#define MAKE_STR2( n ) #n |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
939 |
+#define MAKE_STR( n ) MAKE_STR2( n ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
940 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
941 |
+static bool getKdeSession() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
942 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
943 |
+ Display* dpy = XOpenDisplay( NULL ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
944 |
+ if( dpy == NULL ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
945 |
+ return false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
946 |
+ Atom kde_full_session = XInternAtom( dpy, "KDE_FULL_SESSION", True ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
947 |
+ bool kde = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
948 |
+ if( kde_full_session != None ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
949 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
950 |
+ int cnt; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
951 |
+ if( Atom* props = XListProperties( dpy, DefaultRootWindow( dpy ), &cnt )) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
952 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
953 |
+ for( int i = 0; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
954 |
+ i < cnt; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
955 |
+ ++i ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
956 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
957 |
+ if( props[ i ] == kde_full_session ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
958 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
959 |
+ kde = true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
960 |
+#ifdef DEBUG_KDE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
961 |
+ fprintf( stderr, "KDE SESSION %d\n", kde ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
962 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
963 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
964 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
965 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
966 |
+ XFree( props ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
967 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
968 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
969 |
+ XCloseDisplay( dpy ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
970 |
+ return kde; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
971 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
972 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
973 |
+static bool getKdeSupport() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
974 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
975 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
976 |
+ command.AppendElement( NS_LITERAL_CSTRING( "CHECK" )); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
977 |
+ command.AppendElement( NS_LITERAL_CSTRING( MAKE_STR( KMOZILLAHELPER_VERSION ))); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
978 |
+ bool kde = nsKDEUtils::command( command ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
979 |
+#ifdef DEBUG_KDE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
980 |
+ fprintf( stderr, "KDE RUNNING %d\n", kde ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
981 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
982 |
+ return kde; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
983 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
984 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
985 |
+nsKDEUtils::nsKDEUtils() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
986 |
+ : commandFile( NULL ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
987 |
+ , replyFile( NULL ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
988 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
989 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
990 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
991 |
+nsKDEUtils::~nsKDEUtils() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
992 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
993 |
+// closeHelper(); not actually useful, exiting will close the fd too |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
994 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
995 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
996 |
+nsKDEUtils* nsKDEUtils::self() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
997 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
998 |
+ static nsKDEUtils s; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
999 |
+ return &s; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1000 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1001 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1002 |
+static bool helperRunning = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1003 |
+static bool helperFailed = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1004 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1005 |
+bool nsKDEUtils::kdeSession() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1006 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1007 |
+ static bool session = getKdeSession(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1008 |
+ return session; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1009 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1010 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1011 |
+bool nsKDEUtils::kdeSupport() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1012 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1013 |
+ static bool support = kdeSession() && getKdeSupport(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1014 |
+ return support && helperRunning; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1015 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1016 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1017 |
+struct nsKDECommandData |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1018 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1019 |
+ FILE* file; |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1020 |
+ nsTArray<nsCString>* output; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1021 |
+ GMainLoop* loop; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1022 |
+ bool success; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1023 |
+ }; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1024 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1025 |
+static gboolean kdeReadFunc( GIOChannel*, GIOCondition, gpointer data ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1026 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1027 |
+ nsKDECommandData* p = static_cast< nsKDECommandData* >( data ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1028 |
+ char buf[ 8192 ]; // TODO big enough |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1029 |
+ bool command_done = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1030 |
+ bool command_failed = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1031 |
+ while( !command_done && !command_failed && fgets( buf, 8192, p->file ) != NULL ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1032 |
+ { // TODO what if the kernel splits a line into two chunks? |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1033 |
+//#ifdef DEBUG_KDE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1034 |
+// fprintf( stderr, "READ: %s %d\n", buf, feof( p->file )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1035 |
+//#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1036 |
+ if( char* eol = strchr( buf, '\n' )) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1037 |
+ *eol = '\0'; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1038 |
+ command_done = ( strcmp( buf, "\\1" ) == 0 ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1039 |
+ command_failed = ( strcmp( buf, "\\0" ) == 0 ); |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1040 |
+ nsAutoCString line( buf ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1041 |
+ line.ReplaceSubstring( "\\n", "\n" ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1042 |
+ line.ReplaceSubstring( "\\" "\\", "\\" ); // \\ -> \ , i.e. unescape |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1043 |
+ if( p->output && !( command_done || command_failed )) |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1044 |
+ p->output->AppendElement( nsCString( buf )); // TODO utf8? |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1045 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1046 |
+ bool quit = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1047 |
+ if( feof( p->file ) || command_failed ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1048 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1049 |
+ quit = true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1050 |
+ p->success = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1051 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1052 |
+ if( command_done ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1053 |
+ { // reading one reply finished |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1054 |
+ quit = true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1055 |
+ p->success = true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1056 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1057 |
+ if( quit ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1058 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1059 |
+ if( p->loop ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1060 |
+ g_main_loop_quit( p->loop ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1061 |
+ return FALSE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1062 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1063 |
+ return TRUE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1064 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1065 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1066 |
+bool nsKDEUtils::command( const nsTArray<nsCString>& command, nsTArray<nsCString>* output ) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1067 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1068 |
+ return self()->internalCommand( command, NULL, false, output ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1069 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1070 |
+ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1071 |
+bool nsKDEUtils::command( nsIArray* command, nsIArray** output) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1072 |
+ { |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1073 |
+ nsTArray<nsCString> in; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1074 |
+ PRUint32 length; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1075 |
+ command->GetLength( &length ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1076 |
+ for ( PRUint32 i = 0; i < length; i++ ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1077 |
+ { |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1078 |
+ nsCOMPtr<nsISupportsCString> str = do_QueryElementAt( command, i ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1079 |
+ if( str ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1080 |
+ { |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1081 |
+ nsAutoCString s; |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1082 |
+ str->GetData( s ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1083 |
+ in.AppendElement( s ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1084 |
+ } |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1085 |
+ } |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1086 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1087 |
+ nsTArray<nsCString> out; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1088 |
+ bool ret = self()->internalCommand( in, NULL, false, &out ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1089 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1090 |
+ if ( !output ) return ret; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1091 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1092 |
+ nsCOMPtr<nsIMutableArray> result = do_CreateInstance( NS_ARRAY_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1093 |
+ if ( !result ) return false; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1094 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1095 |
+ for ( PRUint32 i = 0; i < out.Length(); i++ ) |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1096 |
+ { |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1097 |
+ nsCOMPtr<nsISupportsCString> rstr = do_CreateInstance( NS_SUPPORTS_CSTRING_CONTRACTID ); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1098 |
+ if ( !rstr ) return false; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1099 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1100 |
+ rstr->SetData( out[i] ); |
1021
1307721d2345
fixed patches for FF58
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1020
diff
changeset
|
1101 |
+ result->AppendElement( rstr ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1102 |
+ } |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1103 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1104 |
+ NS_ADDREF( *output = result); |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1105 |
+ return ret; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1106 |
+ } |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1107 |
+ |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1108 |
+ |
893
86f72f1e98a4
prepare Gtk3 based builds on a feature branch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
889
diff
changeset
|
1109 |
+bool nsKDEUtils::commandBlockUi( const nsTArray<nsCString>& command, GtkWindow* parent, nsTArray<nsCString>* output ) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1110 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1111 |
+ return self()->internalCommand( command, parent, true, output ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1112 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1113 |
+ |
893
86f72f1e98a4
prepare Gtk3 based builds on a feature branch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
889
diff
changeset
|
1114 |
+bool nsKDEUtils::internalCommand( const nsTArray<nsCString>& command, GtkWindow* parent, bool blockUi, |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1115 |
+ nsTArray<nsCString>* output ) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1116 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1117 |
+ if( !startHelper()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1118 |
+ return false; |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1119 |
+ feedCommand( command ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1120 |
+ // do not store the data in 'this' but in extra structure, just in case there |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1121 |
+ // is reentrancy (can there be? the event loop is re-entered) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1122 |
+ nsKDECommandData data; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1123 |
+ data.file = replyFile; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1124 |
+ data.output = output; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1125 |
+ data.success = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1126 |
+ if( blockUi ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1127 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1128 |
+ data.loop = g_main_loop_new( NULL, FALSE ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1129 |
+ GtkWidget* window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); |
893
86f72f1e98a4
prepare Gtk3 based builds on a feature branch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
889
diff
changeset
|
1130 |
+ if( parent && gtk_window_get_group(parent) ) |
86f72f1e98a4
prepare Gtk3 based builds on a feature branch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
889
diff
changeset
|
1131 |
+ gtk_window_group_add_window( gtk_window_get_group(parent), GTK_WINDOW( window )); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1132 |
+ gtk_widget_realize( window ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1133 |
+ gtk_widget_set_sensitive( window, TRUE ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1134 |
+ gtk_grab_add( window ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1135 |
+ GIOChannel* channel = g_io_channel_unix_new( fileno( data.file )); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1136 |
+ g_io_add_watch( channel, static_cast< GIOCondition >( G_IO_IN | G_IO_ERR | G_IO_HUP ), kdeReadFunc, &data ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1137 |
+ g_io_channel_unref( channel ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1138 |
+ g_main_loop_run( data.loop ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1139 |
+ g_main_loop_unref( data.loop ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1140 |
+ gtk_grab_remove( window ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1141 |
+ gtk_widget_destroy( window ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1142 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1143 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1144 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1145 |
+ data.loop = NULL; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1146 |
+ while( kdeReadFunc( NULL, static_cast< GIOCondition >( 0 ), &data )) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1147 |
+ ; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1148 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1149 |
+ return data.success; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1150 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1151 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1152 |
+bool nsKDEUtils::startHelper() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1153 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1154 |
+ if( helperRunning ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1155 |
+ return true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1156 |
+ if( helperFailed ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1157 |
+ return false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1158 |
+ helperFailed = true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1159 |
+ int fdcommand[ 2 ]; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1160 |
+ int fdreply[ 2 ]; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1161 |
+ if( pipe( fdcommand ) < 0 ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1162 |
+ return false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1163 |
+ if( pipe( fdreply ) < 0 ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1164 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1165 |
+ close( fdcommand[ 0 ] ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1166 |
+ close( fdcommand[ 1 ] ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1167 |
+ return false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1168 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1169 |
+ char* args[ 2 ] = { const_cast< char* >( KMOZILLAHELPER ), NULL }; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1170 |
+ switch( fork()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1171 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1172 |
+ case -1: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1173 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1174 |
+ close( fdcommand[ 0 ] ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1175 |
+ close( fdcommand[ 1 ] ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1176 |
+ close( fdreply[ 0 ] ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1177 |
+ close( fdreply[ 1 ] ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1178 |
+ return false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1179 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1180 |
+ case 0: // child |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1181 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1182 |
+ if( dup2( fdcommand[ 0 ], STDIN_FILENO ) < 0 ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1183 |
+ _exit( 1 ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1184 |
+ if( dup2( fdreply[ 1 ], STDOUT_FILENO ) < 0 ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1185 |
+ _exit( 1 ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1186 |
+ int maxfd = 1024; // close all other fds |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1187 |
+ struct rlimit rl; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1188 |
+ if( getrlimit( RLIMIT_NOFILE, &rl ) == 0 ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1189 |
+ maxfd = rl.rlim_max; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1190 |
+ for( int i = 3; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1191 |
+ i < maxfd; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1192 |
+ ++i ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1193 |
+ close( i ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1194 |
+#ifdef DEBUG_KDE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1195 |
+ execvp( KMOZILLAHELPER, args ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1196 |
+#else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1197 |
+ execv( KMOZILLAHELPER, args ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1198 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1199 |
+ _exit( 1 ); // failed |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1200 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1201 |
+ default: // parent |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1202 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1203 |
+ commandFile = fdopen( fdcommand[ 1 ], "w" ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1204 |
+ replyFile = fdopen( fdreply[ 0 ], "r" ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1205 |
+ close( fdcommand[ 0 ] ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1206 |
+ close( fdreply[ 1 ] ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1207 |
+ if( commandFile == NULL || replyFile == NULL ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1208 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1209 |
+ closeHelper(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1210 |
+ return false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1211 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1212 |
+ // ok, helper ready, getKdeRunning() will check if it works |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1213 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1214 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1215 |
+ helperFailed = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1216 |
+ helperRunning = true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1217 |
+ return true; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1218 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1219 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1220 |
+void nsKDEUtils::closeHelper() |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1221 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1222 |
+ if( commandFile != NULL ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1223 |
+ fclose( commandFile ); // this will also make the helper quit |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1224 |
+ if( replyFile != NULL ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1225 |
+ fclose( replyFile ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1226 |
+ helperRunning = false; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1227 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1228 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1229 |
+void nsKDEUtils::feedCommand( const nsTArray<nsCString>& command ) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1230 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1231 |
+ for( int i = 0; |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1232 |
+ i < command.Length(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1233 |
+ ++i ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1234 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1235 |
+ nsCString line = command[ i ]; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1236 |
+ line.ReplaceSubstring( "\\", "\\" "\\" ); // \ -> \\ , i.e. escape |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1237 |
+ line.ReplaceSubstring( "\n", "\\n" ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1238 |
+#ifdef DEBUG_KDE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1239 |
+ fprintf( stderr, "COMM: %s\n", line.get()); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1240 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1241 |
+ fputs( line.get(), commandFile ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1242 |
+ fputs( "\n", commandFile ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1243 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1244 |
+ fputs( "\\E\n", commandFile ); // done as \E, so it cannot happen in normal data |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1245 |
+ fflush( commandFile ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1246 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1247 |
diff --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1248 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1249 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1250 |
+++ b/toolkit/xre/nsKDEUtils.h |
546 | 1251 |
@@ -0,0 +1,48 @@ |
1252 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
|
1253 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
|
1254 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1255 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1256 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1257 |
+#ifndef nsKDEUtils_h__ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1258 |
+#define nsKDEUtils_h__ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1259 |
+ |
1033
51bfdd19b9e9
rebased everything to apply cleanly
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1032
diff
changeset
|
1260 |
+#include "nsString.h" |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1261 |
+#include "nsTArray.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1262 |
+#include <stdio.h> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1263 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1264 |
+typedef struct _GtkWindow GtkWindow; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1265 |
+ |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1266 |
+class nsIArray; |
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1267 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1268 |
+class NS_EXPORT nsKDEUtils |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1269 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1270 |
+ public: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1271 |
+ /* Returns true if running inside a KDE session (regardless of whether there is KDE |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1272 |
+ support available for Firefox). This should be used e.g. when determining |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1273 |
+ dialog button order but not for code that requires the KDE support. */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1274 |
+ static bool kdeSession(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1275 |
+ /* Returns true if running inside a KDE session and KDE support is available |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1276 |
+ for Firefox. This should be used everywhere where the external helper is needed. */ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1277 |
+ static bool kdeSupport(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1278 |
+ /* Executes the given helper command, returns true if helper returned success. */ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1279 |
+ static bool command( const nsTArray<nsCString>& command, nsTArray<nsCString>* output = NULL ); |
398
937669e1c537
ported and reenabled KDE integration (bnc#746591)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
368
diff
changeset
|
1280 |
+ static bool command( nsIArray* command, nsIArray** output = NULL ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1281 |
+ /* Like command(), but additionally blocks the parent widget like if there was |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1282 |
+ a modal dialog shown and enters the event loop (i.e. there are still paint updates, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1283 |
+ this is for commands that take long). */ |
893
86f72f1e98a4
prepare Gtk3 based builds on a feature branch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
889
diff
changeset
|
1284 |
+ static bool commandBlockUi( const nsTArray<nsCString>& command, GtkWindow* parent, nsTArray<nsCString>* output = NULL ); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1285 |
+ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1286 |
+ private: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1287 |
+ nsKDEUtils(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1288 |
+ ~nsKDEUtils(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1289 |
+ static nsKDEUtils* self(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1290 |
+ bool startHelper(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1291 |
+ void closeHelper(); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1292 |
+ void feedCommand( const nsTArray<nsCString>& command ); |
893
86f72f1e98a4
prepare Gtk3 based builds on a feature branch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
889
diff
changeset
|
1293 |
+ bool internalCommand( const nsTArray<nsCString>& command, GtkWindow* parent, bool isParent, |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1294 |
+ nsTArray<nsCString>* output ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1295 |
+ FILE* commandFile; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1296 |
+ FILE* replyFile; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1297 |
+ }; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1298 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1299 |
+#endif // nsKDEUtils |
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1300 |
diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1301 |
--- a/uriloader/exthandler/HandlerServiceParent.cpp |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1302 |
+++ b/uriloader/exthandler/HandlerServiceParent.cpp |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1303 |
@@ -1,16 +1,16 @@ |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1304 |
#include "mozilla/Logging.h" |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1305 |
#include "HandlerServiceParent.h" |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1306 |
#include "nsIHandlerService.h" |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1307 |
#include "nsIMIMEInfo.h" |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1308 |
#include "ContentHandlerService.h" |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1309 |
#include "nsStringEnumerator.h" |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1310 |
#ifdef MOZ_WIDGET_GTK |
1089 | 1311 |
-# include "unix/nsGNOMERegistry.h" |
1312 |
+# include "unix/nsCommonRegistry.h" |
|
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1313 |
#endif |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1314 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1315 |
using mozilla::dom::ContentHandlerService; |
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1316 |
using mozilla::dom::HandlerApp; |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1317 |
using mozilla::dom::HandlerInfo; |
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1318 |
using mozilla::dom::RemoteHandlerApp; |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1319 |
|
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1320 |
namespace { |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1321 |
@@ -246,17 +246,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1322 |
handlerSvc->Exists(info, exists); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1323 |
return IPC_OK(); |
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1324 |
} |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1325 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1326 |
mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocol( |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1327 |
const nsCString& aProtocolScheme, bool* aHandlerExists) { |
1050
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1328 |
#ifdef MOZ_WIDGET_GTK |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1329 |
// Check the GNOME registry for a protocol handler |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1330 |
- *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme.get()); |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1331 |
+ *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme.get()); |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1332 |
#else |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1333 |
*aHandlerExists = false; |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1334 |
#endif |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1335 |
return IPC_OK(); |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1336 |
} |
bf0d08380dcf
fix Bug 1094747 - Open with option in download dialog has no effect with kmozillahelper
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1045
diff
changeset
|
1337 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1338 |
mozilla::ipc::IPCResult HandlerServiceParent::RecvGetTypeFromExtension( |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1339 |
const nsCString& aFileExtension, nsCString* type) { |
659 | 1340 |
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
1341 |
--- a/uriloader/exthandler/moz.build |
|
1342 |
+++ b/uriloader/exthandler/moz.build |
|
1093 | 1343 |
@@ -80,17 +80,19 @@ else: |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1344 |
SOURCES += [ |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1345 |
osdir + '/nsOSHelperAppService.cpp', |
659 | 1346 |
] |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
1347 |
if CONFIG['CC_TYPE'] in ('clang', 'gcc'): |
929 | 1348 |
CXXFLAGS += ['-Wno-error=shadow'] |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1349 |
|
923 | 1350 |
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
703 | 1351 |
UNIFIED_SOURCES += [ |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1352 |
+ 'unix/nsCommonRegistry.cpp', |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1353 |
'unix/nsGNOMERegistry.cpp', |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
1354 |
+ 'unix/nsKDERegistry.cpp', |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1355 |
'unix/nsMIMEInfoUnix.cpp', |
659 | 1356 |
] |
1357 |
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': |
|
703 | 1358 |
UNIFIED_SOURCES += [ |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1359 |
'android/nsAndroidHandlerApp.cpp', |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1360 |
'android/nsExternalURLHandlerService.cpp', |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1361 |
'android/nsMIMEInfoAndroid.cpp', |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
1362 |
] |
1093 | 1363 |
@@ -130,16 +132,17 @@ include('/ipc/chromium/chromium-config.m |
779 | 1364 |
FINAL_LIBRARY = 'xul' |
1365 |
||
1366 |
LOCAL_INCLUDES += [ |
|
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1367 |
'/docshell/base', |
779 | 1368 |
'/dom/base', |
1369 |
'/dom/ipc', |
|
850 | 1370 |
'/netwerk/base', |
779 | 1371 |
'/netwerk/protocol/http', |
850 | 1372 |
+ '/toolkit/xre', |
779 | 1373 |
] |
1374 |
||
1375 |
if CONFIG['MOZ_ENABLE_DBUS']: |
|
1376 |
CXXFLAGS += CONFIG['TK_CFLAGS'] |
|
1377 |
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS'] |
|
1378 |
||
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
1379 |
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3': |
779 | 1380 |
CXXFLAGS += CONFIG['TK_CFLAGS'] |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1381 |
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1382 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1383 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1384 |
+++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
869 | 1385 |
@@ -0,0 +1,53 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1386 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
546 | 1387 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1388 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1389 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1390 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1391 |
+#include "nsCommonRegistry.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1392 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1393 |
+#include "nsGNOMERegistry.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1394 |
+#include "nsKDERegistry.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1395 |
+#include "nsString.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1396 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1397 |
+ |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1398 |
+/* static */ bool |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1399 |
+nsCommonRegistry::HandlerExists(const char *aProtocolScheme) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1400 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1401 |
+ if( nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1402 |
+ return nsKDERegistry::HandlerExists( aProtocolScheme ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1403 |
+ return nsGNOMERegistry::HandlerExists( aProtocolScheme ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1404 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1405 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1406 |
+/* static */ nsresult |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1407 |
+nsCommonRegistry::LoadURL(nsIURI *aURL) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1408 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1409 |
+ if( nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1410 |
+ return nsKDERegistry::LoadURL( aURL ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1411 |
+ return nsGNOMERegistry::LoadURL( aURL ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1412 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1413 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1414 |
+/* static */ void |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1415 |
+nsCommonRegistry::GetAppDescForScheme(const nsACString& aScheme, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1416 |
+ nsAString& aDesc) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1417 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1418 |
+ if( nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1419 |
+ return nsKDERegistry::GetAppDescForScheme( aScheme, aDesc ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1420 |
+ return nsGNOMERegistry::GetAppDescForScheme( aScheme, aDesc ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1421 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1422 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1423 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1424 |
+/* static */ already_AddRefed<nsMIMEInfoBase> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1425 |
+nsCommonRegistry::GetFromExtension(const nsACString& aFileExt) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1426 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1427 |
+ if( nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1428 |
+ return nsKDERegistry::GetFromExtension( aFileExt ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1429 |
+ return nsGNOMERegistry::GetFromExtension( aFileExt ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1430 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1431 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1432 |
+/* static */ already_AddRefed<nsMIMEInfoBase> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1433 |
+nsCommonRegistry::GetFromType(const nsACString& aMIMEType) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1434 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1435 |
+ if( nsKDEUtils::kdeSupport()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1436 |
+ return nsKDERegistry::GetFromType( aMIMEType ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1437 |
+ return nsGNOMERegistry::GetFromType( aMIMEType ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1438 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1439 |
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1440 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1441 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1442 |
+++ b/uriloader/exthandler/unix/nsCommonRegistry.h |
760 | 1443 |
@@ -0,0 +1,28 @@ |
546 | 1444 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1445 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1446 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1447 |
+ |
760 | 1448 |
+#ifndef nsCommonRegistry_h__ |
1449 |
+#define nsCommonRegistry_h__ |
|
1450 |
+ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1451 |
+#include "nsIURI.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1452 |
+#include "nsCOMPtr.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1453 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1454 |
+class nsMIMEInfoBase; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1455 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1456 |
+class nsCommonRegistry |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1457 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1458 |
+ public: |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1459 |
+ static bool HandlerExists(const char *aProtocolScheme); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1460 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1461 |
+ static nsresult LoadURL(nsIURI *aURL); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1462 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1463 |
+ static void GetAppDescForScheme(const nsACString& aScheme, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1464 |
+ nsAString& aDesc); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1465 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1466 |
+ static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsACString& aFileExt); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1467 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1468 |
+ static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1469 |
+}; |
760 | 1470 |
+ |
1471 |
+#endif |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1472 |
diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1473 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1474 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1475 |
+++ b/uriloader/exthandler/unix/nsKDERegistry.cpp |
1007
65e317e42eff
fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
1476 |
@@ -0,0 +1,87 @@ |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1477 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
546 | 1478 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1479 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1480 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1481 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1482 |
+#include "nsKDERegistry.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1483 |
+#include "prlink.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1484 |
+#include "prmem.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1485 |
+#include "nsString.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1486 |
+#include "nsMIMEInfoUnix.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1487 |
+#include "nsAutoPtr.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1488 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1489 |
+ |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1490 |
+/* static */ bool |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1491 |
+nsKDERegistry::HandlerExists(const char *aProtocolScheme) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1492 |
+{ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1493 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1494 |
+ command.AppendElement( NS_LITERAL_CSTRING( "HANDLEREXISTS" )); |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1495 |
+ command.AppendElement( nsAutoCString( aProtocolScheme )); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1496 |
+ return nsKDEUtils::command( command ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1497 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1498 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1499 |
+/* static */ nsresult |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1500 |
+nsKDERegistry::LoadURL(nsIURI *aURL) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1501 |
+{ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1502 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1503 |
+ command.AppendElement( NS_LITERAL_CSTRING( "OPEN" )); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1504 |
+ nsCString url; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1505 |
+ aURL->GetSpec( url ); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1506 |
+ command.AppendElement( url ); |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1507 |
+ bool rv = nsKDEUtils::command( command ); |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1508 |
+ if (!rv) |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1509 |
+ return NS_ERROR_FAILURE; |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1510 |
+ |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1511 |
+ return NS_OK; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1512 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1513 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1514 |
+/* static */ void |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1515 |
+nsKDERegistry::GetAppDescForScheme(const nsACString& aScheme, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1516 |
+ nsAString& aDesc) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1517 |
+{ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1518 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1519 |
+ command.AppendElement( NS_LITERAL_CSTRING( "GETAPPDESCFORSCHEME" )); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1520 |
+ command.AppendElement( aScheme ); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1521 |
+ nsTArray<nsCString> output; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1522 |
+ if( nsKDEUtils::command( command, &output ) && output.Length() == 1 ) |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1523 |
+ CopyUTF8toUTF16( output[ 0 ], aDesc ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1524 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1525 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1526 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1527 |
+/* static */ already_AddRefed<nsMIMEInfoBase> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1528 |
+nsKDERegistry::GetFromExtension(const nsACString& aFileExt) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1529 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1530 |
+ NS_ASSERTION(aFileExt[0] != '.', "aFileExt shouldn't start with a dot"); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1531 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1532 |
+ command.AppendElement( NS_LITERAL_CSTRING( "GETFROMEXTENSION" )); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1533 |
+ command.AppendElement( aFileExt ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1534 |
+ return GetFromHelper( command ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1535 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1536 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1537 |
+/* static */ already_AddRefed<nsMIMEInfoBase> |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1538 |
+nsKDERegistry::GetFromType(const nsACString& aMIMEType) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1539 |
+{ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1540 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1541 |
+ command.AppendElement( NS_LITERAL_CSTRING( "GETFROMTYPE" )); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1542 |
+ command.AppendElement( aMIMEType ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1543 |
+ return GetFromHelper( command ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1544 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1545 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1546 |
+/* static */ already_AddRefed<nsMIMEInfoBase> |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1547 |
+nsKDERegistry::GetFromHelper(const nsTArray<nsCString>& command) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1548 |
+{ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1549 |
+ nsTArray<nsCString> output; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1550 |
+ if( nsKDEUtils::command( command, &output ) && output.Length() == 3 ) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1551 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1552 |
+ nsCString mimetype = output[ 0 ]; |
901 | 1553 |
+ RefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix( mimetype ); |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
1554 |
+ NS_ENSURE_TRUE(mimeInfo, nullptr); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1555 |
+ nsCString description = output[ 1 ]; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1556 |
+ mimeInfo->SetDescription(NS_ConvertUTF8toUTF16(description)); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1557 |
+ nsCString handlerAppName = output[ 2 ]; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1558 |
+ mimeInfo->SetDefaultDescription(NS_ConvertUTF8toUTF16(handlerAppName)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1559 |
+ mimeInfo->SetPreferredAction(nsIMIMEInfo::useSystemDefault); |
659 | 1560 |
+ return mimeInfo.forget(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1561 |
+ } |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
1562 |
+ return nullptr; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1563 |
+} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1564 |
diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1565 |
new file mode 100644 |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1566 |
--- /dev/null |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1567 |
+++ b/uriloader/exthandler/unix/nsKDERegistry.h |
757 | 1568 |
@@ -0,0 +1,34 @@ |
546 | 1569 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
1570 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1571 |
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1572 |
+ |
757 | 1573 |
+#ifndef nsKDERegistry_h__ |
1574 |
+#define nsKDERegistry_h__ |
|
1575 |
+ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1576 |
+#include "nsIURI.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1577 |
+#include "nsCOMPtr.h" |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1578 |
+#include "nsTArray.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1579 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1580 |
+class nsMIMEInfoBase; |
1007
65e317e42eff
fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
1581 |
+//class nsAutoCString; |
65e317e42eff
fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
1582 |
+//class nsCString; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1583 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1584 |
+class nsKDERegistry |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1585 |
+{ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1586 |
+ public: |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1587 |
+ static bool HandlerExists(const char *aProtocolScheme); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1588 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1589 |
+ static nsresult LoadURL(nsIURI *aURL); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1590 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1591 |
+ static void GetAppDescForScheme(const nsACString& aScheme, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1592 |
+ nsAString& aDesc); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1593 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1594 |
+ static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsACString& aFileExt); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1595 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1596 |
+ static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1597 |
+ private: |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1598 |
+ static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1599 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1600 |
+}; |
757 | 1601 |
+ |
1602 |
+#endif //nsKDERegistry_h__ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1603 |
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1604 |
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1605 |
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1606 |
@@ -1,47 +1,50 @@ |
932 | 1607 |
/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
1608 |
* |
|
1609 |
* This Source Code Form is subject to the terms of the Mozilla Public |
|
1610 |
* License, v. 2.0. If a copy of the MPL was not distributed with this |
|
1611 |
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1612 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1613 |
#include "nsMIMEInfoUnix.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1614 |
-#include "nsGNOMERegistry.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1615 |
+#include "nsCommonRegistry.h" |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1616 |
#include "nsIGIOService.h" |
236
a4f5954df3a3
update for 2.0/4.0rc1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
229
diff
changeset
|
1617 |
#include "nsNetCID.h" |
a4f5954df3a3
update for 2.0/4.0rc1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
229
diff
changeset
|
1618 |
#include "nsIIOService.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1619 |
#include "nsAutoPtr.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1620 |
#ifdef MOZ_ENABLE_DBUS |
1089 | 1621 |
# include "nsDBusHandlerApp.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1622 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1623 |
+#if defined(XP_UNIX) && !defined(XP_MACOSX) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1624 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1625 |
+#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1626 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1627 |
nsresult nsMIMEInfoUnix::LoadUriInternal(nsIURI *aURI) { |
932 | 1628 |
- return nsGNOMERegistry::LoadURL(aURI); |
1629 |
+ return nsCommonRegistry::LoadURL(aURI); |
|
1630 |
} |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1631 |
|
932 | 1632 |
NS_IMETHODIMP |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1633 |
nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval) { |
932 | 1634 |
// if mDefaultApplication is set, it means the application has been set from |
650 | 1635 |
// either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to |
1636 |
// give the GNOME answer. |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1637 |
if (mDefaultApplication) return nsMIMEInfoImpl::GetHasDefaultHandler(_retval); |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1638 |
|
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1639 |
*_retval = false; |
738 | 1640 |
|
850 | 1641 |
if (mClass == eProtocolInfo) { |
738 | 1642 |
- *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get()); |
1643 |
+ *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get()); |
|
1644 |
} else { |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1645 |
RefPtr<nsMIMEInfoBase> mimeInfo = |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1646 |
- nsGNOMERegistry::GetFromType(mSchemeOrType); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1647 |
+ nsCommonRegistry::GetFromType(mSchemeOrType); |
738 | 1648 |
if (!mimeInfo) { |
1649 |
nsAutoCString ext; |
|
1650 |
nsresult rv = GetPrimaryExtension(ext); |
|
1651 |
if (NS_SUCCEEDED(rv)) { |
|
1652 |
- mimeInfo = nsGNOMERegistry::GetFromExtension(ext); |
|
1653 |
+ mimeInfo = nsCommonRegistry::GetFromExtension(ext); |
|
1654 |
} |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1655 |
} |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1656 |
if (mimeInfo) *_retval = true; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1657 |
} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1658 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1659 |
if (*_retval) return NS_OK; |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1660 |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1661 |
return NS_OK; |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1662 |
@@ -51,16 +54,33 @@ nsresult nsMIMEInfoUnix::LaunchDefaultWi |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1663 |
// if mDefaultApplication is set, it means the application has been set from |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
1664 |
// either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
1665 |
// give the GNOME answer. |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1666 |
if (mDefaultApplication) return nsMIMEInfoImpl::LaunchDefaultWithFile(aFile); |
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
1667 |
|
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
1668 |
nsAutoCString nativePath; |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
1669 |
aFile->GetNativePath(nativePath); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1670 |
|
64
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1671 |
+ if( nsKDEUtils::kdeSupport()) { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1672 |
+ bool supports; |
64
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1673 |
+ if( NS_SUCCEEDED( GetHasDefaultHandler( &supports )) && supports ) { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1674 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1675 |
+ command.AppendElement( NS_LITERAL_CSTRING( "OPEN" )); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1676 |
+ command.AppendElement( nativePath ); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1677 |
+ command.AppendElement( NS_LITERAL_CSTRING( "MIMETYPE" )); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1678 |
+ command.AppendElement( mSchemeOrType ); |
64
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1679 |
+ if( nsKDEUtils::command( command )) |
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1680 |
+ return NS_OK; |
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1681 |
+ } |
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1682 |
+ if (!mDefaultApplication) |
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1683 |
+ return NS_ERROR_FILE_NOT_FOUND; |
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1684 |
+ |
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1685 |
+ return LaunchWithIProcess(mDefaultApplication, nativePath); |
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1686 |
+ } |
7bb1edb78dd5
Update to 1.9.2.4/3.6.4pre to prepare the bigger Lorentz merge
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
1687 |
+ |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1688 |
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); |
850 | 1689 |
if (!giovfs) { |
1690 |
return NS_ERROR_FAILURE; |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1691 |
} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1692 |
|
850 | 1693 |
// nsGIOMimeApp->Launch wants a URI string instead of local file |
1694 |
nsresult rv; |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1695 |
nsCOMPtr<nsIIOService> ioservice = |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1696 |
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1697 |
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1698 |
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1699 |
@@ -5,17 +5,17 @@ |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1700 |
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1701 |
|
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1702 |
#include <sys/types.h> |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1703 |
#include <sys/stat.h> |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1704 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1705 |
#include "nsOSHelperAppService.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1706 |
#include "nsMIMEInfoUnix.h" |
659 | 1707 |
#ifdef MOZ_WIDGET_GTK |
1089 | 1708 |
-# include "nsGNOMERegistry.h" |
1709 |
+# include "nsCommonRegistry.h" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1710 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1711 |
#include "nsISupports.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1712 |
#include "nsString.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1713 |
#include "nsReadableUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1714 |
#include "nsUnicharUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1715 |
#include "nsIURL.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1716 |
#include "nsIFileStreams.h" |
1005 | 1717 |
#include "nsILineInputStream.h" |
1089 | 1718 |
@@ -1025,17 +1025,17 @@ nsresult nsOSHelperAppService::GetHandle |
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
1719 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1720 |
nsresult nsOSHelperAppService::OSProtocolHandlerExists( |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1721 |
const char* aProtocolScheme, bool* aHandlerExists) { |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1722 |
nsresult rv = NS_OK; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1723 |
|
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1724 |
if (!XRE_IsContentProcess()) { |
659 | 1725 |
#ifdef MOZ_WIDGET_GTK |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1726 |
// Check the GNOME registry for a protocol handler |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1727 |
- *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme); |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1728 |
+ *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme); |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1729 |
#else |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1730 |
*aHandlerExists = false; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1731 |
#endif |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1732 |
} else { |
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1733 |
*aHandlerExists = false; |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1734 |
nsCOMPtr<nsIHandlerService> handlerSvc = |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1735 |
do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv); |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1736 |
if (NS_SUCCEEDED(rv) && handlerSvc) { |
1089 | 1737 |
@@ -1045,17 +1045,17 @@ nsresult nsOSHelperAppService::OSProtoco |
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1738 |
} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1739 |
|
1020
d2c159cb9bf2
rebased patches; updated spec file
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1014
diff
changeset
|
1740 |
return rv; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1741 |
} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1742 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1743 |
NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription( |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1744 |
const nsACString& aScheme, nsAString& _retval) { |
659 | 1745 |
#ifdef MOZ_WIDGET_GTK |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1746 |
- nsGNOMERegistry::GetAppDescForScheme(aScheme, _retval); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1747 |
+ nsCommonRegistry::GetAppDescForScheme(aScheme, _retval); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1748 |
return _retval.IsEmpty() ? NS_ERROR_NOT_AVAILABLE : NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1749 |
#else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1750 |
return NS_ERROR_NOT_AVAILABLE; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1751 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1752 |
} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1753 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1754 |
nsresult nsOSHelperAppService::GetFileTokenForPath( |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1755 |
const char16_t* platformAppPath, nsIFile** aFile) { |
1089 | 1756 |
@@ -1136,17 +1136,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1757 |
nsresult rv = |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1758 |
LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1759 |
minorType, mime_types_description, true); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1760 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1761 |
if (NS_FAILED(rv) || majorType.IsEmpty()) { |
659 | 1762 |
#ifdef MOZ_WIDGET_GTK |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1763 |
LOG(("Looking in GNOME registry\n")); |
899 | 1764 |
RefPtr<nsMIMEInfoBase> gnomeInfo = |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1765 |
- nsGNOMERegistry::GetFromExtension(aFileExt); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1766 |
+ nsCommonRegistry::GetFromExtension(aFileExt); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1767 |
if (gnomeInfo) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1768 |
LOG(("Got MIMEInfo from GNOME registry\n")); |
653 | 1769 |
return gnomeInfo.forget(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1770 |
} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1771 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1772 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1773 |
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1774 |
minorType, mime_types_description, false); |
1089 | 1775 |
@@ -1248,17 +1248,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1776 |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1777 |
// Now look up our extensions |
850 | 1778 |
nsAutoString extensions, mime_types_description; |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1779 |
LookUpExtensionsAndDescription(majorType, minorType, extensions, |
850 | 1780 |
mime_types_description); |
1781 |
||
659 | 1782 |
#ifdef MOZ_WIDGET_GTK |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1783 |
if (handler.IsEmpty()) { |
899 | 1784 |
- RefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType); |
1785 |
+ RefPtr<nsMIMEInfoBase> gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType); |
|
850 | 1786 |
if (gnomeInfo) { |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1787 |
LOG( |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1788 |
("Got MIMEInfo from GNOME registry without extensions; setting them " |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1789 |
"to %s\n", |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1790 |
NS_LossyConvertUTF16toASCII(extensions).get())); |
850 | 1791 |
|
1792 |
NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
|
1793 |
gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
|
779 | 1794 |
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1795 |
--- a/widget/gtk/moz.build |
|
1796 |
+++ b/widget/gtk/moz.build |
|
1093 | 1797 |
@@ -121,16 +121,17 @@ include('/ipc/chromium/chromium-config.m |
828 | 1798 |
|
779 | 1799 |
FINAL_LIBRARY = 'xul' |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1800 |
|
779 | 1801 |
LOCAL_INCLUDES += [ |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
1802 |
'/layout/base', |
779 | 1803 |
'/layout/generic', |
1804 |
'/layout/xul', |
|
1805 |
'/other-licenses/atk-1.0', |
|
828 | 1806 |
+ '/toolkit/xre', |
1807 |
'/widget', |
|
985 | 1808 |
'/widget/headless', |
779 | 1809 |
] |
703 | 1810 |
|
779 | 1811 |
if CONFIG['MOZ_X11']: |
1812 |
LOCAL_INCLUDES += [ |
|
828 | 1813 |
'/widget/x11', |
779 | 1814 |
] |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1815 |
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1816 |
--- a/widget/gtk/nsFilePicker.cpp |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
1817 |
+++ b/widget/gtk/nsFilePicker.cpp |
837 | 1818 |
@@ -4,32 +4,34 @@ |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
1819 |
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1820 |
|
703 | 1821 |
#include "mozilla/Types.h" |
837 | 1822 |
#include <sys/types.h> |
1823 |
#include <sys/stat.h> |
|
1824 |
#include <unistd.h> |
|
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1825 |
|
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1826 |
#include <gtk/gtk.h> |
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1827 |
+#include <gdk/gdkx.h> |
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1828 |
|
680 | 1829 |
#include "nsGtkUtils.h" |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1830 |
#include "nsIFileURL.h" |
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1831 |
#include "nsIURI.h" |
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1832 |
#include "nsIWidget.h" |
515 | 1833 |
#include "nsIFile.h" |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1834 |
#include "nsIStringBundle.h" |
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1835 |
|
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1836 |
#include "nsArrayEnumerator.h" |
606
9d39369e1b4c
FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
596
diff
changeset
|
1837 |
#include "nsMemory.h" |
9d39369e1b4c
FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
596
diff
changeset
|
1838 |
#include "nsEnumeratorUtils.h" |
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
294
diff
changeset
|
1839 |
#include "nsNetUtil.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1840 |
#include "nsReadableUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1841 |
#include "mozcontainer.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1842 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1843 |
#include "nsFilePicker.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1844 |
+#include "nsKDEUtils.h" |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1845 |
|
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1846 |
using namespace mozilla; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1847 |
|
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
1848 |
#define MAX_PREVIEW_SIZE 180 |
881 | 1849 |
// bug 1184009 |
1850 |
#define MAX_PREVIEW_SOURCE_SIZE 4096 |
|
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1851 |
|
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
1852 |
nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr; |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1853 |
@@ -227,17 +229,19 @@ nsFilePicker::AppendFilters(int32_t aFil |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1854 |
mAllowURLs = !!(aFilterMask & filterAllowURLs); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1855 |
return nsBaseFilePicker::AppendFilters(aFilterMask); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1856 |
} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1857 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1858 |
NS_IMETHODIMP |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1859 |
nsFilePicker::AppendFilter(const nsAString &aTitle, const nsAString &aFilter) { |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1860 |
if (aFilter.EqualsLiteral("..apps")) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1861 |
// No platform specific thing we can do here, really.... |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1862 |
- return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1863 |
+ // Unless it's KDE. |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1864 |
+ if( mMode != modeOpen || !nsKDEUtils::kdeSupport()) |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1865 |
+ return NS_OK; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1866 |
} |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1867 |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1868 |
nsAutoCString filter, name; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1869 |
CopyUTF16toUTF8(aFilter, filter); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1870 |
CopyUTF16toUTF8(aTitle, name); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1871 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1872 |
mFilters.AppendElement(filter); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1873 |
mFilterNames.AppendElement(name); |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1874 |
@@ -337,16 +341,39 @@ nsresult nsFilePicker::Show(int16_t *aRe |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1875 |
return NS_OK; |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1876 |
} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1877 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1878 |
NS_IMETHODIMP |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1879 |
nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) { |
589 | 1880 |
// Can't show two dialogs concurrently with the same filepicker |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1881 |
if (mRunning) return NS_ERROR_NOT_AVAILABLE; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1882 |
|
589 | 1883 |
+ // KDE file picker is not handled via callback |
1884 |
+ if( nsKDEUtils::kdeSupport()) { |
|
1885 |
+ mCallback = aCallback; |
|
1886 |
+ mRunning = true; |
|
1013
a71985fab8e5
Bug 1069962 Tumbleweed: OpenSuse's Firefox version crashes when "cancel" pressed in "File Upload" dialogue, e.g. TYPO3, BUGZILLA
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1007
diff
changeset
|
1887 |
+ NS_ADDREF_THIS(); |
999
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1888 |
+ g_idle_add([](gpointer data) -> gboolean { |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1889 |
+ nsFilePicker* queuedPicker = (nsFilePicker*) data; |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1890 |
+ int16_t result; |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1891 |
+ queuedPicker->kdeFileDialog(&result); |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1892 |
+ if (queuedPicker->mCallback) { |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1893 |
+ queuedPicker->mCallback->Done(result); |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1894 |
+ queuedPicker->mCallback = nullptr; |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1895 |
+ } else { |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1896 |
+ queuedPicker->mResult = result; |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1897 |
+ } |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1898 |
+ queuedPicker->mRunning = false; |
1014
963651ec972e
real fix for Bug 1069962 - Tumbleweed: OpenSuse's Firefox version crashes when "cancel" pressed in "File Upload" dialogue, e.g. TYPO3, BUGZILLA
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1013
diff
changeset
|
1899 |
+ NS_RELEASE(queuedPicker); |
999
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1900 |
+ return G_SOURCE_REMOVE; |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1901 |
+ }, this); |
932b3ad009d5
improve KDE patch:
Ignaz Forster <ignaz.forster@muenchen.de>
parents:
994
diff
changeset
|
1902 |
+ |
589 | 1903 |
+ return NS_OK; |
1904 |
+ } |
|
399
20f8b5f0aea6
port KDE patches to Gecko 11
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
398
diff
changeset
|
1905 |
+ |
1005 | 1906 |
nsCString title; |
589 | 1907 |
title.Adopt(ToNewUTF8String(mTitle)); |
1908 |
||
606
9d39369e1b4c
FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
596
diff
changeset
|
1909 |
GtkWindow *parent_widget = |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
1910 |
GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1911 |
|
589 | 1912 |
GtkFileChooserAction action = GetGtkFileChooserAction(mMode); |
932 | 1913 |
|
1093 | 1914 |
@@ -572,16 +599,240 @@ void nsFilePicker::Done(void *file_choos |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
1915 |
mCallback->Done(result); |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
1916 |
mCallback = nullptr; |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
1917 |
} else { |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
1918 |
mResult = result; |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
1919 |
} |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
1920 |
NS_RELEASE_THIS(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1921 |
} |
1082 | 1922 |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1923 |
+nsCString nsFilePicker::kdeMakeFilter( int index ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1924 |
+ { |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1925 |
+ nsCString buf = mFilters[ index ]; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1926 |
+ for( PRUint32 i = 0; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1927 |
+ i < buf.Length(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1928 |
+ ++i ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1929 |
+ if( buf[ i ] == ';' ) // KDE separates just using spaces |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1930 |
+ buf.SetCharAt( ' ', i ); |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1931 |
+ if (!mFilterNames[index].IsEmpty()) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1932 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1933 |
+ buf += "|"; |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1934 |
+ buf += mFilterNames[index].get(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1935 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1936 |
+ return buf; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1937 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1938 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1939 |
+static PRInt32 windowToXid( nsIWidget* widget ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1940 |
+ { |
609 | 1941 |
+ GtkWindow *parent_widget = GTK_WINDOW(widget->GetNativeData(NS_NATIVE_SHELLWIDGET)); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1942 |
+ GdkWindow* gdk_window = gtk_widget_get_window( gtk_widget_get_toplevel( GTK_WIDGET( parent_widget ))); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1943 |
+ return GDK_WINDOW_XID( gdk_window ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1944 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1945 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1946 |
+NS_IMETHODIMP nsFilePicker::kdeFileDialog(PRInt16 *aReturn) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1947 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1948 |
+ NS_ENSURE_ARG_POINTER(aReturn); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1949 |
+ |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
1950 |
+ if( mMode == modeOpen && mFilters.Length() == 1 && mFilters[ 0 ].EqualsLiteral( "..apps" )) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1951 |
+ return kdeAppsDialog( aReturn ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1952 |
+ |
1007
65e317e42eff
fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
1953 |
+ nsCString title; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1954 |
+ title.Adopt(ToNewUTF8String(mTitle)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1955 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1956 |
+ const char* arg = NULL; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1957 |
+ if( mAllowURLs ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1958 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1959 |
+ switch( mMode ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1960 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1961 |
+ case nsIFilePicker::modeOpen: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1962 |
+ case nsIFilePicker::modeOpenMultiple: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1963 |
+ arg = "GETOPENURL"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1964 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1965 |
+ case nsIFilePicker::modeSave: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1966 |
+ arg = "GETSAVEURL"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1967 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1968 |
+ case nsIFilePicker::modeGetFolder: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1969 |
+ arg = "GETDIRECTORYURL"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1970 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1971 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1972 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1973 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1974 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1975 |
+ switch( mMode ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1976 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1977 |
+ case nsIFilePicker::modeOpen: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1978 |
+ case nsIFilePicker::modeOpenMultiple: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1979 |
+ arg = "GETOPENFILENAME"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1980 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1981 |
+ case nsIFilePicker::modeSave: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1982 |
+ arg = "GETSAVEFILENAME"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1983 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1984 |
+ case nsIFilePicker::modeGetFolder: |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1985 |
+ arg = "GETDIRECTORYFILENAME"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1986 |
+ break; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1987 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1988 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1989 |
+ |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1990 |
+ nsAutoCString directory; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1991 |
+ if (mDisplayDirectory) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1992 |
+ mDisplayDirectory->GetNativePath(directory); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1993 |
+ } else if (mPrevDisplayDirectory) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1994 |
+ mPrevDisplayDirectory->GetNativePath(directory); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1995 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1996 |
+ |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
1997 |
+ nsAutoCString startdir; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1998 |
+ if (!directory.IsEmpty()) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1999 |
+ startdir = directory; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2000 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2001 |
+ if (mMode == nsIFilePicker::modeSave) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2002 |
+ if( !startdir.IsEmpty()) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2003 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2004 |
+ startdir += "/"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2005 |
+ startdir += ToNewUTF8String(mDefault); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2006 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2007 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2008 |
+ startdir = ToNewUTF8String(mDefault); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2009 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2010 |
+ |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
2011 |
+ nsAutoCString filters; |
10
1920f0ff04a3
Make mozilla-kde.patch compile with 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
9
diff
changeset
|
2012 |
+ PRInt32 count = mFilters.Length(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2013 |
+ if( count == 0 ) //just in case |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2014 |
+ filters = "*"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2015 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2016 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2017 |
+ filters = kdeMakeFilter( 0 ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2018 |
+ for (PRInt32 i = 1; i < count; ++i) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2019 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2020 |
+ filters += "\n"; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2021 |
+ filters += kdeMakeFilter( i ); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2022 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2023 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2024 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2025 |
+ nsTArray<nsCString> command; |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
2026 |
+ command.AppendElement( nsAutoCString( arg )); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2027 |
+ command.AppendElement( startdir ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2028 |
+ if( mMode != nsIFilePicker::modeGetFolder ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2029 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2030 |
+ command.AppendElement( filters ); |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
2031 |
+ nsAutoCString selected; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2032 |
+ selected.AppendInt( mSelectedType ); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2033 |
+ command.AppendElement( selected ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2034 |
+ } |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2035 |
+ command.AppendElement( title ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2036 |
+ if( mMode == nsIFilePicker::modeOpenMultiple ) |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2037 |
+ command.AppendElement( NS_LITERAL_CSTRING( "MULTIPLE" )); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2038 |
+ if( PRInt32 xid = windowToXid( mParentWidget )) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2039 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2040 |
+ command.AppendElement( NS_LITERAL_CSTRING( "PARENT" )); |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
2041 |
+ nsAutoCString parent; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2042 |
+ parent.AppendInt( xid ); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2043 |
+ command.AppendElement( parent ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2044 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2045 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2046 |
+ nsTArray<nsCString> output; |
609 | 2047 |
+ if( nsKDEUtils::commandBlockUi( command, GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)), &output )) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2048 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2049 |
+ *aReturn = nsIFilePicker::returnOK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2050 |
+ mFiles.Clear(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2051 |
+ if( mMode != nsIFilePicker::modeGetFolder ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2052 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2053 |
+ mSelectedType = atoi( output[ 0 ].get()); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2054 |
+ output.RemoveElementAt( 0 ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2055 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2056 |
+ if (mMode == nsIFilePicker::modeOpenMultiple) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2057 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2058 |
+ mFileURL.Truncate(); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2059 |
+ PRUint32 count = output.Length(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2060 |
+ for( PRUint32 i = 0; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2061 |
+ i < count; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2062 |
+ ++i ) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2063 |
+ { |
515 | 2064 |
+ nsCOMPtr<nsIFile> localfile; |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2065 |
+ nsresult rv = NS_NewNativeLocalFile( output[ i ], |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2066 |
+ PR_FALSE, |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2067 |
+ getter_AddRefs(localfile)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2068 |
+ if (NS_SUCCEEDED(rv)) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2069 |
+ mFiles.AppendObject(localfile); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2070 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2071 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2072 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2073 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2074 |
+ if( output.Length() == 0 ) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2075 |
+ mFileURL = nsCString(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2076 |
+ else if( mAllowURLs ) |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2077 |
+ mFileURL = output[ 0 ]; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2078 |
+ else // GetFile() actually requires it to be url even for local files :-/ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2079 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2080 |
+ mFileURL = nsCString( "file://" ); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2081 |
+ mFileURL.Append( output[ 0 ] ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2082 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2083 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2084 |
+ // Remember last used directory. |
515 | 2085 |
+ nsCOMPtr<nsIFile> file; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2086 |
+ GetFile(getter_AddRefs(file)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2087 |
+ if (file) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2088 |
+ nsCOMPtr<nsIFile> dir; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2089 |
+ file->GetParent(getter_AddRefs(dir)); |
515 | 2090 |
+ nsCOMPtr<nsIFile> localDir(do_QueryInterface(dir)); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2091 |
+ if (localDir) { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2092 |
+ localDir.swap(mPrevDisplayDirectory); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2093 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2094 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2095 |
+ if (mMode == nsIFilePicker::modeSave) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2096 |
+ { |
515 | 2097 |
+ nsCOMPtr<nsIFile> file; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2098 |
+ GetFile(getter_AddRefs(file)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2099 |
+ if (file) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2100 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2101 |
+ bool exists = false; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2102 |
+ file->Exists(&exists); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2103 |
+ if (exists) // TODO do overwrite check in the helper app |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2104 |
+ *aReturn = nsIFilePicker::returnReplace; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2105 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2106 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2107 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2108 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2109 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2110 |
+ *aReturn = nsIFilePicker::returnCancel; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2111 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2112 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2113 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2114 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2115 |
+ |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2116 |
+NS_IMETHODIMP nsFilePicker::kdeAppsDialog(PRInt16 *aReturn) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2117 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2118 |
+ NS_ENSURE_ARG_POINTER(aReturn); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2119 |
+ |
1007
65e317e42eff
fixed KDE custom code and replaced obsolete types
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1006
diff
changeset
|
2120 |
+ nsCString title; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2121 |
+ title.Adopt(ToNewUTF8String(mTitle)); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2122 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2123 |
+ nsTArray<nsCString> command; |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2124 |
+ command.AppendElement( NS_LITERAL_CSTRING( "APPSDIALOG" )); |
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2125 |
+ command.AppendElement( title ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2126 |
+ if( PRInt32 xid = windowToXid( mParentWidget )) |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2127 |
+ { |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2128 |
+ command.AppendElement( NS_LITERAL_CSTRING( "PARENT" )); |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
546
diff
changeset
|
2129 |
+ nsAutoCString parent; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2130 |
+ parent.AppendInt( xid ); |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2131 |
+ command.AppendElement( parent ); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2132 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2133 |
+ |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2134 |
+ nsTArray<nsCString> output; |
609 | 2135 |
+ if( nsKDEUtils::commandBlockUi( command, GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET)), &output )) |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2136 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2137 |
+ *aReturn = nsIFilePicker::returnOK; |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2138 |
+ mFileURL = output.Length() > 0 ? output[ 0 ] : nsCString(); |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2139 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2140 |
+ else |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2141 |
+ { |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2142 |
+ *aReturn = nsIFilePicker::returnCancel; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2143 |
+ } |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2144 |
+ return NS_OK; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2145 |
+ } |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
538
diff
changeset
|
2146 |
+ |
1082 | 2147 |
// All below functions available as of GTK 3.20+ |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2148 |
void *nsFilePicker::GtkFileChooserNew(const gchar *title, GtkWindow *parent, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2149 |
GtkFileChooserAction action, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2150 |
const gchar *accept_label) { |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2151 |
static auto sGtkFileChooserNativeNewPtr = |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2152 |
(void *(*)(const gchar *, GtkWindow *, GtkFileChooserAction, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2153 |
const gchar *, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2154 |
const gchar *))dlsym(RTLD_DEFAULT, |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
2155 |
diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
2156 |
--- a/widget/gtk/nsFilePicker.h |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
2157 |
+++ b/widget/gtk/nsFilePicker.h |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2158 |
@@ -67,16 +67,22 @@ class nsFilePicker : public nsBaseFilePi |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2159 |
nsString mDefaultExtension; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2160 |
|
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2161 |
nsTArray<nsCString> mFilters; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2162 |
nsTArray<nsCString> mFilterNames; |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2163 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2164 |
private: |
515 | 2165 |
static nsIFile *mPrevDisplayDirectory; |
881 | 2166 |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2167 |
+ bool kdeRunning(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2168 |
+ bool getKdeRunning(); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2169 |
+ NS_IMETHODIMP kdeFileDialog(PRInt16 *aReturn); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2170 |
+ NS_IMETHODIMP kdeAppsDialog(PRInt16 *aReturn); |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2171 |
+ nsCString kdeMakeFilter( int index ); |
881 | 2172 |
+ |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2173 |
void *GtkFileChooserNew(const gchar *title, GtkWindow *parent, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2174 |
GtkFileChooserAction action, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2175 |
const gchar *accept_label); |
1082 | 2176 |
void GtkFileChooserShow(void *file_chooser); |
2177 |
void GtkFileChooserDestroy(void *file_chooser); |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2178 |
void GtkFileChooserSetModal(void *file_chooser, GtkWindow *parent_widget, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2179 |
gboolean modal); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2180 |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
2181 |
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
2182 |
--- a/xpcom/components/ManifestParser.cpp |
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
2183 |
+++ b/xpcom/components/ManifestParser.cpp |
979 | 2184 |
@@ -33,16 +33,17 @@ |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
2185 |
#include "nsTextFormatter.h" |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
2186 |
#include "nsVersionComparator.h" |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
2187 |
#include "nsXPCOMCIDInternal.h" |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2188 |
|
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2189 |
#include "nsIConsoleService.h" |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2190 |
#include "nsIScriptError.h" |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2191 |
#include "nsIXULAppInfo.h" |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2192 |
#include "nsIXULRuntime.h" |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2193 |
+#include "nsKDEUtils.h" |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2194 |
|
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
2195 |
using namespace mozilla; |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
2196 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2197 |
struct ManifestDirective { |
935
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
2198 |
const char* directive; |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
2199 |
int argc; |
9ae2b79d3bb1
prepare FF 51 -> 51.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
932
diff
changeset
|
2200 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2201 |
bool ischrome; |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2202 |
@@ -392,16 +393,17 @@ void ParseManifest(NSLocationType aType, |
850 | 2203 |
NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled"); |
2204 |
NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired"); |
|
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2205 |
NS_NAMED_LITERAL_STRING(kApplication, "application"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2206 |
NS_NAMED_LITERAL_STRING(kAppVersion, "appversion"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2207 |
NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2208 |
NS_NAMED_LITERAL_STRING(kOs, "os"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2209 |
NS_NAMED_LITERAL_STRING(kOsVersion, "osversion"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2210 |
NS_NAMED_LITERAL_STRING(kABI, "abi"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2211 |
+ NS_NAMED_LITERAL_STRING(kDesktop, "desktop"); |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2212 |
NS_NAMED_LITERAL_STRING(kProcess, "process"); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2213 |
#if defined(MOZ_WIDGET_ANDROID) |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2214 |
NS_NAMED_LITERAL_STRING(kTablet, "tablet"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2215 |
#endif |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2216 |
|
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2217 |
NS_NAMED_LITERAL_STRING(kMain, "main"); |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2218 |
NS_NAMED_LITERAL_STRING(kContent, "content"); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2219 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2220 |
@@ -447,39 +449,44 @@ void ParseManifest(NSLocationType aType, |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2221 |
CopyUTF8toUTF16(s, abi); |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
2222 |
abi.Insert(char16_t('_'), 0); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2223 |
abi.Insert(osTarget, 0); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2224 |
} |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2225 |
} |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2226 |
} |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2227 |
|
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2228 |
nsAutoString osVersion; |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2229 |
+ nsAutoString desktop; |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2230 |
#if defined(XP_WIN) |
1089 | 2231 |
# pragma warning(push) |
2232 |
# pragma warning(disable : 4996) // VC12+ deprecates GetVersionEx |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2233 |
OSVERSIONINFO info = {sizeof(OSVERSIONINFO)}; |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2234 |
if (GetVersionEx(&info)) { |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2235 |
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", info.dwMajorVersion, |
779 | 2236 |
info.dwMinorVersion); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2237 |
} |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2238 |
+ desktop = NS_LITERAL_STRING("win"); |
1089 | 2239 |
# pragma warning(pop) |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2240 |
#elif defined(MOZ_WIDGET_COCOA) |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
2241 |
SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
2242 |
SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor(); |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2243 |
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", majorVersion, minorVersion); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2244 |
+ desktop = NS_LITERAL_STRING("macosx"); |
659 | 2245 |
#elif defined(MOZ_WIDGET_GTK) |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2246 |
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", gtk_major_version, |
779 | 2247 |
gtk_minor_version); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2248 |
+ desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2249 |
#elif defined(MOZ_WIDGET_ANDROID) |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2250 |
bool isTablet = false; |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2251 |
if (mozilla::AndroidBridge::Bridge()) { |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2252 |
mozilla::AndroidBridge::Bridge()->GetStaticStringField( |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2253 |
"android/os/Build$VERSION", "RELEASE", osVersion); |
932 | 2254 |
isTablet = java::GeckoAppShell::IsTablet(); |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2255 |
} |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2256 |
+ desktop = NS_LITERAL_STRING("android"); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2257 |
#endif |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2258 |
|
885 | 2259 |
if (XRE_IsContentProcess()) { |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2260 |
process = kContent; |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2261 |
} else { |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2262 |
process = kMain; |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2263 |
} |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2264 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2265 |
@@ -566,25 +573,27 @@ void ParseManifest(NSLocationType aType, |
850 | 2266 |
TriState stOsVersion = eUnspecified; |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2267 |
TriState stOs = eUnspecified; |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2268 |
TriState stABI = eUnspecified; |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2269 |
TriState stProcess = eUnspecified; |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2270 |
#if defined(MOZ_WIDGET_ANDROID) |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2271 |
TriState stTablet = eUnspecified; |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2272 |
#endif |
850 | 2273 |
int flags = 0; |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2274 |
+ TriState stDesktop = eUnspecified; |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2275 |
|
779 | 2276 |
while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && |
2277 |
ok) { |
|
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2278 |
ToLowerCase(token); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2279 |
NS_ConvertASCIItoUTF16 wtoken(token); |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2280 |
|
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2281 |
if (CheckStringFlag(kApplication, wtoken, appID, stApp) || |
985 | 2282 |
CheckOsFlag(kOs, wtoken, osTarget, stOs) || |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2283 |
CheckStringFlag(kABI, wtoken, abi, stABI) || |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2284 |
+ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
779
diff
changeset
|
2285 |
CheckStringFlag(kProcess, wtoken, process, stProcess) || |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2286 |
CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2287 |
CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) || |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2288 |
CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2289 |
stGeckoVersion)) { |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2290 |
continue; |
779 | 2291 |
} |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2292 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2293 |
@@ -621,17 +630,17 @@ void ParseManifest(NSLocationType aType, |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2294 |
} |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2295 |
|
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2296 |
LogMessageWithContext( |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2297 |
aFile, line, "Unrecognized chrome manifest modifier '%s'.", token); |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2298 |
ok = false; |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2299 |
} |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2300 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2301 |
if (!ok || stApp == eBad || stAppVersion == eBad || |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2302 |
- stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad || |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2303 |
+ stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad || stDesktop == eBad || |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2304 |
#ifdef MOZ_WIDGET_ANDROID |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2305 |
stTablet == eBad || |
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2306 |
#endif |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2307 |
stABI == eBad || stProcess == eBad) { |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2308 |
continue; |
779 | 2309 |
} |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
409
diff
changeset
|
2310 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2311 |
if (directive->regfunc) { |
779 | 2312 |
diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
2313 |
--- a/xpcom/components/moz.build |
|
2314 |
+++ b/xpcom/components/moz.build |
|
1093 | 2315 |
@@ -66,14 +66,15 @@ LOCAL_INCLUDES += [ |
904 | 2316 |
'!..', |
779 | 2317 |
'../base', |
2318 |
'../build', |
|
2319 |
'../ds', |
|
2320 |
'/chrome', |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2321 |
'/js/xpconnect/loader', |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2322 |
'/layout/build', |
779 | 2323 |
'/modules/libjar', |
1055
526f445635f3
removed obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1050
diff
changeset
|
2324 |
+ '/toolkit/xre', |
779 | 2325 |
] |
2326 |
||
923 | 2327 |
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
779 | 2328 |
CXXFLAGS += CONFIG['TK_CFLAGS'] |
1093 | 2329 |
|
2330 |
include('/ipc/chromium/chromium-config.mozbuild') |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2331 |
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2332 |
--- a/xpcom/io/nsLocalFileUnix.cpp |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2333 |
+++ b/xpcom/io/nsLocalFileUnix.cpp |
1067 | 2334 |
@@ -47,16 +47,17 @@ |
850 | 2335 |
#include "prproces.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2336 |
#include "nsIDirectoryEnumerator.h" |
1074
4b99400f6d17
rebased patches and updated spec for 63.0b14
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
2337 |
#include "nsSimpleEnumerator.h" |
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2338 |
#include "private/pprio.h" |
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
2339 |
#include "prlink.h" |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2340 |
|
515 | 2341 |
#ifdef MOZ_WIDGET_GTK |
1089 | 2342 |
# include "nsIGIOService.h" |
2343 |
+# include "nsKDEUtils.h" |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2344 |
#endif |
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2345 |
|
367
3fabd9f66322
begin Firefox 10 cycle
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
356
diff
changeset
|
2346 |
#ifdef MOZ_WIDGET_COCOA |
1089 | 2347 |
# include <Carbon/Carbon.h> |
2348 |
# include "CocoaFileUtils.h" |
|
2349 |
# include "prmem.h" |
|
2350 |
# include "plbase64.h" |
|
127
4c86470ed796
Reenabling KDE integration patches (part 1: rebase and reenable; might need post-fixes)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
64
diff
changeset
|
2351 |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2352 |
@@ -1902,62 +1903,77 @@ nsLocalFile::SetPersistentDescriptor(con |
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2353 |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2354 |
NS_IMETHODIMP |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2355 |
nsLocalFile::Reveal() { |
1067 | 2356 |
if (!FilePreferences::IsAllowedPath(mPath)) { |
2357 |
return NS_ERROR_FILE_ACCESS_DENIED; |
|
2358 |
} |
|
2359 |
||
515 | 2360 |
#ifdef MOZ_WIDGET_GTK |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2361 |
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); |
850 | 2362 |
- if (!giovfs) { |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2363 |
- return NS_ERROR_FAILURE; |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2364 |
- } |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2365 |
+ nsAutoCString url; |
850 | 2366 |
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2367 |
bool isDirectory; |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2368 |
if (NS_FAILED(IsDirectory(&isDirectory))) { |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2369 |
return NS_ERROR_FAILURE; |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2370 |
} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2371 |
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2372 |
+ nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2373 |
if (isDirectory) { |
850 | 2374 |
- return giovfs->ShowURIForInput(mPath); |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2375 |
+ url = mPath; |
979 | 2376 |
} |
2377 |
if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) { |
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2378 |
return NS_OK; |
979 | 2379 |
} |
2380 |
nsCOMPtr<nsIFile> parentDir; |
|
2381 |
nsAutoCString dirPath; |
|
2382 |
if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) { |
|
2383 |
return NS_ERROR_FAILURE; |
|
2384 |
} |
|
2385 |
if (NS_FAILED(parentDir->GetNativePath(dirPath))) { |
|
2386 |
return NS_ERROR_FAILURE; |
|
2387 |
} |
|
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2388 |
|
979 | 2389 |
- return giovfs->ShowURIForInput(dirPath); |
2390 |
+ url = dirPath; |
|
2391 |
#elif defined(MOZ_WIDGET_COCOA) |
|
2392 |
CFURLRef url; |
|
2393 |
if (NS_SUCCEEDED(GetCFURL(&url))) { |
|
2394 |
nsresult rv = CocoaFileUtils::RevealFileInFinder(url); |
|
2395 |
::CFRelease(url); |
|
2396 |
return rv; |
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2397 |
} |
979 | 2398 |
return NS_ERROR_FAILURE; |
2399 |
#else |
|
2400 |
return NS_ERROR_FAILURE; |
|
2401 |
#endif |
|
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2402 |
+ if(nsKDEUtils::kdeSupport()) { |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2403 |
+ nsTArray<nsCString> command; |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2404 |
+ command.AppendElement( NS_LITERAL_CSTRING("REVEAL") ); |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2405 |
+ command.AppendElement( mPath ); |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2406 |
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2407 |
+ } |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2408 |
+ |
850 | 2409 |
+ if (!giovfs) |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2410 |
+ return NS_ERROR_FAILURE; |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2411 |
+ |
850 | 2412 |
+ return giovfs->ShowURIForInput(url); |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
2413 |
} |
9
bc5dfe5b853a
Rebased KDE integration patches to 1.9.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2414 |
|
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
2415 |
NS_IMETHODIMP |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1082
diff
changeset
|
2416 |
nsLocalFile::Launch() { |
1067 | 2417 |
if (!FilePreferences::IsAllowedPath(mPath)) { |
2418 |
return NS_ERROR_FILE_ACCESS_DENIED; |
|
2419 |
} |
|
2420 |
||
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
2421 |
#ifdef MOZ_WIDGET_GTK |
748
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2422 |
+ if( nsKDEUtils::kdeSupport()) { |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2423 |
+ nsTArray<nsCString> command; |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2424 |
+ command.AppendElement( NS_LITERAL_CSTRING("OPEN") ); |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2425 |
+ command.AppendElement( mPath ); |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2426 |
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2427 |
+ } |
72ba5129e5fd
full rebase to Aurora 32
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
738
diff
changeset
|
2428 |
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); |
850 | 2429 |
if (!giovfs) { |
2430 |
return NS_ERROR_FAILURE; |
|
2431 |
} |
|
2432 |
||
2433 |
return giovfs->ShowURIForInput(mPath); |
|
1032
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
2434 |
#elif defined(MOZ_WIDGET_ANDROID) |
8220ea23b47d
remove obsolete patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1021
diff
changeset
|
2435 |
// Try to get a mimetype, if this fails just use the file uri alone |