gnomemm r1688 - in gconfmm/trunk: . gconf/src tools/m4

[murrayc svn gnome org]

Author: murrayc
Date: Mon Aug 25 11:22:14 2008
New Revision: 1688
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1688&view=rev

Log:
2008-08-14  Josephine Hsu  <w30372 motorola com>

* gconf/src/gconf_methods.defs
* gconf/src/value.hg
* gconf/src/client.hg
* tools/m4/convert_gconfmm.m4 :
Added UnsetFlags and Client::recursive_unset().


Modified:
   gconfmm/trunk/ChangeLog
   gconfmm/trunk/gconf/src/client.hg
   gconfmm/trunk/gconf/src/gconf_methods.defs
   gconfmm/trunk/gconf/src/value.hg
   gconfmm/trunk/tools/m4/convert_gconfmm.m4

Modified: gconfmm/trunk/gconf/src/client.hg
==============================================================================
--- gconfmm/trunk/gconf/src/client.hg	(original)
+++ gconfmm/trunk/gconf/src/client.hg	Mon Aug 25 11:22:14 2008
@@ -275,6 +275,13 @@
      * @throw Gnome::Conf::Error.
      */
     _WRAP_METHOD(void unset(const Glib::ustring& key), gconf_client_unset, errthrow)
+
+    /** Recursively unset all keys below key and key it self.
+     * @param key the configuration key to unset.
+     * @param flags change how the unset is done.
+     * @throw Gnome::Conf::Error.
+     */
+    _WRAP_METHOD(void recursive_unset(const Glib::ustring& key, UnsetFlags flags), gconf_client_recursive_unset, errthrow)
     
     /** Retrieve all keys in the given configuration directory.
      * Get all the configuration keys in the given directory, without recursion.

Modified: gconfmm/trunk/gconf/src/gconf_methods.defs
==============================================================================
--- gconfmm/trunk/gconf/src/gconf_methods.defs	(original)
+++ gconfmm/trunk/gconf/src/gconf_methods.defs	Mon Aug 25 11:22:14 2008
@@ -1,7 +1,7 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object ConfClient
-  (in-module "G")
+(define-object Client
+  (in-module "GConf")
   (parent "GObject")
   (c-name "GConfClient")
   (gtype-id "G_TYPE_CONF_CLIENT")
@@ -9,8 +9,8 @@
 
 ;; Enumerations and flags ...
 
-(define-enum ConfClientPreloadType
-  (in-module "G")
+(define-enum ClientPreloadType
+  (in-module "GConf")
   (c-name "GConfClientPreloadType")
   (gtype-id "G_TYPE_CONF_CLIENT_PRELOAD_TYPE")
   (values
@@ -20,8 +20,8 @@
   )
 )
 
-(define-enum ConfClientErrorHandlingMode
-  (in-module "G")
+(define-enum ClientErrorHandlingMode
+  (in-module "GConf")
   (c-name "GConfClientErrorHandlingMode")
   (gtype-id "G_TYPE_CONF_CLIENT_ERROR_HANDLING_MODE")
   (values
@@ -31,8 +31,8 @@
   )
 )
 
-(define-enum ConfError
-  (in-module "G")
+(define-enum Error
+  (in-module "GConf")
   (c-name "GConfError")
   (gtype-id "G_TYPE_CONF_ERROR")
   (values
@@ -56,8 +56,8 @@
   )
 )
 
-(define-enum ConfValueType
-  (in-module "G")
+(define-enum ValueType
+  (in-module "GConf")
   (c-name "GConfValueType")
   (gtype-id "G_TYPE_CONF_VALUE_TYPE")
   (values
@@ -72,8 +72,28 @@
   )
 )
 
+(define-flags UnsetFlags
+  (in-module "GConf")
+  (c-name "GConfUnsetFlags")
+  (gtype-id "G_TYPE_CONF_UNSET_FLAGS")
+  (values
+    '("s" "GCONF_UNSET_INCLUDING_SCHEMA_NAMES")
+  )
+)
+
 
-;; From /usr/include/gconf/2/gconf/gconf-changeset.h
+;; From gconf-changeset.h
+
+(define-method commit_change_set
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_commit_change_set")
+  (return-type "gboolean")
+  (parameters
+    '("GConfChangeSet*" "cs")
+    '("gboolean" "remove_committed")
+    '("GError**" "err")
+  )
+)
 
 (define-method reverse_change_set
   (of-object "GConfEngine")
@@ -106,8 +126,14 @@
   (varargs #t)
 )
 
+(define-function gconf_change_set_get_type
+  (c-name "gconf_change_set_get_type")
+  (return-type "GType")
+)
+
 (define-function gconf_change_set_new
   (c-name "gconf_change_set_new")
+  (is-constructor-of "GconfChangeSet")
   (return-type "GConfChangeSet*")
 )
 
@@ -285,7 +311,7 @@
 
 
 
-;; From /usr/include/gconf/2/gconf/gconf-client.h
+;; From gconf-client.h
 
 (define-function gconf_client_get_type
   (c-name "gconf_client_get_type")
@@ -348,6 +374,15 @@
   )
 )
 
+(define-method notify
+  (of-object "GConfClient")
+  (c-name "gconf_client_notify")
+  (return-type "none")
+  (parameters
+    '("const-char*" "key")
+  )
+)
+
 (define-method set_error_handling
   (of-object "GConfClient")
   (c-name "gconf_client_set_error_handling")
@@ -445,6 +480,17 @@
   )
 )
 
+(define-method recursive_unset
+  (of-object "GConfClient")
+  (c-name "gconf_client_recursive_unset")
+  (return-type "gboolean")
+  (parameters
+    '("const-char*" "key")
+    '("GConfUnsetFlags" "flags")
+    '("GError**" "err")
+  )
+)
+
 (define-method all_entries
   (of-object "GConfClient")
   (c-name "gconf_client_all_entries")
@@ -722,7 +768,12 @@
 
 
 
-;; From /usr/include/gconf/2/gconf/gconf-engine.h
+;; From gconf-engine.h
+
+(define-function gconf_engine_get_default
+  (c-name "gconf_engine_get_default")
+  (return-type "GConfEngine*")
+)
 
 (define-function gconf_engine_get_for_address
   (c-name "gconf_engine_get_for_address")
@@ -772,7 +823,17 @@
 
 
 
-;; From /usr/include/gconf/2/gconf/gconf-enum-types.h
+;; From gconf-enum-types.h
+
+(define-function gconf_value_type_get_type
+  (c-name "gconf_value_type_get_type")
+  (return-type "GType")
+)
+
+(define-function gconf_unset_flags_get_type
+  (c-name "gconf_unset_flags_get_type")
+  (return-type "GType")
+)
 
 (define-function gconf_error_get_type
   (c-name "gconf_error_get_type")
@@ -791,14 +852,568 @@
 
 
 
-;; From /usr/include/gconf/2/gconf/gconf-error.h
+;; From gconf-error.h
+
+(define-function gconf_error_quark
+  (c-name "gconf_error_quark")
+  (return-type "GQuark")
+)
+
+
+
+;; From gconf.h
+
+(define-method notify_add
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_notify_add")
+  (return-type "guint")
+  (parameters
+    '("const-gchar*" "namespace_section")
+    '("GConfNotifyFunc" "func")
+    '("gpointer" "user_data")
+    '("GError**" "err")
+  )
+)
+
+(define-method notify_remove
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_notify_remove")
+  (return-type "none")
+  (parameters
+    '("guint" "cnxn")
+  )
+)
+
+(define-method get
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get")
+  (return-type "GConfValue*")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_without_default
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_without_default")
+  (return-type "GConfValue*")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_entry
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_entry")
+  (return-type "GConfEntry*")
+  (parameters
+    '("const-gchar*" "key")
+    '("const-gchar*" "locale")
+    '("gboolean" "use_schema_default")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_with_locale
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_with_locale")
+  (return-type "GConfValue*")
+  (parameters
+    '("const-gchar*" "key")
+    '("const-gchar*" "locale")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_default_from_schema
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_default_from_schema")
+  (return-type "GConfValue*")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method set
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_set")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("const-GConfValue*" "value")
+    '("GError**" "err")
+  )
+)
+
+(define-method unset
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_unset")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method associate_schema
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_associate_schema")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("const-gchar*" "schema_key")
+    '("GError**" "err")
+  )
+)
+
+(define-method all_entries
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_all_entries")
+  (return-type "GSList*")
+  (parameters
+    '("const-gchar*" "dir")
+    '("GError**" "err")
+  )
+)
+
+(define-method all_dirs
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_all_dirs")
+  (return-type "GSList*")
+  (parameters
+    '("const-gchar*" "dir")
+    '("GError**" "err")
+  )
+)
+
+(define-method suggest_sync
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_suggest_sync")
+  (return-type "none")
+  (parameters
+    '("GError**" "err")
+  )
+)
+
+(define-method dir_exists
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_dir_exists")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "dir")
+    '("GError**" "err")
+  )
+)
+
+(define-method remove_dir
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_remove_dir")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "dir")
+    '("GError**" "err")
+  )
+)
+
+(define-method key_is_writable
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_key_is_writable")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-function gconf_valid_key
+  (c-name "gconf_valid_key")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gchar**" "why_invalid")
+  )
+)
+
+(define-function gconf_key_is_below
+  (c-name "gconf_key_is_below")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "above")
+    '("const-gchar*" "below")
+  )
+)
+
+(define-function gconf_concat_dir_and_key
+  (c-name "gconf_concat_dir_and_key")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "dir")
+    '("const-gchar*" "key")
+  )
+)
+
+(define-function gconf_unique_key
+  (c-name "gconf_unique_key")
+  (return-type "gchar*")
+)
+
+(define-function gconf_escape_key
+  (c-name "gconf_escape_key")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "arbitrary_text")
+    '("int" "len")
+  )
+)
+
+(define-function gconf_unescape_key
+  (c-name "gconf_unescape_key")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "escaped_key")
+    '("int" "len")
+  )
+)
+
+(define-method get_float
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_float")
+  (return-type "gdouble")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_int
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_int")
+  (return-type "gint")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_string
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_string")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_bool
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_bool")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_schema
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_schema")
+  (return-type "GConfSchema*")
+  (parameters
+    '("const-gchar*" "key")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_list
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_list")
+  (return-type "GSList*")
+  (parameters
+    '("const-gchar*" "key")
+    '("GConfValueType" "list_type")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_pair
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_pair")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("GConfValueType" "car_type")
+    '("GConfValueType" "cdr_type")
+    '("gpointer" "car_retloc")
+    '("gpointer" "cdr_retloc")
+    '("GError**" "err")
+  )
+)
+
+(define-method set_float
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_set_float")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gdouble" "val")
+    '("GError**" "err")
+  )
+)
+
+(define-method set_int
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_set_int")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gint" "val")
+    '("GError**" "err")
+  )
+)
+
+(define-method set_string
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_set_string")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("const-gchar*" "val")
+    '("GError**" "err")
+  )
+)
+
+(define-method set_bool
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_set_bool")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gboolean" "val")
+    '("GError**" "err")
+  )
+)
+
+(define-method set_schema
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_set_schema")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("const-GConfSchema*" "val")
+    '("GError**" "err")
+  )
+)
+
+(define-method set_list
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_set_list")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("GConfValueType" "list_type")
+    '("GSList*" "list")
+    '("GError**" "err")
+  )
+)
+
+(define-method set_pair
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_set_pair")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("GConfValueType" "car_type")
+    '("GConfValueType" "cdr_type")
+    '("gconstpointer" "address_of_car")
+    '("gconstpointer" "address_of_cdr")
+    '("GError**" "err")
+  )
+)
+
+(define-function gconf_string_to_enum
+  (c-name "gconf_string_to_enum")
+  (return-type "gboolean")
+  (parameters
+    '("GConfEnumStringPair[]" "lookup_table")
+    '("const-gchar*" "str")
+    '("gint*" "enum_value_retloc")
+  )
+)
+
+(define-function gconf_enum_to_string
+  (c-name "gconf_enum_to_string")
+  (return-type "const-gchar*")
+  (parameters
+    '("GConfEnumStringPair[]" "lookup_table")
+    '("gint" "enum_value")
+  )
+)
+
+(define-function gconf_debug_shutdown
+  (c-name "gconf_debug_shutdown")
+  (return-type "int")
+)
+
+(define-function gconf_init
+  (c-name "gconf_init")
+  (return-type "gboolean")
+  (parameters
+    '("int" "argc")
+    '("char**" "argv")
+    '("GError**" "err")
+  )
+)
+
+(define-function gconf_is_initialized
+  (c-name "gconf_is_initialized")
+  (return-type "gboolean")
+)
+
+(define-function gconf_preinit
+  (c-name "gconf_preinit")
+  (return-type "none")
+  (parameters
+    '("gpointer" "app")
+    '("gpointer" "mod_info")
+  )
+)
+
+(define-function gconf_postinit
+  (c-name "gconf_postinit")
+  (return-type "none")
+  (parameters
+    '("gpointer" "app")
+    '("gpointer" "mod_info")
+  )
+)
+
+(define-function gconf_clear_cache
+  (c-name "gconf_clear_cache")
+  (return-type "none")
+  (parameters
+    '("GConfEngine*" "conf")
+    '("GError**" "err")
+  )
+)
+
+(define-function gconf_synchronous_sync
+  (c-name "gconf_synchronous_sync")
+  (return-type "none")
+  (parameters
+    '("GConfEngine*" "conf")
+    '("GError**" "err")
+  )
+)
+
+(define-method get_full
+  (of-object "GConfEngine")
+  (c-name "gconf_engine_get_full")
+  (return-type "GConfValue*")
+  (parameters
+    '("const-gchar*" "key")
+    '("const-gchar*" "locale")
+    '("gboolean" "use_schema_default")
+    '("gboolean*" "is_default_p")
+    '("gboolean*" "is_writable_p")
+    '("GError**" "err")
+  )
+)
+
 
 
+;; From gconf-listeners.h
 
-;; From /usr/include/gconf/2/gconf/gconf-schema.h
+(define-function gconf_listeners_new
+  (c-name "gconf_listeners_new")
+  (is-constructor-of "GconfListeners")
+  (return-type "GConfListeners*")
+)
+
+(define-method free
+  (of-object "GConfListeners")
+  (c-name "gconf_listeners_free")
+  (return-type "none")
+)
+
+(define-method add
+  (of-object "GConfListeners")
+  (c-name "gconf_listeners_add")
+  (return-type "guint")
+  (parameters
+    '("const-gchar*" "listen_point")
+    '("gpointer" "listener_data")
+    '("GFreeFunc" "destroy_notify")
+  )
+)
+
+(define-method remove
+  (of-object "GConfListeners")
+  (c-name "gconf_listeners_remove")
+  (return-type "none")
+  (parameters
+    '("guint" "cnxn_id")
+  )
+)
+
+(define-method notify
+  (of-object "GConfListeners")
+  (c-name "gconf_listeners_notify")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "all_above")
+    '("GConfListenersCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method count
+  (of-object "GConfListeners")
+  (c-name "gconf_listeners_count")
+  (return-type "guint")
+)
+
+(define-method foreach
+  (of-object "GConfListeners")
+  (c-name "gconf_listeners_foreach")
+  (return-type "none")
+  (parameters
+    '("GConfListenersForeach" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method get_data
+  (of-object "GConfListeners")
+  (c-name "gconf_listeners_get_data")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "cnxn_id")
+    '("gpointer*" "listener_data_p")
+    '("const-gchar**" "location_p")
+  )
+)
+
+(define-method remove_if
+  (of-object "GConfListeners")
+  (c-name "gconf_listeners_remove_if")
+  (return-type "none")
+  (parameters
+    '("GConfListenersPredicate" "predicate")
+    '("gpointer" "user_data")
+  )
+)
+
+
+
+;; From gconf-schema.h
 
 (define-function gconf_schema_new
   (c-name "gconf_schema_new")
+  (is-constructor-of "GconfSchema")
   (return-type "GConfSchema*")
 )
 
@@ -960,7 +1575,7 @@
 
 
 
-;; From /usr/include/gconf/2/gconf/gconf-value.h
+;; From gconf-value.h
 
 (define-method get_string
   (of-object "GConfValue")
@@ -1018,6 +1633,7 @@
 
 (define-function gconf_value_new
   (c-name "gconf_value_new")
+  (is-constructor-of "GconfValue")
   (return-type "GConfValue*")
   (parameters
     '("GConfValueType" "type")
@@ -1189,6 +1805,7 @@
 
 (define-function gconf_meta_info_new
   (c-name "gconf_meta_info_new")
+  (is-constructor-of "GconfMetaInfo")
   (return-type "GConfMetaInfo*")
 )
 
@@ -1257,6 +1874,7 @@
 
 (define-function gconf_entry_new
   (c-name "gconf_entry_new")
+  (is-constructor-of "GconfEntry")
   (return-type "GConfEntry*")
   (parameters
     '("const-gchar*" "key")
@@ -1273,12 +1891,30 @@
   )
 )
 
+(define-method copy
+  (of-object "GConfEntry")
+  (c-name "gconf_entry_copy")
+  (return-type "GConfEntry*")
+)
+
 (define-method free
   (of-object "GConfEntry")
   (c-name "gconf_entry_free")
   (return-type "none")
 )
 
+(define-method ref
+  (of-object "GConfEntry")
+  (c-name "gconf_entry_ref")
+  (return-type "none")
+)
+
+(define-method unref
+  (of-object "GConfEntry")
+  (c-name "gconf_entry_unref")
+  (return-type "none")
+)
+
 (define-method steal_value
   (of-object "GConfEntry")
   (c-name "gconf_entry_steal_value")

Modified: gconfmm/trunk/gconf/src/value.hg
==============================================================================
--- gconfmm/trunk/gconf/src/value.hg	(original)
+++ gconfmm/trunk/gconf/src/value.hg	Mon Aug 25 11:22:14 2008
@@ -32,6 +32,7 @@
 {
 
 _WRAP_ENUM(ValueType,GConfValueType)
+_WRAP_ENUM(UnsetFlags, GConfUnsetFlags)
 
 typedef std::pair<Value, Value> ValuePair;    
 typedef std::pair<ValueType, ValueType> ValueTypePair;

Modified: gconfmm/trunk/tools/m4/convert_gconfmm.m4
==============================================================================
--- gconfmm/trunk/tools/m4/convert_gconfmm.m4	(original)
+++ gconfmm/trunk/tools/m4/convert_gconfmm.m4	Mon Aug 25 11:22:14 2008
@@ -32,6 +32,7 @@
 _CONVERSION(`Gnome::Conf::$1', `GConf$1', ((GConf$1)(__ARG3__)))
 ')dnl
 _CONV_ENUM_GCONFMM(`ClientPreloadType')
+_CONV_ENUM_GCONFMM(`UnsetFlags')
 _CONV_ENUM_GCONFMM(`ClientErrorHandlingMode')
 _CONV_ENUM_GCONFMM(`ValueType')