/[packages]/cauldron/firefox/current/SOURCES/firefox-kde.patch
ViewVC logotype

Contents of /cauldron/firefox/current/SOURCES/firefox-kde.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 20612 - (show annotations) (download)
Sun Jan 16 22:32:37 2011 UTC (13 years, 3 months ago) by blino
File size: 50426 byte(s) 
imported package firefox
1 diff -Naurp mozilla-1.9.2/browser/app/Makefile.in mozilla-1.9.2.oden/browser/app/Makefile.in
2 --- mozilla-1.9.2/browser/app/Makefile.in 2010-04-14 00:21:35.000000000 +0200
3 +++ mozilla-1.9.2.oden/browser/app/Makefile.in 2010-04-20 19:48:54.882293252 +0200
4 @@ -49,6 +49,7 @@ DIRS = profile/extensions
5
6 PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
7 $(srcdir)/profile/channel-prefs.js \
8 + $(srcdir)/profile/kde.js \
9 $(NULL)
10
11
12 diff -Naurp mozilla-1.9.2/browser/base/content/browser-kde.xul mozilla-1.9.2.oden/browser/base/content/browser-kde.xul
13 --- mozilla-1.9.2/browser/base/content/browser-kde.xul 1970-01-01 01:00:00.000000000 +0100
14 +++ mozilla-1.9.2.oden/browser/base/content/browser-kde.xul 2010-04-20 19:48:54.883272072 +0200
15 @@ -0,0 +1,643 @@
16 +#filter substitution
17 +<?xml version="1.0"?>
18 +# -*- Mode: HTML -*-
19 +#
20 +# ***** BEGIN LICENSE BLOCK *****
21 +# Version: MPL 1.1/GPL 2.0/LGPL 2.1
22 +#
23 +# The contents of this file are subject to the Mozilla Public License Version
24 +# 1.1 (the "License"); you may not use this file except in compliance with
25 +# the License. You may obtain a copy of the License at
26 +# http://www.mozilla.org/MPL/
27 +#
28 +# Software distributed under the License is distributed on an "AS IS" basis,
29 +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
30 +# for the specific language governing rights and limitations under the
31 +# License.
32 +#
33 +# The Original Code is Mozilla Communicator client code, released
34 +# March 31, 1998.
35 +#
36 +# The Initial Developer of the Original Code is
37 +# Netscape Communications Corporation.
38 +# Portions created by the Initial Developer are Copyright (C) 1998-2000
39 +# the Initial Developer. All Rights Reserved.
40 +#
41 +# Contributor(s):
42 +# Blake Ross <blake@cs.stanford.edu>
43 +# David Hyatt <hyatt@mozilla.org>
44 +# Joe Hewitt <hewitt@netscape.com>
45 +# Pierre Chanial <chanial@noos.fr>
46 +# Dean Tessman <dean_tessman@hotmail.com>
47 +# Johnathan Nightingale <johnath@mozilla.com>
48 +# Dão Gottwald <dao@mozilla.com>
49 +# Ehsan Akhgari <ehsan.akhgari@gmail.com>
50 +# Robert Strong <robert.bugzilla@gmail.com>
51 +#
52 +# Alternatively, the contents of this file may be used under the terms of
53 +# either the GNU General Public License Version 2 or later (the "GPL"), or
54 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
55 +# in which case the provisions of the GPL or the LGPL are applicable instead
56 +# of those above. If you wish to allow use of your version of this file only
57 +# under the terms of either the GPL or the LGPL, and not to allow others to
58 +# use your version of this file under the terms of the MPL, indicate your
59 +# decision by deleting the provisions above and replace them with the notice
60 +# and other provisions required by the GPL or the LGPL. If you do not delete
61 +# the provisions above, a recipient may use your version of this file under
62 +# the terms of any one of the MPL, the GPL or the LGPL.
63 +#
64 +# ***** END LICENSE BLOCK *****
65 +
66 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
67 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
68 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
69 +
70 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
71 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
72 +<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
73 +
74 +# All DTD information is stored in a separate file so that it can be shared by
75 +# hiddenWindow.xul.
76 +#include browser-doctype.inc
77 +
78 +<window id="main-window"
79 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
80 + xmlns:svg="http://www.w3.org/2000/svg"
81 + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
82 + onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();"
83 + title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
84 + title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
85 +#ifdef XP_MACOSX
86 + title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
87 + titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
88 + titlemodifier=""
89 + titlemodifier_normal=""
90 + titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
91 +#else
92 + title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
93 + titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
94 + titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
95 + titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
96 +#endif
97 + titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
98 + lightweightthemes="true"
99 + lightweightthemesfooter="browser-bottombox"
100 + windowtype="navigator:browser"
101 + screenX="4" screenY="4"
102 + browsingmode="normal"
103 + toggletoolbar="true"
104 + persist="screenX screenY width height sizemode">
105 +
106 +# All JS files which are not content (only) dependent that browser.xul
107 +# wishes to include *must* go into the global-scripts.inc file
108 +# so that they can be shared by macBrowserOverlay.xul.
109 +#include global-scripts.inc
110 +<script type="application/x-javascript" src="chrome://browser/content/nsContextMenu.js"/>
111 +
112 +#ifdef MOZ_SAFE_BROWSING
113 +<script type="application/x-javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/>
114 +#endif
115 +<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
116 +
117 +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
118 +
119 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
120 +# browser-sets.inc file for sharing with hiddenWindow.xul.
121 +#include browser-sets.inc
122 +
123 + <popupset id="mainPopupSet">
124 + <menupopup id="backForwardMenu"
125 + onpopupshowing="return FillHistoryMenu(event.target);"
126 + oncommand="gotoHistoryIndex(event);"
127 + onclick="checkForMiddleClick(this, event);"/>
128 + <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/>
129 +
130 + <!-- for search and content formfill/pw manager -->
131 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
132 +
133 + <!-- for url bar autocomplete -->
134 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
135 +
136 + <panel id="editBookmarkPanel"
137 + orient="vertical"
138 + ignorekeys="true"
139 + hidden="true"
140 + onpopupshown="StarUI.panelShown(event);"
141 + aria-labelledby="editBookmarkPanelTitle">
142 + <row id="editBookmarkPanelHeader" align="center" hidden="true">
143 + <vbox align="center">
144 + <image id="editBookmarkPanelStarIcon"/>
145 + </vbox>
146 + <vbox>
147 + <label id="editBookmarkPanelTitle"/>
148 + <description id="editBookmarkPanelDescription"/>
149 + <hbox>
150 + <button id="editBookmarkPanelUndoRemoveButton"
151 + class="editBookmarkPanelHeaderButton"
152 + hidden="true"
153 + oncommand="StarUI.undoRemoveBookmarkCommand();"
154 + label="&editBookmark.undo.label;"
155 + accesskey="&editBookmark.undo.accessKey;"/>
156 + <button id="editBookmarkPanelRemoveButton"
157 + class="editBookmarkPanelHeaderButton"
158 + oncommand="StarUI.removeBookmarkButtonCommand();"
159 + accesskey="&editBookmark.removeBookmark.accessKey;"/>
160 + <button id="editBookmarkPanelEditButton"
161 + class="editBookmarkPanelHeaderButton"
162 + oncommand="StarUI.editButtonCommand();"
163 + label="&editBookmark.edit.label;"
164 + accesskey="&editBookmark.edit.accessKey;"/>
165 + </hbox>
166 + </vbox>
167 + </row>
168 + <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
169 + <hbox id="editBookmarkPanelBottomButtons" pack="end">
170 +#ifndef XP_UNIX
171 + <button id="editBookmarkPanelDoneButton"
172 + class="editBookmarkPanelBottomButton"
173 + label="&editBookmark.done.label;"
174 + default="true"
175 + oncommand="StarUI.panel.hidePopup();"/>
176 + <button id="editBookmarkPanelDeleteButton"
177 + class="editBookmarkPanelBottomButton"
178 + label="&editBookmark.cancel.label;"
179 + oncommand="StarUI.cancelButtonOnCommand();"/>
180 +#elif XP_UNIX_GNOME
181 + <button id="editBookmarkPanelDeleteButton"
182 + class="editBookmarkPanelBottomButton"
183 + label="&editBookmark.cancel.label;"
184 + oncommand="StarUI.cancelButtonOnCommand();"/>
185 + <button id="editBookmarkPanelDoneButton"
186 + class="editBookmarkPanelBottomButton"
187 + label="&editBookmark.done.label;"
188 + default="true"
189 + oncommand="StarUI.panel.hidePopup();"/>
190 +#else
191 + <button id="editBookmarkPanelDoneButton"
192 + label="&editBookmark.done.label;"
193 + default="true"
194 + oncommand="StarUI.panel.hidePopup();"/>
195 + <button id="editBookmarkPanelDeleteButton"
196 + label="&editBookmark.cancel.label;"
197 + oncommand="StarUI.cancelButtonOnCommand();"/>
198 +#endif
199 + </hbox>
200 + </panel>
201 +
202 + <popup id="toolbar-context-menu"
203 + onpopupshowing="onViewToolbarsPopupShowing(event);">
204 + <menuseparator/>
205 + <menuitem command="cmd_CustomizeToolbars"
206 + label="&viewCustomizeToolbar.label;"
207 + accesskey="&viewCustomizeToolbar.accesskey;"/>
208 + </popup>
209 +
210 + <popup id="blockedPopupOptions"
211 + onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
212 + <menuitem observes="blockedPopupAllowSite"/>
213 + <menuitem observes="blockedPopupEditSettings"/>
214 + <menuitem observes="blockedPopupDontShowMessage"/>
215 + <menuseparator observes="blockedPopupsSeparator"/>
216 + </popup>
217 +
218 + <menupopup id="autohide-context"
219 + onpopupshowing="FullScreen.getAutohide(this.firstChild);">
220 + <menuitem type="checkbox" label="&fullScreenAutohide.label;"
221 + accesskey="&fullScreenAutohide.accesskey;"
222 + oncommand="FullScreen.setAutohide();"/>
223 + <menuseparator/>
224 + <menuitem label="&fullScreenExit.label;"
225 + accesskey="&fullScreenExit.accesskey;"
226 + oncommand="BrowserFullScreen();"/>
227 + </menupopup>
228 +
229 + <popup id="contentAreaContextMenu"
230 + onpopupshowing="if (event.target != this) return true; updateEditUIVisibility(); gContextMenu = new nsContextMenu(this, window.getBrowser()); return gContextMenu.shouldDisplay;"
231 + onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }">
232 +#include browser-context.inc
233 + </popup>
234 +
235 + <popup id="placesContext"/>
236 +
237 + <!-- Popup for site identity information -->
238 + <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true"
239 + onpopupshown="document.getElementById('identity-popup-more-info-button').focus();"
240 + level="top">
241 + <hbox id="identity-popup-container" align="top">
242 + <image id="identity-popup-icon"/>
243 + <vbox id="identity-popup-content-box">
244 + <label id="identity-popup-connectedToLabel"
245 + class="identity-popup-label"
246 + value="&identity.connectedTo;"/>
247 + <label id="identity-popup-connectedToLabel2"
248 + class="identity-popup-label"
249 + value="&identity.unverifiedsite2;"/>
250 + <description id="identity-popup-content-host"
251 + class="identity-popup-description"/>
252 + <label id="identity-popup-runByLabel"
253 + class="identity-popup-label"
254 + value="&identity.runBy;"/>
255 + <description id="identity-popup-content-owner"
256 + class="identity-popup-description"/>
257 + <description id="identity-popup-content-supplemental"
258 + class="identity-popup-description"/>
259 + <description id="identity-popup-content-verifier"
260 + class="identity-popup-description"/>
261 + <hbox id="identity-popup-encryption" flex="1">
262 + <vbox>
263 + <image id="identity-popup-encryption-icon"/>
264 + </vbox>
265 + <description id="identity-popup-encryption-label" flex="1"
266 + class="identity-popup-description"/>
267 + </hbox>
268 + <!-- Footer button to open security page info -->
269 + <hbox pack="end">
270 + <button id="identity-popup-more-info-button"
271 + label="&identity.moreInfoLinkText;"
272 + onblur="gIdentityHandler.hideIdentityPopup();"
273 + oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
274 + </hbox>
275 + </vbox>
276 + </hbox>
277 + </panel>
278 +
279 + <tooltip id="urlTooltip">
280 + <label crop="center" flex="1" class="tooltip-label"/>
281 + </tooltip>
282 +
283 + <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
284 + <hbox>
285 + <button class="ctrlTab-preview" flex="1"/>
286 + <button class="ctrlTab-preview" flex="1"/>
287 + <button class="ctrlTab-preview" flex="1"/>
288 + <button class="ctrlTab-preview" flex="1"/>
289 + <button class="ctrlTab-preview" flex="1"/>
290 + <button class="ctrlTab-preview" flex="1"/>
291 + </hbox>
292 + <hbox pack="center">
293 + <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
294 + </hbox>
295 + </panel>
296 +
297 + <panel id="allTabs-panel" hidden="true" norestorefocus="true" ignorekeys="true"
298 +# XXX: KUI style disabled, because the transparent background slows down
299 +# interacting with the panel, esp. the search field.
300 +# class="KUI-panel"
301 + onmouseover="allTabs._updateTabCloseButton(event);">
302 + <hbox id="allTabs-meta" align="center">
303 + <spacer flex="1"/>
304 + <textbox id="allTabs-filter"
305 + tooltiptext="&allTabs.filter.emptyText;"
306 + type="search"
307 + oncommand="allTabs.filter();"/>
308 + <spacer flex="1"/>
309 + <toolbarbutton class="KUI-panel-closebutton"
310 + oncommand="allTabs.close()"
311 + tooltiptext="&closeCmd.label;"/>
312 + </hbox>
313 + <stack id="allTabs-stack">
314 + <box id="allTabs-container"/>
315 + <toolbarbutton id="allTabs-tab-close-button"
316 + class="tab-close-button"
317 + oncommand="allTabs.closeTab(event);"
318 + tooltiptext="&closeCmd.label;"
319 + style="visibility:hidden"/>
320 + </stack>
321 + </panel>
322 + </popupset>
323 +
324 + <!-- Bookmarks and history tooltip -->
325 + <tooltip id="bhTooltip"/>
326 +
327 + <toolbox id="navigator-toolbox" class="toolbox-top" mode="icons"
328 +#ifdef WINCE
329 + defaulticonsize="small" iconsize="small"
330 +#endif
331 + defaultmode="icons">
332 + <!-- Menu -->
333 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
334 + defaultset="menubar-items"
335 + mode="icons" iconsize="small" defaulticonsize="small"
336 +#ifdef XP_WIN
337 + toolbarname="&menubarCmd.label;"
338 + accesskey="&menubarCmd.accesskey;"
339 +#endif
340 + context="toolbar-context-menu">
341 + <toolbaritem id="menubar-items" align="center">
342 +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
343 +# hiddenWindow.xul.
344 +#include browser-menubar.inc
345 + </toolbaritem>
346 + </toolbar>
347 +
348 + <toolbarpalette id="BrowserToolbarPalette">
349 +
350 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
351 + context="backForwardMenu">
352 + <toolbarbutton id="back-button" class="toolbarbutton-1"
353 + label="&backCmd.label;"
354 + command="Browser:BackOrBackDuplicate"
355 + onclick="checkForMiddleClick(this, event);"
356 + tooltiptext="&backButton.tooltip;"/>
357 + <toolbarbutton id="forward-button" class="toolbarbutton-1"
358 + label="&forwardCmd.label;"
359 + command="Browser:ForwardOrForwardDuplicate"
360 + onclick="checkForMiddleClick(this, event);"
361 + tooltiptext="&forwardButton.tooltip;"/>
362 + <toolbarbutton id="back-forward-dropmarker" type="menu"
363 + disabled="true" tooltiptext="&backForwardMenu.tooltip;"
364 + onbroadcast="if (this.disabled) this.disabled =
365 + document.getElementById('Browser:Back').hasAttribute('disabled') &amp;&amp;
366 + document.getElementById('Browser:Forward').hasAttribute('disabled');">
367 + <!-- bug 415444: event.stopPropagation is here for the cloned version of
368 + this menupopup -->
369 + <menupopup context=""
370 + position="after_start"
371 + onpopupshowing="return FillHistoryMenu(event.target);"
372 + oncommand="gotoHistoryIndex(event); event.stopPropagation();"
373 + onclick="checkForMiddleClick(this, event);"/>
374 + <observes element="Browser:Back" attribute="disabled"/>
375 + <observes element="Browser:Forward" attribute="disabled"/>
376 + </toolbarbutton>
377 + </toolbaritem>
378 +
379 + <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
380 + label="&reloadCmd.label;"
381 + command="Browser:ReloadOrDuplicate"
382 + onclick="checkForMiddleClick(this, event);"
383 + tooltiptext="&reloadButton.tooltip;"/>
384 +
385 + <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
386 + label="&stopCmd.label;"
387 + command="Browser:Stop"
388 + tooltiptext="&stopButton.tooltip;"/>
389 +
390 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
391 + persist="class"
392 + label="&homeButton.label;"
393 + ondragover="homeButtonObserver.onDragOver(event)"
394 + ondragenter="homeButtonObserver.onDragOver(event)"
395 + ondrop="homeButtonObserver.onDrop(event)"
396 + ondragleave="homeButtonObserver.onDragLeave(event)"
397 + onclick="BrowserGoHome(event);"/>
398 +
399 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width"
400 + title="&locationItem.title;" class="chromeclass-location">
401 + <textbox id="urlbar" flex="1"
402 + bookmarkhistoryemptytext="&urlbar.bookmarkhistory.emptyText;"
403 + bookmarkemptytext="&urlbar.bookmark.emptyText;"
404 + historyemptytext="&urlbar.history.emptyText;"
405 + noneemptytext="&urlbar.none.emptyText;"
406 + type="autocomplete"
407 + autocompletesearch="history"
408 + autocompletepopup="PopupAutoCompleteRichResult"
409 + completeselectedindex="true"
410 + tabscrolling="true"
411 + showcommentcolumn="true"
412 + showimagecolumn="true"
413 + enablehistory="true"
414 + maxrows="6"
415 + newlines="stripsurroundingwhitespace"
416 + oninput="gBrowser.userTypedValue = this.value;"
417 + ontextentered="this.handleCommand(param);"
418 + ontextreverted="return this.handleRevert();"
419 + pageproxystate="invalid"
420 + onsearchbegin="LocationBarHelpers._searchBegin();"
421 + onsearchcomplete="LocationBarHelpers._searchComplete();"
422 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
423 + onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
424 + <!-- Use onclick instead of normal popup= syntax since the popup
425 + code fires onmousedown, and hence eats our favicon drag events.
426 + We only add the identity-box button to the tab order when the location bar
427 + has focus, otherwise pressing F6 focuses it instead of the location bar -->
428 + <box id="identity-box" role="button"
429 + onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
430 + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
431 + <hbox id="identity-box-inner" align="center">
432 + <stack id="page-proxy-stack"
433 + onclick="PageProxyClickHandler(event);">
434 + <image id="urlbar-throbber" busy="false"/>
435 + <image id="page-proxy-favicon" validate="never"
436 + pageproxystate="invalid"
437 + ondragstart="proxyIconDNDObserver.onDragStart(event);"
438 + onerror="this.removeAttribute('src');"/>
439 + </stack>
440 + <label id="identity-icon-label" crop="center" flex="1"/>
441 + </hbox>
442 + </box>
443 + <hbox id="urlbar-icons">
444 + <button type="menu"
445 + style="-moz-user-focus: none"
446 + class="plain urlbar-icon"
447 + id="feed-button"
448 + collapsed="true"
449 + tooltiptext="&feedButton.tooltip;"
450 + onclick="return FeedHandler.onFeedButtonClick(event);">
451 + <menupopup position="after_end"
452 + id="feed-menu"
453 + onpopupshowing="return FeedHandler.buildFeedList(this);"
454 + oncommand="return FeedHandler.subscribeToFeed(null, event);"
455 + onclick="checkForMiddleClick(this, event);"/>
456 + </button>
457 + <image id="star-button"
458 + class="urlbar-icon"
459 + onclick="PlacesStarButton.onClick(event);"/>
460 + <image id="go-button"
461 + class="urlbar-icon"
462 + tooltiptext="&goEndCap.tooltip;"
463 + onclick="gURLBar.handleCommand(event);"/>
464 + </hbox>
465 + </textbox>
466 + </toolbaritem>
467 +
468 + <toolbaritem id="search-container" title="&searchItem.title;"
469 + align="center" class="chromeclass-toolbar-additional"
470 + flex="100" persist="width">
471 + <searchbar id="searchbar" flex="1"/>
472 + </toolbaritem>
473 +
474 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
475 + label="&printButton.label;" command="cmd_print"
476 + tooltiptext="&printButton.tooltip;"/>
477 +
478 + <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center"
479 + mousethrough="always">
480 + <image/>
481 + </toolbaritem>
482 +
483 + <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;">
484 + <hbox id="bookmarksBarContent" flex="1"
485 + type="places"
486 + place="place:folder=TOOLBAR"
487 + context="placesContext"
488 + onclick="BookmarksEventHandler.onClick(event);"
489 + oncommand="BookmarksEventHandler.onCommand(event);"
490 + onpopupshowing="BookmarksEventHandler.onPopupShowing(event);"
491 + tooltip="bhTooltip" popupsinherittooltip="true"/>
492 + </toolbaritem>
493 +
494 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
495 + observes="Tools:Downloads"
496 + ondrop="DownloadsButtonDNDObserver.onDrop(event)"
497 + ondragover="DownloadsButtonDNDObserver.onDragOver(event)"
498 + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)"
499 + ondragleave="DownloadsButtonDNDObserver.onDragLeave(event)"
500 + label="&downloads.label;"
501 + tooltiptext="&downloads.tooltip;"/>
502 +
503 + <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
504 + observes="viewHistorySidebar" label="&historyButton.label;"
505 + tooltiptext="&historyButton.tooltip;"/>
506 +
507 + <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
508 + observes="viewBookmarksSidebar"
509 + tooltiptext="&bookmarksButton.tooltip;"
510 + ondrop="bookmarksButtonObserver.onDrop(event)"
511 + ondragover="bookmarksButtonObserver.onDragOver(event)"
512 + ondragenter="bookmarksButtonObserver.onDragOver(event)"
513 + ondragleave="bookmarksButtonObserver.onDragLeave(event)"/>
514 +
515 + <toolbarbutton id="new-tab-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
516 + label="&tabCmd.label;"
517 + command="cmd_newNavigatorTab"
518 + tooltiptext="&newTabButton.tooltip;"
519 + ondrop="newTabButtonObserver.onDrop(event)"
520 + ondragover="newTabButtonObserver.onDragOver(event)"
521 + ondragenter="newTabButtonObserver.onDragOver(event)"
522 + ondragleave="newTabButtonObserver.onDragLeave(event)"/>
523 +
524 + <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
525 + label="&newNavigatorCmd.label;"
526 + command="key_newNavigator"
527 + tooltiptext="&newWindowButton.tooltip;"
528 + ondrop="newWindowButtonObserver.onDrop(event)"
529 + ondragover="newWindowButtonObserver.onDragOver(event)"
530 + ondragenter="newWindowButtonObserver.onDragOver(event)"
531 + ondragleave="newWindowButtonObserver.onDragLeave(event)"/>
532 +
533 + <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
534 + label="&cutCmd.label;"
535 + command="cmd_cut"
536 + tooltiptext="&cutButton.tooltip;"/>
537 +
538 + <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
539 + label="&copyCmd.label;"
540 + command="cmd_copy"
541 + tooltiptext="&copyButton.tooltip;"/>
542 +
543 + <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
544 + label="&pasteCmd.label;"
545 + command="cmd_paste"
546 + tooltiptext="&pasteButton.tooltip;"/>
547 + <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
548 + observes="View:FullScreen"
549 + type="checkbox"
550 + label="&fullScreenCmd.label;"
551 + tooltiptext="&fullScreenButton.tooltip;"/>
552 + </toolbarpalette>
553 +
554 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
555 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
556 + fullscreentoolbar="true" mode="icons"
557 +#ifdef WINCE
558 + iconsize="small" defaulticonsize="small"
559 +#else
560 + iconsize="large"
561 +#endif
562 + customizable="true"
563 +#ifdef WINCE
564 + defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,navigator-throbber,fullscreenflex,window-controls"
565 +#else
566 + defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,fullscreenflex,window-controls"
567 +#endif
568 + context="toolbar-context-menu">
569 + <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/>
570 + <hbox id="window-controls" hidden="true" fullscreencontrol="true">
571 + <toolbarbutton id="minimize-button" class="toolbarbutton-1"
572 + tooltiptext="&fullScreenMinimize.tooltip;"
573 + oncommand="window.minimize();"/>
574 +
575 + <toolbarbutton id="restore-button" class="toolbarbutton-1"
576 + tooltiptext="&fullScreenRestore.tooltip;"
577 + oncommand="BrowserFullScreen();"/>
578 +
579 + <toolbarbutton id="close-button" class="toolbarbutton-1"
580 + tooltiptext="&fullScreenClose.tooltip;"
581 + oncommand="BrowserTryToCloseWindow();"/>
582 + </hbox>
583 + </toolbar>
584 +
585 + <toolbarset id="customToolbars" context="toolbar-context-menu"/>
586 +
587 + <toolbar id="PersonalToolbar"
588 + mode="icons" iconsize="small" defaulticonsize="small"
589 + class="chromeclass-directories"
590 + context="toolbar-context-menu"
591 + defaultset="personal-bookmarks"
592 + toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
593 +#ifdef WINCE
594 + collapsed="true"
595 +#endif
596 + customizable="true"/>
597 + </toolbox>
598 +
599 + <hbox flex="1" id="browser">
600 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
601 + <sidebarheader id="sidebar-header" align="center">
602 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
603 + <image id="sidebar-throbber"/>
604 + <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
605 + </sidebarheader>
606 + <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
607 + style="min-width: 14em; width: 18em; max-width: 36em;"/>
608 + </vbox>
609 +
610 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/>
611 + <vbox id="appcontent" flex="1">
612 + <tabbrowser id="content" disablehistory="true"
613 + flex="1" contenttooltip="aHTMLTooltip"
614 + contentcontextmenu="contentAreaContextMenu"
615 + onnewtab="BrowserOpenTab();"
616 + autocompletepopup="PopupAutoComplete"
617 + ondrop="contentAreaDNDObserver.onDrop(event)"
618 + onclick="return contentAreaClick(event, false);"/>
619 + </vbox>
620 + </hbox>
621 + <panel id="customizeToolbarSheetPopup" noautohide="true">
622 + <iframe id="customizeToolbarSheetIFrame"
623 + style="&dialog.style;"
624 + hidden="true"/>
625 + </panel>
626 +
627 + <vbox id="browser-bottombox">
628 + <findbar browserid="content" id="FindToolbar"/>
629 +
630 + <statusbar class="chromeclass-status" id="status-bar"
631 +#ifdef WINCE
632 + hidden="true"
633 +#endif
634 + ondrop="contentAreaDNDObserver.onDrop(event)">
635 + <statusbarpanel id="statusbar-display" label="" flex="1"/>
636 + <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
637 + <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
638 + </statusbarpanel>
639 + <statusbarpanel id="download-monitor" class="statusbarpanel-iconic-text"
640 + tooltiptext="&downloadMonitor2.tooltip;" hidden="true"
641 + command="Tools:Downloads"/>
642 + <statusbarpanel id="security-button" class="statusbarpanel-iconic"
643 + hidden="true"
644 + onclick="if (event.button == 0 &amp;&amp; event.detail == 1) displaySecurityInfo();"/>
645 + <statusbarpanel id="page-report-button" type="menu"
646 + class="statusbarpanel-menu-iconic"
647 + hidden="true"
648 + tooltiptext="&pageReportIcon.tooltip;">
649 + <menupopup onpopupshowing="gPopupBlockerObserver.fillPopupList(event);">
650 + <menuitem observes="blockedPopupAllowSite"/>
651 + <menuitem observes="blockedPopupEditSettings"/>
652 + <menuitem observes="blockedPopupDontShowMessage"/>
653 + <menuseparator observes="blockedPopupsSeparator"/>
654 + </menupopup>
655 + </statusbarpanel>
656 + </statusbar>
657 + </vbox>
658 +</window>
659 diff -Naurp mozilla-1.9.2/browser/base/jar.mn mozilla-1.9.2.oden/browser/base/jar.mn
660 --- mozilla-1.9.2/browser/base/jar.mn 2010-04-14 00:21:35.000000000 +0200
661 +++ mozilla-1.9.2.oden/browser/base/jar.mn 2010-04-20 19:48:56.975233861 +0200
662 @@ -22,6 +22,8 @@ browser.jar:
663 * content/browser/browser.css (content/browser.css)
664 * content/browser/browser.js (content/browser.js)
665 * content/browser/browser.xul (content/browser.xul)
666 +* content/browser/browser-kde.xul (content/browser-kde.xul)
667 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
668 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
669 * content/browser/credits.xhtml (content/credits.xhtml)
670 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml)
671 diff -Naurp mozilla-1.9.2/browser/components/build/nsModule.cpp mozilla-1.9.2.oden/browser/components/build/nsModule.cpp
672 --- mozilla-1.9.2/browser/components/build/nsModule.cpp 2010-04-14 00:21:35.000000000 +0200
673 +++ mozilla-1.9.2.oden/browser/components/build/nsModule.cpp 2010-04-20 19:48:56.976284391 +0200
674 @@ -46,7 +46,7 @@
675 #elif defined(XP_MACOSX)
676 #include "nsMacShellService.h"
677 #elif defined(MOZ_WIDGET_GTK2)
678 -#include "nsGNOMEShellService.h"
679 +#include "nsUnixShellService.h"
680 #endif
681
682 #ifndef WINCE
683 @@ -90,7 +90,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindows
684 #elif defined(XP_MACOSX)
685 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
686 #elif defined(MOZ_WIDGET_GTK2)
687 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
688 +// in nsUnixShellService
689 +//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixShellService, Init)
690 #endif
691
692 #ifndef WINCE
693 @@ -134,7 +135,7 @@ static const nsModuleComponentInfo compo
694 { "Browser Shell Service",
695 NS_SHELLSERVICE_CID,
696 NS_SHELLSERVICE_CONTRACTID,
697 - nsGNOMEShellServiceConstructor },
698 + nsUnixShellServiceConstructor },
699
700 #endif
701
702 diff -Naurp mozilla-1.9.2/browser/components/shell/src/Makefile.in mozilla-1.9.2.oden/browser/components/shell/src/Makefile.in
703 --- mozilla-1.9.2/browser/components/shell/src/Makefile.in 2010-04-14 00:21:36.000000000 +0200
704 +++ mozilla-1.9.2.oden/browser/components/shell/src/Makefile.in 2010-04-20 19:48:56.976284391 +0200
705 @@ -75,11 +75,12 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_
706 CPPSRCS = nsMacShellService.cpp
707 else
708 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
709 -CPPSRCS = nsGNOMEShellService.cpp
710 +CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp
711 REQUIRES += \
712 mozgnome \
713 thebes \
714 $(NULL)
715 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
716 endif
717 endif
718 endif
719 diff -Naurp mozilla-1.9.2/browser/components/shell/src/nsKDEShellService.cpp mozilla-1.9.2.oden/browser/components/shell/src/nsKDEShellService.cpp
720 --- mozilla-1.9.2/browser/components/shell/src/nsKDEShellService.cpp 1970-01-01 01:00:00.000000000 +0100
721 +++ mozilla-1.9.2.oden/browser/components/shell/src/nsKDEShellService.cpp 2010-04-20 19:48:56.977324897 +0200
722 @@ -0,0 +1,193 @@
723 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
724 +/* ***** BEGIN LICENSE BLOCK *****
725 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
726 + *
727 + * The contents of this file are subject to the Mozilla Public License Version
728 + * 1.1 (the "License"); you may not use this file except in compliance with
729 + * the License. You may obtain a copy of the License at
730 + * http://www.mozilla.org/MPL/
731 + *
732 + * Software distributed under the License is distributed on an "AS IS" basis,
733 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
734 + * for the specific language governing rights and limitations under the
735 + * License.
736 + *
737 + * The Original Code is Shell Service.
738 + *
739 + * The Initial Developer of the Original Code is mozilla.org.
740 + * Portions created by the Initial Developer are Copyright (C) 2004
741 + * the Initial Developer. All Rights Reserved.
742 + *
743 + * Contributor(s):
744 + *
745 + * Alternatively, the contents of this file may be used under the terms of
746 + * either the GNU General Public License Version 2 or later (the "GPL"), or
747 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
748 + * in which case the provisions of the GPL or the LGPL are applicable instead
749 + * of those above. If you wish to allow use of your version of this file only
750 + * under the terms of either the GPL or the LGPL, and not to allow others to
751 + * use your version of this file under the terms of the MPL, indicate your
752 + * decision by deleting the provisions above and replace them with the notice
753 + * and other provisions required by the GPL or the LGPL. If you do not delete
754 + * the provisions above, a recipient may use your version of this file under
755 + * the terms of any one of the MPL, the GPL or the LGPL.
756 + *
757 + * ***** END LICENSE BLOCK ***** */
758 +
759 +#include "nsKDEShellService.h"
760 +#include "nsShellService.h"
761 +#include "nsKDEUtils.h"
762 +#include "nsCOMPtr.h"
763 +#include "nsIPrefService.h"
764 +#include "nsIProcess.h"
765 +#include "nsILocalFile.h"
766 +#include "nsServiceManagerUtils.h"
767 +#include "nsComponentManagerUtils.h"
768 +
769 +nsresult
770 +nsKDEShellService::Init()
771 + {
772 + if( !nsKDEUtils::kdeSupport())
773 + return NS_ERROR_NOT_AVAILABLE;
774 + return NS_OK;
775 + }
776 +
777 +NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService)
778 +
779 +NS_IMETHODIMP
780 +nsKDEShellService::IsDefaultBrowser(PRBool aStartupCheck,
781 + PRBool* aIsDefaultBrowser)
782 + {
783 + *aIsDefaultBrowser = PR_FALSE;
784 + if (aStartupCheck)
785 + mCheckedThisSession = PR_TRUE;
786 + nsCStringArray command;
787 + command.AppendCString( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" ));
788 + if( nsKDEUtils::command( command ))
789 + *aIsDefaultBrowser = PR_TRUE;
790 + return NS_OK;
791 + }
792 +
793 +NS_IMETHODIMP
794 +nsKDEShellService::SetDefaultBrowser(PRBool aClaimAllTypes,
795 + PRBool aForAllUsers)
796 + {
797 + nsCStringArray command;
798 + command.AppendCString( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" ));
799 + command.AppendCString( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" ));
800 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
801 + }
802 +
803 +NS_IMETHODIMP
804 +nsKDEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
805 +{
806 + // If we've already checked, the browser has been started and this is a
807 + // new window open, and we don't want to check again.
808 + if (mCheckedThisSession) {
809 + *aResult = PR_FALSE;
810 + return NS_OK;
811 + }
812 +
813 + nsCOMPtr<nsIPrefBranch> prefs;
814 + nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
815 + if (pserve)
816 + pserve->GetBranch("", getter_AddRefs(prefs));
817 +
818 + if (prefs)
819 + prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult);
820 +
821 + return NS_OK;
822 +}
823 +
824 +NS_IMETHODIMP
825 +nsKDEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck)
826 +{
827 + nsCOMPtr<nsIPrefBranch> prefs;
828 + nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
829 + if (pserve)
830 + pserve->GetBranch("", getter_AddRefs(prefs));
831 +
832 + if (prefs)
833 + prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck);
834 +
835 + return NS_OK;
836 +}
837 +
838 +NS_IMETHODIMP
839 +nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement,
840 + PRInt32 aPosition)
841 + {
842 + return NS_ERROR_NOT_IMPLEMENTED;
843 + }
844 +
845 +NS_IMETHODIMP
846 +nsKDEShellService::GetDesktopBackgroundColor(PRUint32 *aColor)
847 + {
848 + return NS_ERROR_NOT_IMPLEMENTED;
849 + }
850 +
851 +NS_IMETHODIMP
852 +nsKDEShellService::SetDesktopBackgroundColor(PRUint32 aColor)
853 + {
854 + return NS_ERROR_NOT_IMPLEMENTED;
855 + }
856 +
857 +NS_IMETHODIMP
858 +nsKDEShellService::OpenApplication(PRInt32 aApplication)
859 + {
860 + nsCStringArray command;
861 + if( aApplication == APPLICATION_MAIL )
862 + command.AppendCString( NS_LITERAL_CSTRING( "OPENMAIL" ));
863 + else if( aApplication == APPLICATION_NEWS )
864 + command.AppendCString( NS_LITERAL_CSTRING( "OPENNEWS" ));
865 + else
866 + return NS_ERROR_NOT_IMPLEMENTED;
867 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
868 + }
869 +
870 +NS_IMETHODIMP
871 +nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI)
872 + {
873 + nsCStringArray command;
874 + command.AppendCString( NS_LITERAL_CSTRING( "RUN" ));
875 + nsCString app;
876 + nsresult rv = aApplication->GetNativePath( app );
877 + NS_ENSURE_SUCCESS( rv, rv );
878 + command.AppendCString( app );
879 + command.AppendCString( aURI );
880 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
881 + }
882 +
883 +NS_IMETHODIMP
884 +nsKDEShellService::GetDefaultFeedReader(nsILocalFile** _retval)
885 + {
886 + *_retval = nsnull;
887 +
888 + nsCStringArray command;
889 + command.AppendCString( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" ));
890 + nsCStringArray output;
891 + if( !nsKDEUtils::command( command, &output ) || output.Count() != 1 )
892 + return NS_ERROR_FAILURE;
893 +
894 + nsCString path;
895 + path = *output[ 0 ];
896 + if (path.IsEmpty())
897 + return NS_ERROR_FAILURE;
898 +
899 + nsresult rv;
900 + nsCOMPtr<nsILocalFile> defaultReader =
901 + do_CreateInstance("@mozilla.org/file/local;1", &rv);
902 + NS_ENSURE_SUCCESS(rv, rv);
903 +
904 + rv = defaultReader->InitWithNativePath(path);
905 + NS_ENSURE_SUCCESS(rv, rv);
906 +
907 + PRBool exists;
908 + rv = defaultReader->Exists(&exists);
909 + NS_ENSURE_SUCCESS(rv, rv);
910 + if (!exists)
911 + return NS_ERROR_FAILURE;
912 +
913 + NS_ADDREF(*_retval = defaultReader);
914 + return NS_OK;
915 + }
916 diff -Naurp mozilla-1.9.2/browser/components/shell/src/nsKDEShellService.h mozilla-1.9.2.oden/browser/components/shell/src/nsKDEShellService.h
917 --- mozilla-1.9.2/browser/components/shell/src/nsKDEShellService.h 1970-01-01 01:00:00.000000000 +0100
918 +++ mozilla-1.9.2.oden/browser/components/shell/src/nsKDEShellService.h 2010-04-20 19:48:56.977324897 +0200
919 @@ -0,0 +1,59 @@
920 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
921 +/* ***** BEGIN LICENSE BLOCK *****
922 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
923 + *
924 + * The contents of this file are subject to the Mozilla Public License Version
925 + * 1.1 (the "License"); you may not use this file except in compliance with
926 + * the License. You may obtain a copy of the License at
927 + * http://www.mozilla.org/MPL/
928 + *
929 + * Software distributed under the License is distributed on an "AS IS" basis,
930 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
931 + * for the specific language governing rights and limitations under the
932 + * License.
933 + *
934 + * The Original Code is Shell Service.
935 + *
936 + * The Initial Developer of the Original Code is mozilla.org.
937 + * Portions created by the Initial Developer are Copyright (C) 2004
938 + * the Initial Developer. All Rights Reserved.
939 + *
940 + * Contributor(s):
941 + *
942 + * Alternatively, the contents of this file may be used under the terms of
943 + * either the GNU General Public License Version 2 or later (the "GPL"), or
944 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
945 + * in which case the provisions of the GPL or the LGPL are applicable instead
946 + * of those above. If you wish to allow use of your version of this file only
947 + * under the terms of either the GPL or the LGPL, and not to allow others to
948 + * use your version of this file under the terms of the MPL, indicate your
949 + * decision by deleting the provisions above and replace them with the notice
950 + * and other provisions required by the GPL or the LGPL. If you do not delete
951 + * the provisions above, a recipient may use your version of this file under
952 + * the terms of any one of the MPL, the GPL or the LGPL.
953 + *
954 + * ***** END LICENSE BLOCK ***** */
955 +
956 +#ifndef nskdeshellservice_h____
957 +#define nskdeshellservice_h____
958 +
959 +#include "nsIShellService.h"
960 +#include "nsStringAPI.h"
961 +
962 +class nsKDEShellService : public nsIShellService
963 +{
964 +public:
965 + nsKDEShellService() : mCheckedThisSession(PR_FALSE) { }
966 +
967 + NS_DECL_ISUPPORTS
968 + NS_DECL_NSISHELLSERVICE
969 +
970 + nsresult Init() NS_HIDDEN;
971 +
972 +private:
973 + ~nsKDEShellService() {}
974 +
975 + PRPackedBool mCheckedThisSession;
976 +};
977 +
978 +#endif // nskdeshellservice_h____
979 diff -Naurp mozilla-1.9.2/browser/components/shell/src/nsUnixShellService.cpp mozilla-1.9.2.oden/browser/components/shell/src/nsUnixShellService.cpp
980 --- mozilla-1.9.2/browser/components/shell/src/nsUnixShellService.cpp 1970-01-01 01:00:00.000000000 +0100
981 +++ mozilla-1.9.2.oden/browser/components/shell/src/nsUnixShellService.cpp 2010-04-20 19:48:56.977324897 +0200
982 @@ -0,0 +1,52 @@
983 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
984 +/* ***** BEGIN LICENSE BLOCK *****
985 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
986 + *
987 + * The contents of this file are subject to the Mozilla Public License Version
988 + * 1.1 (the "License"); you may not use this file except in compliance with
989 + * the License. You may obtain a copy of the License at
990 + * http://www.mozilla.org/MPL/
991 + *
992 + * Software distributed under the License is distributed on an "AS IS" basis,
993 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
994 + * for the specific language governing rights and limitations under the
995 + * License.
996 + *
997 + * The Original Code is Shell Service.
998 + *
999 + * The Initial Developer of the Original Code is mozilla.org.
1000 + * Portions created by the Initial Developer are Copyright (C) 2004
1001 + * the Initial Developer. All Rights Reserved.
1002 + *
1003 + * Contributor(s):
1004 + *
1005 + * Alternatively, the contents of this file may be used under the terms of
1006 + * either the GNU General Public License Version 2 or later (the "GPL"), or
1007 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
1008 + * in which case the provisions of the GPL or the LGPL are applicable instead
1009 + * of those above. If you wish to allow use of your version of this file only
1010 + * under the terms of either the GPL or the LGPL, and not to allow others to
1011 + * use your version of this file under the terms of the MPL, indicate your
1012 + * decision by deleting the provisions above and replace them with the notice
1013 + * and other provisions required by the GPL or the LGPL. If you do not delete
1014 + * the provisions above, a recipient may use your version of this file under
1015 + * the terms of any one of the MPL, the GPL or the LGPL.
1016 + *
1017 + * ***** END LICENSE BLOCK ***** */
1018 +
1019 +#include "nsUnixShellService.h"
1020 +#include "nsGNOMEShellService.h"
1021 +#include "nsKDEShellService.h"
1022 +#include "nsKDEUtils.h"
1023 +#include "nsIGenericFactory.h"
1024 +
1025 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
1026 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init)
1027 +
1028 +NS_METHOD
1029 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
1030 +{
1031 + if( nsKDEUtils::kdeSupport())
1032 + return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
1033 + return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
1034 +}
1035 diff -Naurp mozilla-1.9.2/browser/components/shell/src/nsUnixShellService.h mozilla-1.9.2.oden/browser/components/shell/src/nsUnixShellService.h
1036 --- mozilla-1.9.2/browser/components/shell/src/nsUnixShellService.h 1970-01-01 01:00:00.000000000 +0100
1037 +++ mozilla-1.9.2.oden/browser/components/shell/src/nsUnixShellService.h 2010-04-20 19:48:56.978324685 +0200
1038 @@ -0,0 +1,45 @@
1039 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
1040 +/* ***** BEGIN LICENSE BLOCK *****
1041 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
1042 + *
1043 + * The contents of this file are subject to the Mozilla Public License Version
1044 + * 1.1 (the "License"); you may not use this file except in compliance with
1045 + * the License. You may obtain a copy of the License at
1046 + * http://www.mozilla.org/MPL/
1047 + *
1048 + * Software distributed under the License is distributed on an "AS IS" basis,
1049 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1050 + * for the specific language governing rights and limitations under the
1051 + * License.
1052 + *
1053 + * The Original Code is Shell Service.
1054 + *
1055 + * The Initial Developer of the Original Code is mozilla.org.
1056 + * Portions created by the Initial Developer are Copyright (C) 2004
1057 + * the Initial Developer. All Rights Reserved.
1058 + *
1059 + * Contributor(s):
1060 + *
1061 + * Alternatively, the contents of this file may be used under the terms of
1062 + * either the GNU General Public License Version 2 or later (the "GPL"), or
1063 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
1064 + * in which case the provisions of the GPL or the LGPL are applicable instead
1065 + * of those above. If you wish to allow use of your version of this file only
1066 + * under the terms of either the GPL or the LGPL, and not to allow others to
1067 + * use your version of this file under the terms of the MPL, indicate your
1068 + * decision by deleting the provisions above and replace them with the notice
1069 + * and other provisions required by the GPL or the LGPL. If you do not delete
1070 + * the provisions above, a recipient may use your version of this file under
1071 + * the terms of any one of the MPL, the GPL or the LGPL.
1072 + *
1073 + * ***** END LICENSE BLOCK ***** */
1074 +
1075 +#ifndef nsunixshellservice_h____
1076 +#define nsunixshellservice_h____
1077 +
1078 +#include "nsIShellService.h"
1079 +
1080 +NS_METHOD
1081 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
1082 +
1083 +#endif // nsunixshellservice_h____
1084 diff -Naurp mozilla-1.9.2/browser/installer/package-manifest.in mozilla-1.9.2.oden/browser/installer/package-manifest.in
1085 --- mozilla-1.9.2/browser/installer/package-manifest.in 2010-04-14 00:21:36.000000000 +0200
1086 +++ mozilla-1.9.2.oden/browser/installer/package-manifest.in 2010-04-20 19:48:56.978324685 +0200
1087 @@ -405,6 +405,7 @@
1088 @BINPATH@/@PREF_DIR@/firefox.js
1089 @BINPATH@/@PREF_DIR@/firefox-branding.js
1090 @BINPATH@/@PREF_DIR@/channel-prefs.js
1091 +@BINPATH@/@PREF_DIR@/kde.js
1092 @BINPATH@/greprefs/all.js
1093 @BINPATH@/greprefs/security-prefs.js
1094 @BINPATH@/greprefs/xpinstall.js
  ViewVC Help
Powered by ViewVC 1.1.30