--- a/mozilla-kde.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-kde.patch Wed Jul 25 11:15:27 2012 +0200
@@ -180,7 +180,7 @@
#include "AndroidBridge.h"
#endif
-@@ -2236,16 +2240,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2233,16 +2237,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -206,7 +206,7 @@
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2269,19 +2282,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2266,19 +2279,20 @@ nsDownload::SetState(DownloadState aStat
// If downloads are automatically removed per the user's
// retention policy, there's no reason to make the text clickable
// because if it is, they'll click open the download manager and
@@ -232,45 +232,49 @@
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -45,29 +45,33 @@ toolkit.jar:
- *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
- *+ content/global/bindings/browser.xml (widgets/browser.xml)
- *+ content/global/bindings/button.xml (widgets/button.xml)
- *+ content/global/bindings/checkbox.xml (widgets/checkbox.xml)
- *+ content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
- *+ content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
+ content/global/bindings/browser.xml (widgets/browser.xml)
+ content/global/bindings/button.xml (widgets/button.xml)
+ content/global/bindings/checkbox.xml (widgets/checkbox.xml)
+ content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
+ content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
*+ content/global/bindings/dialog.xml (widgets/dialog.xml)
+*+ content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
- *+ content/global/bindings/editor.xml (widgets/editor.xml)
- * content/global/bindings/expander.xml (widgets/expander.xml)
+ content/global/bindings/editor.xml (widgets/editor.xml)
+ content/global/bindings/expander.xml (widgets/expander.xml)
* content/global/bindings/filefield.xml (widgets/filefield.xml)
*+ content/global/bindings/findbar.xml (widgets/findbar.xml)
- *+ content/global/bindings/general.xml (widgets/general.xml)
- *+ content/global/bindings/groupbox.xml (widgets/groupbox.xml)
+ content/global/bindings/general.xml (widgets/general.xml)
+ content/global/bindings/groupbox.xml (widgets/groupbox.xml)
*+ content/global/bindings/listbox.xml (widgets/listbox.xml)
- *+ content/global/bindings/menu.xml (widgets/menu.xml)
- *+ content/global/bindings/menulist.xml (widgets/menulist.xml)
- *+ content/global/bindings/notification.xml (widgets/notification.xml)
- *+ content/global/bindings/numberbox.xml (widgets/numberbox.xml)
- *+ content/global/bindings/popup.xml (widgets/popup.xml)
+ content/global/bindings/menu.xml (widgets/menu.xml)
+ content/global/bindings/menulist.xml (widgets/menulist.xml)
+ content/global/bindings/notification.xml (widgets/notification.xml)
+ content/global/bindings/numberbox.xml (widgets/numberbox.xml)
+ content/global/bindings/popup.xml (widgets/popup.xml)
*+ content/global/bindings/preferences.xml (widgets/preferences.xml)
+*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
+% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
- *+ content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
- *+ content/global/bindings/radio.xml (widgets/radio.xml)
- *+ content/global/bindings/resizer.xml (widgets/resizer.xml)
- *+ content/global/bindings/richlistbox.xml (widgets/richlistbox.xml)
- *+ content/global/bindings/scale.xml (widgets/scale.xml)
- *+ content/global/bindings/scrollbar.xml (widgets/scrollbar.xml)
- *+ content/global/bindings/scrollbox.xml (widgets/scrollbox.xml)
- *+ content/global/bindings/splitter.xml (widgets/splitter.xml)
+ content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
+ content/global/bindings/radio.xml (widgets/radio.xml)
+ content/global/bindings/resizer.xml (widgets/resizer.xml)
+ content/global/bindings/richlistbox.xml (widgets/richlistbox.xml)
+ content/global/bindings/scale.xml (widgets/scale.xml)
+ content/global/bindings/scrollbar.xml (widgets/scrollbar.xml)
+ content/global/bindings/scrollbox.xml (widgets/scrollbox.xml)
+ content/global/bindings/splitter.xml (widgets/splitter.xml)
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,447 @@
+@@ -0,0 +1,451 @@
+<?xml version="1.0"?>
++<!-- This Source Code Form is subject to the terms of the Mozilla Public
++ - License, v. 2.0. If a copy of the MPL was not distributed with this
++ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
++
+
+<bindings id="dialogBindings"
+ xmlns="http://www.mozilla.org/xbl"
@@ -721,7 +725,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1373 @@
+@@ -0,0 +1,1339 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE bindings [
@@ -1986,9 +1990,9 @@
+ <handlers>
+ <handler event="command">
+ // This "command" event handler tracks changes made to preferences by
-+ // the user in this window.
-+ if (event.sourceEvent)
-+ event = event.sourceEvent;
++ // the user in this window.
++ if (event.sourceEvent)
++ event = event.sourceEvent;
+ this.userChangedValue(event.target);
+ </handler>
+ <handler event="select">
@@ -2047,43 +2051,9 @@
+</bindings>
+
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Preferences System.
-+#
-+# The Initial Developer of the Original Code is
-+# Ben Goodger.
-+# Portions created by the Initial Developer are Copyright (C) 2005
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+# Ben Goodger <ben@mozilla.org>
-+# Josh Aas <josh@mozilla.com>
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# This is PrefWindow 6. The Code Could Well Be Ready, Are You?
@@ -3256,7 +3226,7 @@
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
-@@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -105,11 +105,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
INCLUDES += \
-I$(srcdir)/../xpwidgets \
@@ -3288,7 +3258,7 @@
#include "nsIFileURL.h"
#include "nsIURI.h"
#include "nsIWidget.h"
- #include "nsILocalFile.h"
+ #include "nsIFile.h"
#include "nsIStringBundle.h"
#include "nsArrayEnumerator.h"
@@ -3310,7 +3280,7 @@
using namespace mozilla;
#define MAX_PREVIEW_SIZE 180
-@@ -253,17 +255,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+@@ -252,17 +254,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -3331,7 +3301,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
+@@ -357,16 +361,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
return NS_ERROR_FAILURE;
}
@@ -3351,7 +3321,7 @@
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
-@@ -506,8 +513,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -505,8 +512,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
*aReturn = nsIFilePicker::returnCancel;
break;
}
@@ -3504,7 +3474,7 @@
+ i < count;
+ ++i )
+ {
-+ nsCOMPtr<nsILocalFile> localfile;
++ nsCOMPtr<nsIFile> localfile;
+ nsresult rv = NS_NewNativeLocalFile( output[ i ],
+ PR_FALSE,
+ getter_AddRefs(localfile));
@@ -3525,19 +3495,19 @@
+ }
+ }
+ // Remember last used directory.
-+ nsCOMPtr<nsILocalFile> file;
++ nsCOMPtr<nsIFile> file;
+ GetFile(getter_AddRefs(file));
+ if (file) {
+ nsCOMPtr<nsIFile> dir;
+ file->GetParent(getter_AddRefs(dir));
-+ nsCOMPtr<nsILocalFile> localDir(do_QueryInterface(dir));
++ nsCOMPtr<nsIFile> localDir(do_QueryInterface(dir));
+ if (localDir) {
+ localDir.swap(mPrevDisplayDirectory);
+ }
+ }
+ if (mMode == nsIFilePicker::modeSave)
+ {
-+ nsCOMPtr<nsILocalFile> file;
++ nsCOMPtr<nsIFile> file;
+ GetFile(getter_AddRefs(file));
+ if (file)
+ {
@@ -3597,7 +3567,7 @@
nsTArray<nsCString> mFilterNames;
private:
- static nsILocalFile *mPrevDisplayDirectory;
+ static nsIFile *mPrevDisplayDirectory;
+
+ bool kdeRunning();
+ bool getKdeRunning();
@@ -3778,13 +3748,13 @@
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -48,16 +48,17 @@
+@@ -49,16 +49,17 @@
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
#include "private/pprio.h"
- #ifdef MOZ_WIDGET_GTK2
+ #ifdef MOZ_WIDGET_GTK
#include "nsIGIOService.h"
#include "nsIGnomeVFSService.h"
+#include "nsKDEUtils.h"
@@ -3796,7 +3766,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1760,44 +1761,51 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3804,7 +3774,7 @@
NS_IMETHODIMP
nsLocalFile::Reveal()
{
- #ifdef MOZ_WIDGET_GTK2
+ #ifdef MOZ_WIDGET_GTK
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (!giovfs && !gnomevfs)
@@ -3862,7 +3832,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1826,16 +1834,23 @@ nsLocalFile::Launch()
+@@ -1823,16 +1831,23 @@ nsLocalFile::Launch()
if (nsnull == connection)
return NS_ERROR_FAILURE;