equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 1ec12b7509b6dcb0d2c1b77a8f93f81c4381008b |
2 # Parent 9821fbf1130a9e53e258127655f6d011c7312cce |
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 |
1559 +#include "mozilla/ModuleUtils.h" |
1559 +#include "mozilla/ModuleUtils.h" |
1560 + |
1560 + |
1561 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1561 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1562 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init) |
1562 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init) |
1563 + |
1563 + |
1564 +NS_METHOD |
1564 +NS_IMETHODIMP |
1565 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) |
1565 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) |
1566 +{ |
1566 +{ |
1567 + if( nsKDEUtils::kdeSupport()) |
1567 + if( nsKDEUtils::kdeSupport()) |
1568 + return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); |
1568 + return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); |
1569 + return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); |
1569 + return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); |
1582 +#ifndef nsunixshellservice_h____ |
1582 +#ifndef nsunixshellservice_h____ |
1583 +#define nsunixshellservice_h____ |
1583 +#define nsunixshellservice_h____ |
1584 + |
1584 + |
1585 +#include "nsIGNOMEShellService.h" |
1585 +#include "nsIGNOMEShellService.h" |
1586 + |
1586 + |
1587 +NS_METHOD |
1587 +NS_IMETHODIMP |
1588 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); |
1588 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); |
1589 + |
1589 + |
1590 +#endif // nsunixshellservice_h____ |
1590 +#endif // nsunixshellservice_h____ |
1591 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1591 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1592 --- a/browser/installer/package-manifest.in |
1592 --- a/browser/installer/package-manifest.in |