--- a/mozilla-kde.patch Mon Jan 03 17:57:59 2011 +0100
+++ b/mozilla-kde.patch Sun Jan 09 10:04:57 2011 +0100
@@ -21,8 +21,7 @@
diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp
--- a/modules/libpref/src/nsPrefService.cpp
+++ b/modules/libpref/src/nsPrefService.cpp
-@@ -55,16 +55,17 @@
- #include "nsIStringEnumerator.h"
+@@ -57,16 +57,17 @@
#include "nsIZipReader.h"
#include "nsPrefBranch.h"
#include "nsXPIDLString.h"
@@ -30,6 +29,7 @@
#include "nsCOMArray.h"
#include "nsXPCOMCID.h"
#include "nsAutoPtr.h"
+ #include "nsThreadUtils.h"
+#include "nsKDEUtils.h"
#include "nsQuickSort.h"
@@ -39,7 +39,7 @@
#include "prefapi.h"
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -760,30 +761,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -798,30 +799,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
}
static nsresult pref_LoadPrefsInDirList(const char *listId)
@@ -89,7 +89,7 @@
}
//----------------------------------------------------------------------------------------
-@@ -814,28 +833,40 @@ static nsresult pref_InitDefaults()
+@@ -852,28 +871,40 @@ static nsresult pref_InitDefaults()
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = {
#if defined(XP_MAC) || defined(XP_MACOSX)
@@ -167,7 +167,7 @@
#define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png"
#define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete"
#define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval"
-@@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2199,16 +2203,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -193,7 +193,7 @@
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2227,16 +2240,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2234,16 +2247,17 @@ nsDownload::SetState(DownloadState aStat
// because if it is, they'll click open the download manager and
// the items they downloaded will have been removed.
alerts->ShowAlertNotification(
@@ -2602,7 +2602,7 @@
OSHELPER += nsAndroidHandlerApp.cpp
OSHELPER += nsExternalSharingAppService.cpp
EXPORTS += nsExternalSharingAppService.h
- endif
+ OSHELPER += nsExternalURLHandlerService.cpp
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
new file mode 100644
--- /dev/null
@@ -3201,14 +3201,14 @@
#include "nsAccessibilityHelper.h"
+#include "nsKDEUtils.h"
- #ifdef MOZ_PLATFORM_MAEMO
+ #if (MOZ_PLATFORM_MAEMO == 5)
#include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
#endif
#define MAX_PREVIEW_SIZE 180
nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull;
-@@ -270,17 +272,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+@@ -271,17 +273,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -3229,7 +3229,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -418,16 +422,19 @@ confirm_overwrite_file(GtkWidget *parent
+@@ -419,16 +423,19 @@ confirm_overwrite_file(GtkWidget *parent
gtk_widget_destroy(dialog);
return result;
@@ -3249,7 +3249,7 @@
GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-@@ -568,8 +575,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -569,8 +576,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
*aReturn = nsIFilePicker::returnCancel;
break;
}
@@ -3687,7 +3687,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1818,44 +1819,50 @@ nsLocalFile::Launch()
+@@ -1820,44 +1821,50 @@ nsLocalFile::Launch()
return NS_OK;
}
@@ -3752,7 +3752,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1881,16 +1888,23 @@ nsLocalFile::Launch()
+@@ -1883,16 +1890,23 @@ nsLocalFile::Launch()
if (nsnull == connection)
return NS_ERROR_FAILURE;