mozilla-kde.patch
changeset 210 f4f4388b26a8
parent 208 37a3246f9d7e
child 229 298263f797be
--- a/mozilla-kde.patch	Mon Jan 10 10:39:11 2011 +0100
+++ b/mozilla-kde.patch	Wed Jan 12 22:45:15 2011 +0100
@@ -21,7 +21,8 @@
 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
-@@ -57,16 +57,17 @@
+@@ -55,16 +55,17 @@
+ #include "nsIStringEnumerator.h"
  #include "nsIZipReader.h"
  #include "nsPrefBranch.h"
  #include "nsXPIDLString.h"
@@ -29,7 +30,6 @@
  #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"
-@@ -798,30 +799,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -772,30 +773,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  }
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
@@ -89,7 +89,7 @@
  }
  
  //----------------------------------------------------------------------------------------
-@@ -852,28 +871,40 @@ static nsresult pref_InitDefaults()
+@@ -826,28 +845,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)