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