mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:90e1f32cf034
+:b70ce330958c
 # HG changeset patch
-# Parent  a01c6385626ce90528d02e5127de5c1444c07efc
+# Parent  242712e5a1879111d1a93a5d55dfae3fd5d47abc
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
 document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
 }
 diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
 --- a/browser/components/shell/moz.build
 +++ b/browser/components/shell/moz.build
-@@ -21,16 +21,18 @@ XPIDL_SOURCES += [
+@@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-XPIDL_SOURCES += [
+SOURCES += [
-'nsIMacShellService.idl',
+'nsMacShellService.cpp',
 ]
 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-XPIDL_SOURCES += [
+SOURCES += [
-'nsIGNOMEShellService.idl',
+'nsGNOMEShellService.cpp',
 +        'nsKDEShellService.cpp',
 +        'nsUnixShellService.cpp',
 ]
-XPIDL_MODULE = 'shellservice'
+if SOURCES:
+FINAL_LIBRARY = 'browsercomps'
-if CONFIG['OS_ARCH'] == 'WINNT':
-SOURCES += [
+EXTRA_JS_MODULES += [
-'nsWindowsShellService.cpp',
+'HeadlessShell.jsm',
-]
+'ShellService.jsm',
 diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
 new file mode 100644
 --- /dev/null
 +++ b/browser/components/shell/nsKDEShellService.cpp
 @@ -0,0 +1,204 @@
 +  *aResult = true;
 +  return NS_OK;
 +}
 +
 +NS_IMETHODIMP
-+nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement,
++nsKDEShellService::SetDesktopBackground(dom::Element* aElement,
 +                                        int32_t aPosition,
 +                                        const nsACString& aImageName)
 +{
 +    return NS_ERROR_NOT_IMPLEMENTED;
 +}
 +{
 +public:
 +  nsKDEShellService() : mCheckedThisSession(false) { }
 +
 +  NS_DECL_ISUPPORTS
++  NS_DECL_NSISHELLSERVICE
 +  NS_DECL_NSIGNOMESHELLSERVICE
-+  NS_DECL_NSISHELLSERVICE
 +
 +  nsresult Init();
 +
 +private:
 +  ~nsKDEShellService() {}

changeset 1057	b70ce330958c
parent 1055	526f445635f3
child 1067	735b140fb042