1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 95b421ca30846be2b5d7230d72263e6dff042d0b |
2 # Parent 3fedb882f767b2e4ff72ef972a9cce4c5d1af4af |
3 |
3 |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
5 new file mode 100644 |
5 new file mode 100644 |
6 --- /dev/null |
6 --- /dev/null |
7 +++ b/browser/base/content/browser-kde.xul |
7 +++ b/browser/base/content/browser-kde.xul |
8 @@ -0,0 +1,1234 @@ |
8 @@ -0,0 +1,1222 @@ |
9 +#filter substitution |
9 +#filter substitution |
10 +<?xml version="1.0"?> |
10 +<?xml version="1.0"?> |
11 +# -*- Mode: HTML -*- |
11 +# -*- Mode: HTML -*- |
12 +# |
12 +# |
13 +# This Source Code Form is subject to the terms of the Mozilla Public |
13 +# This Source Code Form is subject to the terms of the Mozilla Public |
89 + <menupopup id="tabContextMenu" |
89 + <menupopup id="tabContextMenu" |
90 + onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);" |
90 + onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);" |
91 + onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;"> |
91 + onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;"> |
92 + <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;" |
92 + <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;" |
93 + oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/> |
93 + oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/> |
|
94 + <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/> |
94 + <menuseparator/> |
95 + <menuseparator/> |
95 + <menuitem id="context_pinTab" label="&pinTab.label;" |
96 + <menuitem id="context_pinTab" label="&pinTab.label;" |
96 + accesskey="&pinTab.accesskey;" |
97 + accesskey="&pinTab.accesskey;" |
97 + oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/> |
98 + oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/> |
98 + <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true" |
99 + <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true" |
168 + work correctly on the menupopup. ContentSelectDropdown expects the |
169 + work correctly on the menupopup. ContentSelectDropdown expects the |
169 + popuponly menulist to be its immediate parent. --> |
170 + popuponly menulist to be its immediate parent. --> |
170 + <menulist popuponly="true" id="ContentSelectDropdown" hidden="true"> |
171 + <menulist popuponly="true" id="ContentSelectDropdown" hidden="true"> |
171 + <menupopup rolluponmousewheel="true" |
172 + <menupopup rolluponmousewheel="true" |
172 +#ifdef XP_WIN |
173 +#ifdef XP_WIN |
173 + consumeoutsideclicks="false" |
174 + consumeoutsideclicks="false" ignorekeys="handled" |
174 +#endif |
175 +#endif |
175 + /> |
176 + /> |
176 + </menulist> |
177 + </menulist> |
177 + |
178 + |
178 + <!-- for invalid form error message --> |
179 + <!-- for invalid form error message --> |
450 + <vbox class="sync-panel-inner"> |
451 + <vbox class="sync-panel-inner"> |
451 + <description id="sync-start-panel-title" |
452 + <description id="sync-start-panel-title" |
452 + value="&syncStartPanel2.heading;"/> |
453 + value="&syncStartPanel2.heading;"/> |
453 + <description id="sync-start-panel-subtitle" |
454 + <description id="sync-start-panel-subtitle" |
454 + value="&syncStartPanel2.subTitle;"/> |
455 + value="&syncStartPanel2.subTitle;"/> |
455 + </vbox> |
|
456 + </hbox> |
|
457 + </panel> |
|
458 + |
|
459 + <!-- Sync Error Panel --> |
|
460 + <panel id="sync-error-panel" class="sync-panel" type="arrow" hidden="true" |
|
461 + noautofocus="true" onclick="this.hidePopup();" |
|
462 + flip="slide"> |
|
463 + <hbox class="sync-panel-outer"> |
|
464 + <image class="sync-panel-icon"/> |
|
465 + <vbox class="sync-panel-inner"> |
|
466 + <description id="sync-error-panel-title" |
|
467 + value="&syncErrorPanel.heading;"/> |
|
468 + <description id="sync-error-panel-subtitle" |
|
469 + value="&syncErrorPanel.subTitle;"/> |
|
470 + <hbox class="sync-panel-button-box"> |
|
471 + <spacer flex="1"/> |
|
472 + <button class="sync-panel-button" |
|
473 + label="&syncErrorPanel.signInButton.label;" |
|
474 + accesskey="&syncErrorPanel.signInButton.accesskey;" |
|
475 + onclick="gFxAccounts.openSignInAgainPage();"/> |
|
476 + </hbox> |
|
477 + </vbox> |
456 + </vbox> |
478 + </hbox> |
457 + </hbox> |
479 + </panel> |
458 + </panel> |
480 + |
459 + |
481 + <!-- Bookmarks and history tooltip --> |
460 + <!-- Bookmarks and history tooltip --> |
821 + <searchbar id="searchbar" flex="1"/> |
800 + <searchbar id="searchbar" flex="1"/> |
822 + </toolbaritem> |
801 + </toolbaritem> |
823 + |
802 + |
824 + <toolbarbutton id="bookmarks-menu-button" |
803 + <toolbarbutton id="bookmarks-menu-button" |
825 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
804 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
826 + persist="class" |
|
827 + removable="true" |
805 + removable="true" |
828 + type="menu-button" |
806 + type="menu-button" |
829 + label="&bookmarksMenuButton.label;" |
807 + label="&bookmarksMenuButton.label;" |
830 + tooltip="dynamic-shortcut-tooltip" |
808 + tooltip="dynamic-shortcut-tooltip" |
831 + anchor="dropmarker" |
809 + anchor="dropmarker" |
945 + removable="true" |
923 + removable="true" |
946 + cui-areatype="toolbar" |
924 + cui-areatype="toolbar" |
947 + tooltip="dynamic-shortcut-tooltip"/> |
925 + tooltip="dynamic-shortcut-tooltip"/> |
948 + |
926 + |
949 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
927 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
950 + persist="class" removable="true" |
928 + removable="true" |
951 + label="&homeButton.label;" |
929 + label="&homeButton.label;" |
952 + ondragover="homeButtonObserver.onDragOver(event)" |
930 + ondragover="homeButtonObserver.onDragOver(event)" |
953 + ondragenter="homeButtonObserver.onDragOver(event)" |
931 + ondragenter="homeButtonObserver.onDragOver(event)" |
954 + ondrop="homeButtonObserver.onDrop(event)" |
932 + ondrop="homeButtonObserver.onDrop(event)" |
955 + ondragexit="homeButtonObserver.onDragExit(event)" |
933 + ondragexit="homeButtonObserver.onDragExit(event)" |
1179 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1157 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1180 + </hbox> |
1158 + </hbox> |
1181 +#include ../../components/customizableui/content/customizeMode.inc.xul |
1159 +#include ../../components/customizableui/content/customizeMode.inc.xul |
1182 + </deck> |
1160 + </deck> |
1183 + |
1161 + |
1184 + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1162 + <html:div id="fullscreen-warning" hidden="true"> |
1185 + <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1163 + <html:div id="fullscreen-domain-text"> |
1186 + <vbox id="full-screen-warning-message" align="center"> |
1164 + &fullscreenWarning.beforeDomain.label; |
1187 + <description id="full-screen-domain-text"/> |
1165 + <html:span id="fullscreen-domain"/> |
1188 + <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> |
1166 + &fullscreenWarning.afterDomain.label; |
1189 + </vbox> |
1167 + </html:div> |
1190 + </hbox> |
1168 + <html:div id="fullscreen-generic-text"> |
1191 + </hbox> |
1169 + &fullscreenWarning.generic.label; |
|
1170 + </html:div> |
|
1171 + <html:button id="fullscreen-exit-button" |
|
1172 + onclick="FullScreen.exitDomFullScreen();"> |
|
1173 +#ifdef XP_MACOSX |
|
1174 + &exitDOMFullscreenMac.button; |
|
1175 +#else |
|
1176 + &exitDOMFullscreen.button; |
|
1177 +#endif |
|
1178 + </html:button> |
|
1179 + </html:div> |
1192 + |
1180 + |
1193 + <vbox id="browser-bottombox" layer="true"> |
1181 + <vbox id="browser-bottombox" layer="true"> |
1194 + <notificationbox id="global-notificationbox"/> |
1182 + <notificationbox id="global-notificationbox"/> |
1195 + <toolbar id="developer-toolbar" |
1183 + <toolbar id="developer-toolbar" |
1196 + hidden="true"> |
1184 + hidden="true"> |
1400 'nsSetDefaultBrowser.manifest', |
1388 'nsSetDefaultBrowser.manifest', |
1401 diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp |
1389 diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp |
1402 new file mode 100644 |
1390 new file mode 100644 |
1403 --- /dev/null |
1391 --- /dev/null |
1404 +++ b/browser/components/shell/nsKDEShellService.cpp |
1392 +++ b/browser/components/shell/nsKDEShellService.cpp |
1405 @@ -0,0 +1,238 @@ |
1393 @@ -0,0 +1,292 @@ |
1406 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1394 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1407 +/* This Source Code Form is subject to the terms of the Mozilla Public |
1395 +/* This Source Code Form is subject to the terms of the Mozilla Public |
1408 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
1396 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
1409 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
1397 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
1410 + |
1398 + |
1481 + |
1469 + |
1482 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
1470 + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; |
1483 +} |
1471 +} |
1484 + |
1472 + |
1485 +NS_IMETHODIMP |
1473 +NS_IMETHODIMP |
|
1474 +nsKDEShellService::GetShouldSkipCheckDefaultBrowser(bool* aResult) |
|
1475 +{ |
|
1476 + NS_ENSURE_ARG_POINTER(aResult); |
|
1477 + |
|
1478 + nsresult rv; |
|
1479 + nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); |
|
1480 + if (NS_FAILED(rv)) { |
|
1481 + return rv; |
|
1482 + } |
|
1483 + |
|
1484 + rv = prefs->GetBoolPref(PREF_SKIPDEFAULTBROWSERCHECK, aResult); |
|
1485 + if (NS_FAILED(rv)) { |
|
1486 + return rv; |
|
1487 + } |
|
1488 + if (*aResult) { |
|
1489 + // Only skip the default browser check once. The next attempt in |
|
1490 + // a new session should proceed. |
|
1491 + return prefs->SetBoolPref(PREF_SKIPDEFAULTBROWSERCHECK, false); |
|
1492 + } |
|
1493 + |
|
1494 + int32_t defaultBrowserCheckCount; |
|
1495 + rv = prefs->GetIntPref(PREF_DEFAULTBROWSERCHECKCOUNT, |
|
1496 + &defaultBrowserCheckCount); |
|
1497 + if (NS_FAILED(rv)) { |
|
1498 + return rv; |
|
1499 + } |
|
1500 + if (defaultBrowserCheckCount < 4) { |
|
1501 + *aResult = false; |
|
1502 + return prefs->SetIntPref(PREF_DEFAULTBROWSERCHECKCOUNT, |
|
1503 + defaultBrowserCheckCount + 1); |
|
1504 + } |
|
1505 + |
|
1506 + // Disable the default browser check after three attempts. |
|
1507 + // Don't modify PREF_CHECKDEFAULTBROWSER since that is a |
|
1508 + // user-initiated action and it shouldn't get re-enabled |
|
1509 + // if it has been user disabled. |
|
1510 + *aResult = true; |
|
1511 + return rv; |
|
1512 +} |
|
1513 + |
|
1514 +NS_IMETHODIMP |
1486 +nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult) |
1515 +nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult) |
1487 +{ |
1516 +{ |
1488 + // If we've already checked, the browser has been started and this is a |
1517 + // If we've already checked, the browser has been started and this is a |
1489 + // new window open, and we don't want to check again. |
1518 + // new window open, and we don't want to check again. |
1490 + if (mCheckedThisSession) { |
1519 + if (mCheckedThisSession) { |
1491 + *aResult = false; |
1520 + *aResult = false; |
1492 + return NS_OK; |
1521 + return NS_OK; |
1493 + } |
1522 + } |
|
1523 + |
|
1524 + nsresult rv; |
|
1525 +#ifndef RELEASE_BUILD |
|
1526 + bool skipDefaultBrowserCheck; |
|
1527 + rv = GetShouldSkipCheckDefaultBrowser(&skipDefaultBrowserCheck); |
|
1528 + if (NS_FAILED(rv)) { |
|
1529 + return rv; |
|
1530 + } |
|
1531 + if (skipDefaultBrowserCheck) { |
|
1532 + *aResult = false; |
|
1533 + return rv; |
|
1534 + } |
|
1535 +#endif |
1494 + |
1536 + |
1495 + nsCOMPtr<nsIPrefBranch> prefs; |
1537 + nsCOMPtr<nsIPrefBranch> prefs; |
1496 + nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
1538 + nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
1497 + if (pserve) |
1539 + if (pserve) |
1498 + pserve->GetBranch("", getter_AddRefs(prefs)); |
1540 + pserve->GetBranch("", getter_AddRefs(prefs)); |
1643 +} |
1685 +} |
1644 diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h |
1686 diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h |
1645 new file mode 100644 |
1687 new file mode 100644 |
1646 --- /dev/null |
1688 --- /dev/null |
1647 +++ b/browser/components/shell/nsKDEShellService.h |
1689 +++ b/browser/components/shell/nsKDEShellService.h |
1648 @@ -0,0 +1,60 @@ |
1690 @@ -0,0 +1,29 @@ |
1649 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1691 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1650 +/* ***** BEGIN LICENSE BLOCK ***** |
1692 +/* This Source Code Form is subject to the terms of the Mozilla Public |
1651 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
1693 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
1652 + * |
1694 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
1653 + * The contents of this file are subject to the Mozilla Public License Version |
|
1654 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
1655 + * the License. You may obtain a copy of the License at |
|
1656 + * http://www.mozilla.org/MPL/ |
|
1657 + * |
|
1658 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
1659 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
1660 + * for the specific language governing rights and limitations under the |
|
1661 + * License. |
|
1662 + * |
|
1663 + * The Original Code is Shell Service. |
|
1664 + * |
|
1665 + * The Initial Developer of the Original Code is mozilla.org. |
|
1666 + * Portions created by the Initial Developer are Copyright (C) 2004 |
|
1667 + * the Initial Developer. All Rights Reserved. |
|
1668 + * |
|
1669 + * Contributor(s): |
|
1670 + * |
|
1671 + * Alternatively, the contents of this file may be used under the terms of |
|
1672 + * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
1673 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
1674 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
1675 + * of those above. If you wish to allow use of your version of this file only |
|
1676 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
1677 + * use your version of this file under the terms of the MPL, indicate your |
|
1678 + * decision by deleting the provisions above and replace them with the notice |
|
1679 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
1680 + * the provisions above, a recipient may use your version of this file under |
|
1681 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
1682 + * |
|
1683 + * ***** END LICENSE BLOCK ***** */ |
|
1684 + |
1695 + |
1685 +#ifndef nskdeshellservice_h____ |
1696 +#ifndef nskdeshellservice_h____ |
1686 +#define nskdeshellservice_h____ |
1697 +#define nskdeshellservice_h____ |
1687 + |
1698 + |
1688 +#include "nsIShellService.h" |
1699 +#include "nsIShellService.h" |
1708 +#endif // nskdeshellservice_h____ |
1719 +#endif // nskdeshellservice_h____ |
1709 diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp |
1720 diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp |
1710 new file mode 100644 |
1721 new file mode 100644 |
1711 --- /dev/null |
1722 --- /dev/null |
1712 +++ b/browser/components/shell/nsUnixShellService.cpp |
1723 +++ b/browser/components/shell/nsUnixShellService.cpp |
1713 @@ -0,0 +1,52 @@ |
1724 @@ -0,0 +1,22 @@ |
1714 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1725 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1715 +/* ***** BEGIN LICENSE BLOCK ***** |
1726 +/* This Source Code Form is subject to the terms of the Mozilla Public |
1716 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
1727 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
1717 + * |
1728 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
1718 + * The contents of this file are subject to the Mozilla Public License Version |
1729 + |
1719 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
1720 + * the License. You may obtain a copy of the License at |
|
1721 + * http://www.mozilla.org/MPL/ |
|
1722 + * |
|
1723 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
1724 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
1725 + * for the specific language governing rights and limitations under the |
|
1726 + * License. |
|
1727 + * |
|
1728 + * The Original Code is Shell Service. |
|
1729 + * |
|
1730 + * The Initial Developer of the Original Code is mozilla.org. |
|
1731 + * Portions created by the Initial Developer are Copyright (C) 2004 |
|
1732 + * the Initial Developer. All Rights Reserved. |
|
1733 + * |
|
1734 + * Contributor(s): |
|
1735 + * |
|
1736 + * Alternatively, the contents of this file may be used under the terms of |
|
1737 + * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
1738 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
1739 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
1740 + * of those above. If you wish to allow use of your version of this file only |
|
1741 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
1742 + * use your version of this file under the terms of the MPL, indicate your |
|
1743 + * decision by deleting the provisions above and replace them with the notice |
|
1744 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
1745 + * the provisions above, a recipient may use your version of this file under |
|
1746 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
1747 + * |
|
1748 + * ***** END LICENSE BLOCK ***** */ |
|
1749 + |
1730 + |
1750 +#include "nsUnixShellService.h" |
1731 +#include "nsUnixShellService.h" |
1751 +#include "nsGNOMEShellService.h" |
1732 +#include "nsGNOMEShellService.h" |
1752 +#include "nsKDEShellService.h" |
1733 +#include "nsKDEShellService.h" |
1753 +#include "nsKDEUtils.h" |
1734 +#include "nsKDEUtils.h" |
1765 +} |
1746 +} |
1766 diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h |
1747 diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h |
1767 new file mode 100644 |
1748 new file mode 100644 |
1768 --- /dev/null |
1749 --- /dev/null |
1769 +++ b/browser/components/shell/nsUnixShellService.h |
1750 +++ b/browser/components/shell/nsUnixShellService.h |
1770 @@ -0,0 +1,45 @@ |
1751 @@ -0,0 +1,15 @@ |
1771 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1752 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1772 +/* ***** BEGIN LICENSE BLOCK ***** |
1753 +/* This Source Code Form is subject to the terms of the Mozilla Public |
1773 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
1754 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
1774 + * |
1755 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
1775 + * The contents of this file are subject to the Mozilla Public License Version |
1756 + |
1776 + * 1.1 (the "License"); you may not use this file except in compliance with |
|
1777 + * the License. You may obtain a copy of the License at |
|
1778 + * http://www.mozilla.org/MPL/ |
|
1779 + * |
|
1780 + * Software distributed under the License is distributed on an "AS IS" basis, |
|
1781 + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
1782 + * for the specific language governing rights and limitations under the |
|
1783 + * License. |
|
1784 + * |
|
1785 + * The Original Code is Shell Service. |
|
1786 + * |
|
1787 + * The Initial Developer of the Original Code is mozilla.org. |
|
1788 + * Portions created by the Initial Developer are Copyright (C) 2004 |
|
1789 + * the Initial Developer. All Rights Reserved. |
|
1790 + * |
|
1791 + * Contributor(s): |
|
1792 + * |
|
1793 + * Alternatively, the contents of this file may be used under the terms of |
|
1794 + * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
1795 + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
1796 + * in which case the provisions of the GPL or the LGPL are applicable instead |
|
1797 + * of those above. If you wish to allow use of your version of this file only |
|
1798 + * under the terms of either the GPL or the LGPL, and not to allow others to |
|
1799 + * use your version of this file under the terms of the MPL, indicate your |
|
1800 + * decision by deleting the provisions above and replace them with the notice |
|
1801 + * and other provisions required by the GPL or the LGPL. If you do not delete |
|
1802 + * the provisions above, a recipient may use your version of this file under |
|
1803 + * the terms of any one of the MPL, the GPL or the LGPL. |
|
1804 + * |
|
1805 + * ***** END LICENSE BLOCK ***** */ |
|
1806 + |
1757 + |
1807 +#ifndef nsunixshellservice_h____ |
1758 +#ifndef nsunixshellservice_h____ |
1808 +#define nsunixshellservice_h____ |
1759 +#define nsunixshellservice_h____ |
1809 + |
1760 + |
1810 +#include "nsIShellService.h" |
1761 +#include "nsIShellService.h" |
1814 + |
1765 + |
1815 +#endif // nsunixshellservice_h____ |
1766 +#endif // nsunixshellservice_h____ |
1816 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1767 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1817 --- a/browser/installer/package-manifest.in |
1768 --- a/browser/installer/package-manifest.in |
1818 +++ b/browser/installer/package-manifest.in |
1769 +++ b/browser/installer/package-manifest.in |
1819 @@ -709,19 +709,21 @@ |
1770 @@ -699,19 +699,21 @@ |
1820 @RESPATH@/defaults/autoconfig/prefcalls.js |
|
1821 @RESPATH@/browser/defaults/profile/prefs.js |
1771 @RESPATH@/browser/defaults/profile/prefs.js |
|
1772 @RESPATH@/browser/defaults/permissions |
1822 |
1773 |
1823 #ifndef LIBXUL_SDK |
1774 #ifndef LIBXUL_SDK |
1824 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1775 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1825 ; Technically this is an app pref file, but we are keeping it in the original |
1776 ; Technically this is an app pref file, but we are keeping it in the original |
1826 ; gre location for now. |
1777 ; gre location for now. |