From: various contributors

Subject: replace gconf backend with more complete mapping for lockdown feature

diff --git a/extensions/pref/Makefile.in b/extensions/pref/Makefile.in

--- a/extensions/pref/Makefile.in

+++ b/extensions/pref/Makefile.in

@@ -40,13 +40,13 @@ DEPTH            = ../..

 topsrcdir        = @top_srcdir@

 srcdir           = @srcdir@

 VPATH            = @srcdir@

 include $(DEPTH)/config/autoconf.mk

 DIRS             = autoconfig

-ifdef MOZ_ENABLE_GTK2

+ifdef MOZ_ENABLE_GCONF

 DIRS		+= system-pref

 endif

 include $(topsrcdir)/config/rules.mk

diff --git a/extensions/pref/system-pref/src/Makefile.in b/extensions/pref/system-pref/src/Makefile.in

--- a/extensions/pref/system-pref/src/Makefile.in

+++ b/extensions/pref/system-pref/src/Makefile.in

@@ -38,47 +38,41 @@

 DEPTH = ../../../..

 topsrcdir = @top_srcdir@

 srcdir = @srcdir@

 VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

 MODULE = system-pref

-LIBRARY_NAME = system-pref_s

+LIBRARY_NAME = system-pref

 ifneq ($(OS_ARCH),WINNT)

 SHORT_LIBNAME = syspref

 endif

 # We want to force the creation of a static lib.

-FORCE_STATIC_LIB = 1

-LIBXUL_LIBRARY = 1

+#FORCE_STATIC_LIB = 1

+LIBXUL_LIBRARY   = 1

+MODULE_NAME      = nsSystemPrefModule

+IS_COMPONENT     = 1

+EXPORT_LIBRARY   = 1

 REQUIRES        = xpcom \

 		  string \

 		  embedcomponents \

 		  pref \

 		  $(NULL)

-ifdef MOZ_ENABLE_GTK2

-DIRS		= gconf

-endif

+CPPSRCS =   \

+  nsSystemPref.cpp	   \

+  nsSystemPrefFactory.cpp  \

+  $(NULL)

 EXTRA_DSO_LDOPTS = \

-		-L$(DIST)/bin \

 		$(MOZ_COMPONENT_LIBS) \

 		$(NULL)

-CPPSRCS =   \

-  nsSystemPref.cpp	   \

-  $(NULL)

-

 EXPORTS		= \

-		nsSystemPrefLog.h \

+		nsISystemPrefService.h \

 		$(NULL)

 include $(topsrcdir)/config/rules.mk

-ifdef MOZ_ENABLE_GTK2

-INCLUDES	+= \

-		-I$(srcdir)/gconf \

-		$(NULL)

-endif

diff --git a/extensions/pref/system-pref/src/gconf/Makefile.in b/extensions/pref/system-pref/src/gconf/Makefile.in

--- a/extensions/pref/system-pref/src/gconf/Makefile.in

+++ b/extensions/pref/system-pref/src/gconf/Makefile.in

@@ -37,50 +37,37 @@

 DEPTH = ../../../../..

 topsrcdir = @top_srcdir@

 srcdir = @srcdir@

 VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = system-pref

-LIBRARY_NAME = system-pref

-LIBXUL_LIBRARY = 1

+MODULE = system-pref-gconf

+LIBRARY_NAME = system-pref-gconf

+IS_COMPONENT = 1

+MODULE_NAME = nsSystemPrefServiceModule

+FORCE_SHARED_LIB = 1

 REQUIRES        = pref \

 		  string \

 		  xpcom \

-		  embedcomponents \

+		  necko \

 		  $(NULL)

 CPPSRCS =   \

 	nsSystemPrefService.cpp       \

-	nsSystemPrefFactory.cpp \

 	$(NULL)

-SHARED_LIBRARY_LIBS = ../libsystem-pref_s.a

+OS_INCLUDES += $(MOZ_GCONF_CFLAGS)

+

 EXTRA_DSO_LDOPTS = \

-		-L$(DIST)/bin \

-		$(MOZ_COMPONENT_LIBS) \

-		$(MOZ_GTK2_LIBS) \

+		$(XPCOM_GLUE_LDOPTS) \

+		$(MOZ_GCONF_LIBS)    \

+		$(NSPR_LIBS) \

 		$(NULL)

-EXPORT_LIBRARY = 1

-IS_COMPONENT = 1

-MODULE_NAME	= nsSystemPrefModule

-

-EXPORTS		= \

-		nsSystemPrefService.h \

-		$(NULL)

 include $(topsrcdir)/config/rules.mk

-CFLAGS		+= $(MOZ_GTK2_CFLAGS)

-CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)

-

-LOCAL_INCLUDES = -I$(srcdir)/..

-

-export::

-	$(INSTALL) $(srcdir)/../nsSystemPrefFactory.cpp .

-

 GARBAGE += nsSystemPrefFactory.cpp

diff --git a/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp b/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp

--- a/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp

+++ b/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp

@@ -18,17 +18,19 @@

  * The Original Code is mozilla.org code.

  *

  * The Initial Developer of the Original Code is Sun Microsystems, Inc.

  * Portions created by Sun Microsystems are Copyright (C) 2003 Sun

  * Microsystems, Inc. All Rights Reserved.

  *

  * Original Author: Bolian Yin (bolian.yin@sun.com)

  *

- * Contributor(s):

+ * Contributor(s): Robert O'Callahan/Novell (rocallahan@novell.com)

+ *                 Hubert Figuiere (hfiguiere@novell.com)

+ *                 Wolfgang Rosenauer (wr@rosenauer.org)

  *

  * 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 NPL, indicate your

@@ -36,299 +38,1300 @@

  * 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 NPL, the GPL or the LGPL.

  *

  * ***** END LICENSE BLOCK ***** */

 #include <glib.h>

 #include <glib-object.h>

+#include <gconf/gconf-client.h>

 #include "plstr.h"

 #include "nsCOMPtr.h"

-#include "nsIPrefBranch.h"

-#include "nsIPrefService.h"

+#include "nsIPref.h"

 #include "nsIServiceManager.h"

 #include "nsIObserver.h"

 #include "nsWeakReference.h"

+#include "nsIPrefBranch2.h"

+#include "nsDataHashtable.h"

+#include "nsHashKeys.h"

+#include "nsICategoryManager.h"

+#include "nsIGenericFactory.h"

+#include "nsStringAPI.h"

+#include "nsIPermissionManager.h"

+#include "../nsSystemPref.h"

-#include "nsString.h"

-#include "nsSystemPrefLog.h"

-#include "nsSystemPrefService.h"

+#define NS_SYSTEMPREF_SERVICE_CID                  \

+  { /* {3724e748-b088-4bf8-9298-aad426b66293} */       \

+    0x3724e748,                                        \

+    0xb088,                                            \

+    0x4bf8,                                            \

+        { 0x92, 0x98, 0xaa, 0xd4, 0x26, 0xb6, 0x62, 0x93 } \

+  }

-/*************************************************************************

- * The strange thing here is that we load the gconf library manually and 

- * search the function pointers we need. If that process fails, no gconf

- * support is available in mozilla. The aim is to make mozilla independent

- * on gconf, in both compile time and run time.

- ************************************************************************/

+#define NS_SYSTEMPREF_SERVICE_CLASSNAME "System Preferences Platform Service"

-//gconf types

-extern "C" {

+NS_DEFINE_STATIC_IID_ACCESSOR(nsISystemPrefService, NS_ISYSTEMPREFSERVICE_IID)

-    typedef enum {

-        GCONF_VALUE_INVALID,

-        GCONF_VALUE_STRING,

-        GCONF_VALUE_INT,

-        GCONF_VALUE_FLOAT,

-        GCONF_VALUE_BOOL,

-        GCONF_VALUE_SCHEMA,

+/**

+ * We can link directly to the gconf library. If it's not available,

+ * this component just won't load and no system prefs will be offered.

+ */

-        GCONF_VALUE_LIST,

-        GCONF_VALUE_PAIR

+#define NUM_ELEM(a) (sizeof(a)/sizeof(a[0]))

-    }GConfValueType;

+class nsSystemPrefService;

-    typedef struct {

-        GConfValueType type;

-    }GConfValue;

+/**

+ * List the preferences that have a simple mapping between Moz and gconf.

+ * These preferences have the same meaning and their values are

+ * automatically converted.

+ */

+struct SimplePrefMapping {

+    const char *mozPrefName;

+    const char *gconfPrefName;

+    /**

+     * If this is PR_FALSE, then we never allow Mozilla to change

+     * this setting. The Mozilla pref will always be locked.

+     * If this is PR_TRUE then Mozilla will be allowed to change

+     * the setting --- but only if it is writable in gconf.

+     */

+    PRBool allowWritesFromMozilla;

+};

+typedef nsresult (* ComplexGConfPrefChanged)(nsSystemPrefService* aPrefService,

+                                             GConfClient* aClient);

+typedef nsresult (* ComplexMozPrefChanged)(nsSystemPrefService* aPrefService,

+                                           GConfClient* aClient);

+struct ComplexGConfPrefMapping {

+    const char* gconfPrefName;

+    ComplexGConfPrefChanged callback;

+};

-    typedef void * (*GConfClientGetDefaultType) (void);

-    typedef PRBool (*GConfClientGetBoolType) (void *client, const gchar *key,

-                                              GError **err);

-    typedef gchar* (*GConfClientGetStringType) (void *client, const gchar *key,

-                                                GError **err);

-    typedef PRInt32 (*GConfClientGetIntType) (void *client, const gchar *key,

-                                              GError **err);

-    typedef GSList* (*GConfClientGetListType) (void *client, const gchar *key,

-                                               GConfValueType list_type,

-                                               GError **err);

-    typedef  void (*GConfClientNotifyFuncType) (void* client, guint cnxn_id,

-                                                void *entry, 

-                                                gpointer user_data);

-    typedef guint (*GConfClientNotifyAddType) (void* client,

-                                               const gchar* namespace_section,

-                                               GConfClientNotifyFuncType func,

-                                               gpointer user_data,

-                                               GFreeFunc destroy_notify,

-                                               GError** err);

-    typedef void (*GConfClientNotifyRemoveType) (void *client,

-                                                 guint cnxn);

-    typedef void (*GConfClientAddDirType) (void *client,

-                                           const gchar *dir,

-                                           guint8 preload,

-                                           GError **err);

-    typedef void (*GConfClientRemoveDirType) (void *client,

-                                              const gchar *dir,

-                                              GError **err);

+struct ComplexMozPrefMapping {

+    const char* mozPrefName;

+    ComplexMozPrefChanged callback;

+};

-    typedef const char* (*GConfEntryGetKeyType) (const void *entry);

-    typedef GConfValue* (*GConfEntryGetValueType) (const void *entry);

+class nsSystemPrefService : public nsISystemPrefService, nsIPrefBranch

+ {

+ public:

+    NS_DECL_ISUPPORTS

+    NS_DECL_NSIPREFBRANCH

-    typedef const char* (*GConfValueGetStringType) (const GConfValue *value);

-    typedef PRInt32 (*GConfValueGetIntType) (const GConfValue *value);

-    typedef PRBool (*GConfValueGetBoolType) (const GConfValue *value);

+    nsresult Init();

-    

-    static void gconf_key_listener (void* client, guint cnxn_id,

-                                    void *entry, gpointer user_data);

-}

+    virtual nsresult LoadSystemPreferences(nsISystemPref* aPrefs);

+    virtual nsresult NotifyMozillaPrefChanged(const char* aPrefName);

+    virtual nsresult NotifyUnloadSystemPreferences();

-struct GConfCallbackData

-{

-    GConfProxy *proxy;

-    void * userData;

-    PRUint32 atom;

-    PRUint32 notifyId;

-};

-//////////////////////////////////////////////////////////////////////

-// GConPrxoy is a thin wrapper for easy use of gconf funcs. It loads the

-// gconf library and initializes the func pointers for later use.

-//////////////////////////////////////////////////////////////////////

-class GConfProxy

-{

-public:

-    GConfProxy(nsSystemPrefService* aSysPrefService);

-    ~GConfProxy();

-    PRBool Init();

+    nsSystemPrefService();

+    virtual ~nsSystemPrefService();

-    nsresult GetBoolPref(const char *aMozKey, PRBool *retval);

-    nsresult GetCharPref(const char *aMozKey, char **retval);

-    nsresult GetIntPref(const char *aMozKey, PRInt32 *retval);

-

-    nsresult NotifyAdd (PRUint32 aAtom, void *aUserData);

-    nsresult NotifyRemove (PRUint32 aAtom, const void *aUserData);

-

-    nsresult GetAtomForMozKey(const char *aMozKey, PRUint32 *aAtom) {

-        return GetAtom(aMozKey, 0, aAtom); 

+    nsISystemPref* GetPrefs() { return mPref; }

+    SimplePrefMapping* GetSimpleCallbackData(PRUint32 aKey) {

+      SimplePrefMapping* result = nsnull;

+      mGConfSimpleCallbacks.Get(aKey, &result);

+      return result;

     }

-    const char *GetMozKey(PRUint32 aAtom) {

-        return GetKey(aAtom, 0); 

-    }

-

-    void OnNotify(void *aClient, void * aEntry, PRUint32 aNotifyId,

-                  GConfCallbackData *aData);

+    ComplexGConfPrefMapping* GetComplexCallbackData(PRUint32 aKey) {

+      ComplexGConfPrefMapping* result = nsnull;

+      mGConfComplexCallbacks.Get(aKey, &result);

+      return result;

+     }

 private:

-    void *mGConfClient;

-    PRLibrary *mGConfLib;

-    PRBool mInitialized;

-    nsSystemPrefService *mSysPrefService;

+    nsISystemPref* mPref;

+    nsDataHashtable<nsUint32HashKey, SimplePrefMapping*> mGConfSimpleCallbacks;

+    nsDataHashtable<nsUint32HashKey, ComplexGConfPrefMapping*> mGConfComplexCallbacks;

+    // This is set to PR_FALSE temporarily to stop listening to gconf

+    // change notifications (while we change gconf values)

+    PRPackedBool mListenToGConf;

-    //listeners

-    nsAutoVoidArray *mObservers;

-

-    void InitFuncPtrs();

-    //gconf public func ptrs

-

-    //gconf client funcs

-    GConfClientGetDefaultType GConfClientGetDefault;

-    GConfClientGetBoolType GConfClientGetBool;

-    GConfClientGetStringType GConfClientGetString;

-    GConfClientGetIntType GConfClientGetInt;

-    GConfClientGetListType GConfClientGetList;

-    GConfClientNotifyAddType GConfClientNotifyAdd;

-    GConfClientNotifyRemoveType GConfClientNotifyRemove;

-    GConfClientAddDirType GConfClientAddDir;

-    GConfClientRemoveDirType GConfClientRemoveDir;

-

-    //gconf entry funcs

-    GConfEntryGetValueType GConfEntryGetValue;

-    GConfEntryGetKeyType GConfEntryGetKey;

-

-    //gconf value funcs

-    GConfValueGetBoolType GConfValueGetBool;

-    GConfValueGetStringType GConfValueGetString;

-    GConfValueGetIntType GConfValueGetInt;

-

-    //pref name translating stuff

-    nsresult GetAtom(const char *aKey, PRUint8 aNameType, PRUint32 *aAtom);

-    nsresult GetAtomForGConfKey(const char *aGConfKey, PRUint32 *aAtom) \

-    {return GetAtom(aGConfKey, 1, aAtom);}

-    const char *GetKey(PRUint32 aAtom, PRUint8 aNameType);

-    const char *GetGConfKey(PRUint32 aAtom) \

-    {return GetKey(aAtom, 1); }

-    inline const char *MozKey2GConfKey(const char *aMozKey);

-

-    //const strings

-    static const char sPrefGConfKey[];

-    static const char sDefaultLibName1[];

-    static const char sDefaultLibName2[];

+    GConfValue* GConfGet(const char *aPrefName);

 };

-struct SysPrefCallbackData {

-    nsISupports *observer;

-    PRBool bIsWeakRef;

-    PRUint32 prefAtom;

-};

-

-PRBool

-sysPrefDeleteObserver(void *aElement, void *aData) {

-    SysPrefCallbackData *pElement =

-        static_cast<SysPrefCallbackData *>(aElement);

-    NS_RELEASE(pElement->observer);

-    nsMemory::Free(pElement);

-    return PR_TRUE;

-}

-

-NS_IMPL_ISUPPORTS2(nsSystemPrefService, nsIPrefBranch, nsIPrefBranch2)

-

-/* public */

 nsSystemPrefService::nsSystemPrefService()

-    :mInitialized(PR_FALSE),

-     mGConf(nsnull),

-     mObservers(nsnull)

+   : mPref(nsnull), mListenToGConf(PR_TRUE)

 {

+   mGConfSimpleCallbacks.Init();

+   mGConfComplexCallbacks.Init();

 }

 nsSystemPrefService::~nsSystemPrefService()

 {

-    mInitialized = PR_FALSE;

-

-    if (mGConf)

-        delete mGConf;

-    if (mObservers) {

-        (void)mObservers->EnumerateForwards(sysPrefDeleteObserver, nsnull);

-        delete mObservers;

-    }

+   NotifyUnloadSystemPreferences();

 }

 nsresult

 nsSystemPrefService::Init()

 {

-    if (!gSysPrefLog) {

-        gSysPrefLog = PR_NewLogModule("Syspref");

-        if (!gSysPrefLog) return NS_ERROR_OUT_OF_MEMORY;

+    return NS_OK;

+}

+

+NS_IMPL_ISUPPORTS2(nsSystemPrefService, 

+                   nsISystemPrefService, 

+                   nsIPrefBranch)

+

+static GConfClient* GetGConf() {

+    return gconf_client_get_default();

+}

+

+static PRBool VerifyMatchingTypes(nsISystemPref* aPrefs,

+                                  const char* aMozPref, GConfValue* aVal)

+{

+    nsCOMPtr<nsIPrefBranch2> prefBranch = aPrefs->GetPrefUserBranch();

+    PRInt32 type;

+    nsresult rv = prefBranch->GetPrefType(aMozPref, &type);

+    if (NS_FAILED(rv)) {

+        // pref probably doesn't exist. Let gconf set it.

+        return PR_TRUE;

     }

-    SYSPREF_LOG(("Init SystemPref Service\n"));

-    if (mInitialized)

+    PRBool ok;

+    switch (aVal->type) {

+    case GCONF_VALUE_STRING:

+        ok = type == nsIPrefBranch2::PREF_STRING;

+        break;

+    case GCONF_VALUE_INT:

+        ok = type == nsIPrefBranch2::PREF_INT;

+        break;

+    case GCONF_VALUE_BOOL:

+        ok = type == nsIPrefBranch2::PREF_BOOL;

+        break;

+    default:

+        NS_ERROR("Unhandled gconf preference type");

+        return PR_FALSE;

+    }

+

+    NS_ASSERTION(ok, "Mismatched gconf/Mozilla pref types");

+    return ok;

+}

+

+/**

+ * Map a gconf pref value into the corresponding Mozilla pref.

+ */

+static nsresult ApplySimpleMapping(SimplePrefMapping* aMap,

+                                   nsISystemPref* aPrefs,

+                                   GConfClient* aClient)

+{

+    GConfValue* val = gconf_client_get(aClient, aMap->gconfPrefName, nsnull);

+    if (!val) {

+        // No gconf key, so there's really nothing to do

+        return NS_OK;

+    }