--- gconf-2.21.90.orig/doc/gconf/html/gconf-GConfClient.html +++ gconf-2.21.90/doc/gconf/html/gconf-GConfClient.html @@ -21,16 +21,16 @@ GConf Reference Manual Next -Top +Top  |  - Description + Description
- @@ -2272,20 +1834,12 @@
-

+

gconf_client_set_float ()

-
gboolean            gconf_client_set_float              (GConfClient *client,
-                                                         const gchar *key,
-                                                         gdouble val,
-                                                         GError **err);
+
gboolean            gconf_client_set_float              (GConfClient *client,
+                                                         const gchar *key,
+                                                         gdouble val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a float (GCONF_VALUE_FLOAT), gconf_client_set_float() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -2310,9 +1864,7 @@

- @@ -2328,20 +1880,12 @@
-

+

gconf_client_set_int ()

-
gboolean            gconf_client_set_int                (GConfClient *client,
-                                                         const gchar *key,
-                                                         gint val,
-                                                         GError **err);
+
gboolean            gconf_client_set_int                (GConfClient *client,
+                                                         const gchar *key,
+                                                         gint val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store an integer (GCONF_VALUE_INT), gconf_client_set_int() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -2366,9 +1910,7 @@

- @@ -2384,20 +1926,12 @@
-

+

gconf_client_set_string ()

-
gboolean            gconf_client_set_string             (GConfClient *client,
-                                                         const gchar *key,
-                                                         const gchar *val,
-                                                         GError **err);
+
gboolean            gconf_client_set_string             (GConfClient *client,
+                                                         const gchar *key,
+                                                         const gchar *val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a string (GCONF_VALUE_STRING), gconf_client_set_string() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -2422,9 +1956,7 @@

- @@ -2440,20 +1972,12 @@
-

+

gconf_client_set_bool ()

-
gboolean            gconf_client_set_bool               (GConfClient *client,
-                                                         const gchar *key,
-                                                         gboolean val,
-                                                         GError **err);
+
gboolean            gconf_client_set_bool               (GConfClient *client,
+                                                         const gchar *key,
+                                                         gboolean val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but but doesn't store a boolean (GCONF_VALUE_BOOL), gconf_client_set_bool() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -2478,9 +2002,7 @@

- @@ -2496,18 +2018,12 @@
-

+

gconf_client_set_schema ()

-
gboolean            gconf_client_set_schema             (GConfClient *client,
-                                                         const gchar *key,
+
gboolean            gconf_client_set_schema             (GConfClient *client,
+                                                         const gchar *key,
                                                          const GConfSchema *val,
-                                                         GError **err);
+ GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a schema value (GCONF_VALUE_SCHEMA), gconf_client_set_schema() will fail. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. @@ -2532,9 +2048,7 @@

- @@ -2550,21 +2064,13 @@
-

+

gconf_client_set_list ()

-
gboolean            gconf_client_set_list               (GConfClient *client,
-                                                         const gchar *key,
+
gboolean            gconf_client_set_list               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);
+ GSList *list, + GError **err);

Changes the value of key to a list of type list_type. Automatically creates the key if it didn't exist before (ie it was unset or it had a default value). If the key already exists but doesn't store a list value @@ -2595,9 +2101,7 @@

- @@ -2613,25 +2117,15 @@
-

+

gconf_client_set_pair ()

-
gboolean            gconf_client_set_pair               (GConfClient *client,
-                                                         const gchar *key,
+
gboolean            gconf_client_set_pair               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);
+ gconstpointer address_of_car, + gconstpointer address_of_cdr, + GError **err);

Changes the value of key to a pair with the first field of type car_type and the second field of type cdr_type. Automatically creates the key if it didn't exist before (ie it was unset or it had a default value). If the key @@ -2673,9 +2167,7 @@

- @@ -2691,12 +2183,10 @@
-

+

gconf_client_error ()

-
void                gconf_client_error                  (GConfClient *client,
-                                                         GError *error);
+
void                gconf_client_error                  (GConfClient *client,
+                                                         GError *error);

Emits the "error" signal. Rarely useful.

@@ -2720,12 +2210,10 @@

-

+

gconf_client_unreturned_error ()

-
void                gconf_client_unreturned_error       (GConfClient *client,
-                                                         GError *error);
+
void                gconf_client_unreturned_error       (GConfClient *client,
+                                                         GError *error);

Emits the "unreturned_error" signal. Rarely useful.

@@ -2749,12 +2237,10 @@

-

+

gconf_client_value_changed ()

-
void                gconf_client_value_changed          (GConfClient *client,
-                                                         const gchar *key,
+
void                gconf_client_value_changed          (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValue *value);

Emits the "value_changed" signal. Rarely useful. @@ -2784,18 +2270,12 @@


-

+

gconf_client_commit_change_set ()

-
gboolean            gconf_client_commit_change_set      (GConfClient *client,
+
gboolean            gconf_client_commit_change_set      (GConfClient *client,
                                                          GConfChangeSet *cs,
-                                                         gboolean remove_committed,
-                                                         GError **err);
+ gboolean remove_committed, + GError **err);

Applies the changes in the change set to the GConfClient passed as the first argument. If remove_committed is TRUE, @@ -2831,9 +2311,7 @@

- @@ -2849,13 +2327,11 @@
-

+

gconf_client_reverse_change_set ()

-
GConfChangeSet*     gconf_client_reverse_change_set     (GConfClient *client,
+
GConfChangeSet*     gconf_client_reverse_change_set     (GConfClient *client,
                                                          GConfChangeSet *cs,
-                                                         GError **err);
+ GError **err);

Creates a change set that would reverse cs. That is, for each change in cs, save the current state of that key in the returned change set. @@ -2875,9 +2351,7 @@

- @@ -2892,16 +2366,12 @@
-

+

gconf_client_change_set_from_currentv ()

-
GConfChangeSet*     gconf_client_change_set_from_currentv
+
GConfChangeSet*     gconf_client_change_set_from_currentv
                                                         (GConfClient *client,
-                                                         const gchar **keys,
-                                                         GError **err);
+ const gchar **keys, + GError **err);

Creates a change set that will change the keys in NULL-terminated array keys to their current state. Use this to @@ -2924,9 +2394,7 @@

- @@ -2941,16 +2409,12 @@
-

+

gconf_client_change_set_from_current ()

-
GConfChangeSet*     gconf_client_change_set_from_current
+
GConfChangeSet*     gconf_client_change_set_from_current
                                                         (GConfClient *client,
-                                                         GError **err,
-                                                         const gchar *first_key,
+                                                         GError **err,
+                                                         const gchar *first_key,
                                                          ...);

Convenient varargs version of gconf_client_change_set_from_currentv(). @@ -2965,9 +2429,7 @@

- @@ -2993,13 +2455,13 @@
-
+

-
+


-

[1] +

[1] This is all a white lie; some direct GConfEngine operations are safe. But it's complicated to know which, and if an operation isn't safe the resulting bugs will mangle the cache and cause weird bugs at an --- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-backend.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-backend.html @@ -21,16 +21,16 @@

- + Description

-GConfClient +GConfClient

GConfClient — GObject-based convenience wrapper

@@ -46,55 +46,29 @@ enum GConfClientPreloadType; enum GConfClientErrorHandlingMode; void (*GConfClientNotifyFunc) (GConfClient *client, - guint cnxn_id, + guint cnxn_id, GConfEntry *entry, - gpointer user_data); + gpointer user_data); void (*GConfClientErrorHandlerFunc) (GConfClient *client, - GError *error); + GError *error); #define GCONF_CLIENT (obj) GConfClient* gconf_client_get_default (void); GConfClient* gconf_client_get_for_engine (GConfEngine *engine); void gconf_client_add_dir (GConfClient *client, - const gchar *dir, + const gchar *dir, GConfClientPreloadType preload, - GError **err); + GError **err); void gconf_client_remove_dir (GConfClient *client, - const gchar *dir, - GError **err); -guint gconf_client_notify_add (GConfClient *client, - const gchar *namespace_section, + const gchar *dir, + GError **err); +guint gconf_client_notify_add (GConfClient *client, + const gchar *namespace_section, GConfClientNotifyFunc func, - gpointer user_data, - GFreeFunc destroy_notify, - GError **err); + gpointer user_data, + GFreeFunc destroy_notify, + GError **err); void gconf_client_notify_remove (GConfClient *client, - guint cnxn); + guint cnxn); void gconf_client_notify (GConfClient *client, const char *key); void gconf_client_set_error_handling (GConfClient *client, @@ -103,321 +77,135 @@ (GConfClientErrorHandlerFunc func); void gconf_client_clear_cache (GConfClient *client); void gconf_client_preload (GConfClient *client, - const gchar *dirname, + const gchar *dirname, GConfClientPreloadType type, - GError **err); + GError **err); void gconf_client_set (GConfClient *client, - const gchar *key, + const gchar *key, const GConfValue *val, - GError **err); + GError **err); GConfValue* gconf_client_get (GConfClient *client, - const gchar *key, - GError **err); + const gchar *key, + GError **err); GConfValue* gconf_client_get_without_default (GConfClient *client, - const gchar *key, - GError **err); + const gchar *key, + GError **err); GConfEntry* gconf_client_get_entry (GConfClient *client, - const gchar *key, - const gchar *locale, - gboolean use_schema_default, - GError **err); + const gchar *key, + const gchar *locale, + gboolean use_schema_default, + GError **err); GConfValue* gconf_client_get_default_from_schema (GConfClient *client, - const gchar *key, - GError **err); -gboolean gconf_client_unset (GConfClient *client, - const gchar *key, - GError **err); -gboolean gconf_client_recursive_unset (GConfClient *client, + const gchar *key, + GError **err); +gboolean gconf_client_unset (GConfClient *client, + const gchar *key, + GError **err); +gboolean gconf_client_recursive_unset (GConfClient *client, const char *key, GConfUnsetFlags flags, - GError **err); -GSList* gconf_client_all_entries (GConfClient *client, - const gchar *dir, - GError **err); -GSList* gconf_client_all_dirs (GConfClient *client, - const gchar *dir, - GError **err); + GError **err); +GSList* gconf_client_all_entries (GConfClient *client, + const gchar *dir, + GError **err); +GSList* gconf_client_all_dirs (GConfClient *client, + const gchar *dir, + GError **err); void gconf_client_suggest_sync (GConfClient *client, - GError **err); -gboolean gconf_client_dir_exists (GConfClient *client, - const gchar *dir, - GError **err); -gboolean gconf_client_key_is_writable (GConfClient *client, - const gchar *key, - GError **err); -gdouble gconf_client_get_float (GConfClient *client, - const gchar *key, - GError **err); -gint gconf_client_get_int (GConfClient *client, - const gchar *key, - GError **err); -gchar* gconf_client_get_string (GConfClient *client, - const gchar *key, - GError **err); -gboolean gconf_client_get_bool (GConfClient *client, - const gchar *key, - GError **err); + GError **err); +gboolean gconf_client_dir_exists (GConfClient *client, + const gchar *dir, + GError **err); +gboolean gconf_client_key_is_writable (GConfClient *client, + const gchar *key, + GError **err); +gdouble gconf_client_get_float (GConfClient *client, + const gchar *key, + GError **err); +gint gconf_client_get_int (GConfClient *client, + const gchar *key, + GError **err); +gchar* gconf_client_get_string (GConfClient *client, + const gchar *key, + GError **err); +gboolean gconf_client_get_bool (GConfClient *client, + const gchar *key, + GError **err); GConfSchema* gconf_client_get_schema (GConfClient *client, - const gchar *key, - GError **err); -GSList* gconf_client_get_list (GConfClient *client, - const gchar *key, + const gchar *key, + GError **err); +GSList* gconf_client_get_list (GConfClient *client, + const gchar *key, GConfValueType list_type, - GError **err); -gboolean gconf_client_get_pair (GConfClient *client, - const gchar *key, + GError **err); +gboolean gconf_client_get_pair (GConfClient *client, + const gchar *key, GConfValueType car_type, GConfValueType cdr_type, - gpointer car_retloc, - gpointer cdr_retloc, - GError **err); -gboolean gconf_client_set_float (GConfClient *client, - const gchar *key, - gdouble val, - GError **err); -gboolean gconf_client_set_int (GConfClient *client, - const gchar *key, - gint val, - GError **err); -gboolean gconf_client_set_string (GConfClient *client, - const gchar *key, - const gchar *val, - GError **err); -gboolean gconf_client_set_bool (GConfClient *client, - const gchar *key, - gboolean val, - GError **err); -gboolean gconf_client_set_schema (GConfClient *client, - const gchar *key, + gpointer car_retloc, + gpointer cdr_retloc, + GError **err); +gboolean gconf_client_set_float (GConfClient *client, + const gchar *key, + gdouble val, + GError **err); +gboolean gconf_client_set_int (GConfClient *client, + const gchar *key, + gint val, + GError **err); +gboolean gconf_client_set_string (GConfClient *client, + const gchar *key, + const gchar *val, + GError **err); +gboolean gconf_client_set_bool (GConfClient *client, + const gchar *key, + gboolean val, + GError **err); +gboolean gconf_client_set_schema (GConfClient *client, + const gchar *key, const GConfSchema *val, - GError **err); -gboolean gconf_client_set_list (GConfClient *client, - const gchar *key, + GError **err); +gboolean gconf_client_set_list (GConfClient *client, + const gchar *key, GConfValueType list_type, - GSList *list, - GError **err); -gboolean gconf_client_set_pair (GConfClient *client, - const gchar *key, + GSList *list, + GError **err); +gboolean gconf_client_set_pair (GConfClient *client, + const gchar *key, GConfValueType car_type, GConfValueType cdr_type, - gconstpointer address_of_car, - gconstpointer address_of_cdr, - GError **err); + gconstpointer address_of_car, + gconstpointer address_of_cdr, + GError **err); void gconf_client_error (GConfClient *client, - GError *error); + GError *error); void gconf_client_unreturned_error (GConfClient *client, - GError *error); + GError *error); void gconf_client_value_changed (GConfClient *client, - const gchar *key, + const gchar *key, GConfValue *value); -gboolean gconf_client_commit_change_set (GConfClient *client, +gboolean gconf_client_commit_change_set (GConfClient *client, GConfChangeSet *cs, - gboolean remove_committed, - GError **err); + gboolean remove_committed, + GError **err); GConfChangeSet* gconf_client_reverse_change_set (GConfClient *client, GConfChangeSet *cs, - GError **err); + GError **err); GConfChangeSet* gconf_client_change_set_from_currentv (GConfClient *client, - const gchar **keys, - GError **err); + const gchar **keys, + GError **err); GConfChangeSet* gconf_client_change_set_from_current (GConfClient *client, - GError **err, - const gchar *first_key, + GError **err, + const gchar *first_key, ...);
-

Description

+

Description

GConfClient adds the following features to plain GConf:

@@ -444,7 +232,7 @@ gconf_client_get_default(), there is no (legitimate) way to obtain a pointer to the underlying GConfEngine. If you create a GConfClient from an existing engine, you'll have to be disciplined enough to avoid using that engine directly. -[1] +[1]

@@ -457,16 +245,12 @@

There are two error-related signals in GConfClient. The first is plain "error"; it's emitted anytime an error occurs. The second is "unreturned_error"; this -signal is emitted if you pass NULL as the GError** to any +signal is emitted if you pass NULL as the GError** to any GConfClient function. The idea is that you can have a global error handler attached to the "unreturned_error" signal; if you want to use this handler, you don't need to use the normal GConf error handling mechanism. However, if you ever need to handle errors for a specific function call, you can override the -global handler by passing a non-NULL GError** to the +global handler by passing a non-NULL GError** to the function. If you want an error handler that's always invoked, use the "error" signal.

@@ -517,11 +301,11 @@

-

Details

+

Details

-

+

enum GConfClientPreloadType

-
typedef enum { /*< prefix=GCONF_CLIENT >*/
+
typedef enum { /*< prefix=GCONF_CLIENT >*/
   GCONF_CLIENT_PRELOAD_NONE,     /* don't preload anything */
   GCONF_CLIENT_PRELOAD_ONELEVEL, /* load entries directly under the directory. */
   GCONF_CLIENT_PRELOAD_RECURSIVE /* recurse the directory tree; possibly quite expensive! */
@@ -561,9 +345,9 @@
 

-

+

enum GConfClientErrorHandlingMode

-
typedef enum { /*< prefix=GCONF_CLIENT >*/
+
typedef enum { /*< prefix=GCONF_CLIENT >*/
   GCONF_CLIENT_HANDLE_NONE,
   GCONF_CLIENT_HANDLE_UNRETURNED,
   GCONF_CLIENT_HANDLE_ALL
@@ -576,9 +360,7 @@
 unreturned errors are handled, or all errors are handled with this enumeration.
 You can prevent specific errors from being handled automatically by stopping the
 signal emission before the default signal handler is called (see the GLib
-documentation, g_signal_stop_emission_by_name() for example).
+documentation, g_signal_stop_emission_by_name() for example).
 

@@ -604,16 +386,12 @@
-

+

GConfClientNotifyFunc ()

-
void                (*GConfClientNotifyFunc)            (GConfClient *client,
-                                                         guint cnxn_id,
+
void                (*GConfClientNotifyFunc)            (GConfClient *client,
+                                                         guint cnxn_id,
                                                          GConfEntry *entry,
-                                                         gpointer user_data);
+ gpointer user_data);

This is the signature of a user function added with gconf_client_notify_add(). The notify function is invoked when the value of a key changes. The entry @@ -652,12 +430,10 @@


-

+

GConfClientErrorHandlerFunc ()

-
void                (*GConfClientErrorHandlerFunc)      (GConfClient *client,
-                                                         GError *error);
+
void                (*GConfClientErrorHandlerFunc)      (GConfClient *client,
+                                                         GError *error);

This is the signature of a user function which needs to be called for error handling. @@ -672,9 +448,7 @@

- @@ -684,9 +458,9 @@
-

+

GCONF_CLIENT()

-
#define GCONF_CLIENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCONF_TYPE_CLIENT, GConfClient))
+
#define GCONF_CLIENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCONF_TYPE_CLIENT, GConfClient))
 

Casts a pointer to a GConfClient*. @@ -704,9 +478,9 @@


-

+

gconf_client_get_default ()

-
GConfClient*        gconf_client_get_default            (void);
+
GConfClient*        gconf_client_get_default            (void);

Creates a new GConfClient using the default GConfEngine. Normally this is the engine you want. If someone else is already using the default @@ -714,17 +488,13 @@ with the reference count incremented. So you have to unref either way.

-It's important to call g_type_init() before using this GObject, to initialize the type system. +It's important to call g_type_init() before using this GObject, to initialize the type system.

error :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
- @@ -733,15 +503,13 @@
-

+

gconf_client_get_for_engine ()

-
GConfClient*        gconf_client_get_for_engine         (GConfEngine *engine);
+
GConfClient*        gconf_client_get_for_engine         (GConfEngine *engine);

Creates a new GConfClient with a specific GConfEngine. Only specialized configuration-related programs should need to call this function. The -returned GConfClient should be unref'd when you're done with g_object_unref(). +returned GConfClient should be unref'd when you're done with g_object_unref(). Remember to avoid using the GConfEngine directly once you have a GConfClient wrapper.

@@ -765,16 +533,12 @@

-

+

gconf_client_add_dir ()

-
void                gconf_client_add_dir                (GConfClient *client,
-                                                         const gchar *dir,
+
void                gconf_client_add_dir                (GConfClient *client,
+                                                         const gchar *dir,
                                                          GConfClientPreloadType preload,
-                                                         GError **err);
+ GError **err);

Add a directory to the list of directories the GConfClient will watch. Any changes to keys below this directory will cause the "value_changed" signal to be @@ -808,9 +572,7 @@

- @@ -820,15 +582,11 @@
-

+

gconf_client_remove_dir ()

-
void                gconf_client_remove_dir             (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+
void                gconf_client_remove_dir             (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);

Remove a directory from the list created with gconf_client_add_dir(). If any notifications have been added below this directory with @@ -851,9 +609,7 @@

- @@ -863,24 +619,14 @@
-

+

gconf_client_notify_add ()

-
guint               gconf_client_notify_add             (GConfClient *client,
-                                                         const gchar *namespace_section,
+
guint               gconf_client_notify_add             (GConfClient *client,
+                                                         const gchar *namespace_section,
                                                          GConfClientNotifyFunc func,
-                                                         gpointer user_data,
-                                                         GFreeFunc destroy_notify,
-                                                         GError **err);
+ gpointer user_data, + GFreeFunc destroy_notify, + GError **err);

Request notification of changes to namespace_section. This includes the key namespace_section itself, and any keys below it (the behavior is identical to @@ -935,9 +681,7 @@

- @@ -952,12 +696,10 @@
-

+

gconf_client_notify_remove ()

-
void                gconf_client_notify_remove          (GConfClient *client,
-                                                         guint cnxn);
+
void                gconf_client_notify_remove          (GConfClient *client,
+                                                         guint cnxn);

Remove a notification using the ID returned from gconf_client_notify_add(). Invokes the destroy notify function on the @@ -983,9 +725,9 @@


-

+

gconf_client_notify ()

-
void                gconf_client_notify                 (GConfClient *client,
+
void                gconf_client_notify                 (GConfClient *client,
                                                          const char *key);

Emits the "value-changed" signal and notifies listeners as if key had been @@ -1013,9 +755,9 @@


-

+

gconf_client_set_error_handling ()

-
void                gconf_client_set_error_handling     (GConfClient *client,
+
void                gconf_client_set_error_handling     (GConfClient *client,
                                                          GConfClientErrorHandlingMode mode);

Controls the default error handling for GConfClient. See @@ -1039,9 +781,9 @@


-

+

gconf_client_set_global_default_error_handler ()

-
void                gconf_client_set_global_default_error_handler
+
void                gconf_client_set_global_default_error_handler
                                                         (GConfClientErrorHandlerFunc func);

Set func as the default error handler for the GConfClient. This handler would be called @@ -1060,9 +802,9 @@


-

+

gconf_client_clear_cache ()

-
void                gconf_client_clear_cache            (GConfClient *client);
+
void                gconf_client_clear_cache            (GConfClient *client);

Dumps everything out of the GConfClient client-side cache. If you know you're done using the GConfClient for a while, you can call this function to save some @@ -1081,16 +823,12 @@


-

+

gconf_client_preload ()

-
void                gconf_client_preload                (GConfClient *client,
-                                                         const gchar *dirname,
+
void                gconf_client_preload                (GConfClient *client,
+                                                         const gchar *dirname,
                                                          GConfClientPreloadType type,
-                                                         GError **err);
+ GError **err);

Preloads a directory. Normally you do this when you call gconf_client_add_dir(), but if you've called gconf_client_clear_cache() there may be a reason to do it @@ -1116,9 +854,7 @@

- @@ -1128,16 +864,12 @@
-

+

gconf_client_set ()

-
void                gconf_client_set                    (GConfClient *client,
-                                                         const gchar *key,
+
void                gconf_client_set                    (GConfClient *client,
+                                                         const gchar *key,
                                                          const GConfValue *val,
-                                                         GError **err);
+ GError **err);

Sets the value of a configuration key. Just like gconf_engine_set(), but uses GConfClient caching and error-handling features. The val argument will not be @@ -1163,9 +895,7 @@

- @@ -1175,15 +905,11 @@
-

+

gconf_client_get ()

-
GConfValue*         gconf_client_get                    (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
GConfValue*         gconf_client_get                    (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Gets the value of a configuration key. Just like gconf_engine_get(), but uses GConfClient caching and error-handling features. @@ -1203,9 +929,7 @@

- @@ -1220,15 +944,11 @@
-

+

gconf_client_get_without_default ()

-
GConfValue*         gconf_client_get_without_default    (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
GConfValue*         gconf_client_get_without_default    (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Gets the value of a configuration key. Just like gconf_client_get() but doesn't look for a default value if the key is unset.

@@ -1247,9 +967,7 @@
- @@ -1264,21 +982,13 @@
-

+

gconf_client_get_entry ()

-
GConfEntry*         gconf_client_get_entry              (GConfClient *client,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         GError **err);
+
GConfEntry*         gconf_client_get_entry              (GConfClient *client,
+                                                         const gchar *key,
+                                                         const gchar *locale,
+                                                         gboolean use_schema_default,
+                                                         GError **err);

Obtains the full GConfEntry for a value. Just like gconf_engine_get_entry(), but uses GConfClient caching and error-handling features.

@@ -1307,9 +1017,7 @@
- @@ -1324,16 +1032,12 @@
-

+

gconf_client_get_default_from_schema ()

-
GConfValue*         gconf_client_get_default_from_schema
+
GConfValue*         gconf_client_get_default_from_schema
                                                         (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+ const gchar *key, + GError **err);

Returns the default value stored in the key's schema, if the key has a schema associated and the schema exists and the schema contains a default value. Note @@ -1358,9 +1062,7 @@

- @@ -1375,17 +1077,11 @@
-

+

gconf_client_unset ()

-
gboolean            gconf_client_unset                  (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_client_unset                  (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Unsets the value of key; if key is already unset, has no effect. An error of note is GCONF_OVERRIDDEN, indicating that the system @@ -1407,9 +1103,7 @@

- @@ -1425,16 +1119,12 @@
-

+

gconf_client_recursive_unset ()

-
gboolean            gconf_client_recursive_unset        (GConfClient *client,
+
gboolean            gconf_client_recursive_unset        (GConfClient *client,
                                                          const char *key,
                                                          GConfUnsetFlags flags,
-                                                         GError **err);
+ GError **err);

Unsets all keys below key, including key itself. If any unset fails, continues on to unset as much as it can. The first failure is returned in err. Just like gconf_engine_recursive_unset(), @@ -1460,9 +1150,7 @@

- @@ -1480,26 +1168,18 @@
-

+

gconf_client_all_entries ()

-
GSList*             gconf_client_all_entries            (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+
GSList*             gconf_client_all_entries            (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);

Lists the key-value pairs in dir. Does not list subdirectories; for that use gconf_client_all_dirs(). The returned list contains GConfEntry objects. A GConfEntry contains an absolute key and a value. The list is not recursive, it contains only the immediate children of dir. To free the returned list, gconf_entry_free() -each list element, then g_slist_free() the list itself. +each list element, then g_slist_free() the list itself. Just like gconf_engine_all_entries(), but uses GConfClient caching and error-handling features.

Returns :

a new GConfClient. g_object_unref() when you're done. +a new GConfClient. g_object_unref() when you're done.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -1517,9 +1197,7 @@ - @@ -1534,24 +1212,14 @@
-

+

gconf_client_all_dirs ()

-
GSList*             gconf_client_all_dirs               (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+
GSList*             gconf_client_all_dirs               (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);

Lists the subdirectories in dir. The returned list contains allocated -strings. Each string is the absolute path of a subdirectory. You should g_free() each string in the list, then g_slist_free() the list itself. +strings. Each string is the absolute path of a subdirectory. You should g_free() each string in the list, then g_slist_free() the list itself. Just like gconf_engine_all_dirs(), but uses GConfClient caching and error-handling features.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -1569,9 +1237,7 @@ - @@ -1586,12 +1252,10 @@
-

+

gconf_client_suggest_sync ()

-
void                gconf_client_suggest_sync           (GConfClient *client,
-                                                         GError **err);
+
void                gconf_client_suggest_sync           (GConfClient *client,
+                                                         GError **err);

Suggests to gconfd that you've just finished a block of changes, and it would be an optimal time to sync to @@ -1612,9 +1276,7 @@

- @@ -1624,17 +1286,11 @@
-

+

gconf_client_dir_exists ()

-
gboolean            gconf_client_dir_exists             (GConfClient *client,
-                                                         const gchar *dir,
-                                                         GError **err);
+
gboolean            gconf_client_dir_exists             (GConfClient *client,
+                                                         const gchar *dir,
+                                                         GError **err);

Queries whether the directory dir exists in the GConf database. Returns TRUE or FALSE. @@ -1655,9 +1311,7 @@

- @@ -1673,17 +1327,11 @@
-

+

gconf_client_key_is_writable ()

-
gboolean            gconf_client_key_is_writable        (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_client_key_is_writable        (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Checks whether the key is writable.

@@ -1702,9 +1350,7 @@
- @@ -1720,17 +1366,11 @@
-

+

gconf_client_get_float ()

-
gdouble             gconf_client_get_float              (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gdouble             gconf_client_get_float              (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the floating point number (GCONF_VALUE_FLOAT) stored at key. Automatically performs type-checking, so if a non-float is @@ -1753,9 +1393,7 @@

- @@ -1770,17 +1408,11 @@
-

+

gconf_client_get_int ()

-
gint                gconf_client_get_int                (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gint                gconf_client_get_int                (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the integer (GCONF_VALUE_INT) stored at key. Automatically performs type-checking, so if a non-integer is @@ -1803,9 +1435,7 @@

- @@ -1820,17 +1450,11 @@
-

+

gconf_client_get_string ()

-
gchar*              gconf_client_get_string             (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gchar*              gconf_client_get_string             (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the string (GCONF_VALUE_STRING) stored at key. Automatically performs type-checking, so if a non-string is @@ -1853,9 +1477,7 @@

- @@ -1870,17 +1492,11 @@
-

+

gconf_client_get_bool ()

-
gboolean            gconf_client_get_bool               (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_client_get_bool               (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the boolean value (GCONF_VALUE_BOOL) stored at key. Automatically performs type-checking, so if a non-bool is @@ -1903,9 +1519,7 @@

- @@ -1920,15 +1534,11 @@
-

+

gconf_client_get_schema ()

-
GConfSchema*        gconf_client_get_schema             (GConfClient *client,
-                                                         const gchar *key,
-                                                         GError **err);
+
GConfSchema*        gconf_client_get_schema             (GConfClient *client,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the schema (GCONF_VALUE_SCHEMA) stored at key. Automatically performs type-checking, so if a non-schema is stored at @@ -1951,9 +1561,7 @@

- @@ -1968,18 +1576,12 @@
-

+

gconf_client_get_list ()

-
GSList*             gconf_client_get_list               (GConfClient *client,
-                                                         const gchar *key,
+
GSList*             gconf_client_get_list               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GError **err);
+ GError **err);

Requests the list (GCONF_VALUE_LIST) stored at key. Automatically performs type-checking, so if a non-list is stored at key, or the @@ -2011,34 +1613,22 @@

- - - - @@ -2051,13 +1641,9 @@

In the GCONF_VALUE_FLOAT and GCONF_VALUE_STRING cases, you must -g_free() each list element. In the GCONF_VALUE_SCHEMA case you must +g_free() each list element. In the GCONF_VALUE_SCHEMA case you must gconf_schema_free() each element. In all cases you must free the -list itself with g_slist_free(). +list itself with g_slist_free(). Just like gconf_engine_get_list(), but uses GConfClient caching and error-handling features.

@@ -2081,9 +1667,7 @@ - @@ -2098,25 +1682,15 @@
-

+

gconf_client_get_pair ()

-
gboolean            gconf_client_get_pair               (GConfClient *client,
-                                                         const gchar *key,
+
gboolean            gconf_client_get_pair               (GConfClient *client,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);
+ gpointer car_retloc, + gpointer cdr_retloc, + GError **err);

Requests the pair (GCONF_VALUE_PAIR) stored at key. Automatically performs type-checking, so if a non-pair is stored at key, or the @@ -2144,30 +1718,22 @@

- - - - + @@ -2177,9 +1743,7 @@

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
GCONF_VALUE_INTThe integer itself, converted with GINT_TO_POINTER() +The integer itself, converted with GINT_TO_POINTER()
GCONF_VALUE_BOOLThe bool itself, converted with GINT_TO_POINTER() +The bool itself, converted with GINT_TO_POINTER()
GCONF_VALUE_FLOATA pointer to gdouble, which should be freed with g_free() +A pointer to gdouble, which should be freed with g_free()
GCONF_VALUE_STRINGA pointer to gchar, which should be freed with g_free() +A pointer to gchar, which should be freed with g_free()

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
GCONF_VALUE_INTpointer to gint +pointer to gint
GCONF_VALUE_BOOLpointer to gboolean +pointer to gboolean
GCONF_VALUE_FLOATpointer to gdouble +pointer to gdouble
GCONF_VALUE_STRINGpointer to gchar*pointer to gchar*
GCONF_VALUE_SCHEMA

-In the GCONF_VALUE_STRING case, you must g_free() the string(s) +In the GCONF_VALUE_STRING case, you must g_free() the string(s) stored in the return location(s). In the GCONF_VALUE_SCHEMA case you must gconf_schema_free() the returned schema. If there's an error or the value is unset, car_retloc and cdr_retloc are left unchanged. @@ -2254,9 +1818,7 @@

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
GConf Reference Manual Next
Top +
Top  |  - Description
@@ -44,50 +44,30 @@ GConfBackendVTable; GConfBackend; -gchar* gconf_address_backend (const gchar *address); -gchar* gconf_address_resource (const gchar *address); -gchar* gconf_backend_file (const gchar *address); -GConfBackend* gconf_get_backend (const gchar *address, - GError **err); +gchar* gconf_address_backend (const gchar *address); +gchar* gconf_address_resource (const gchar *address); +gchar* gconf_backend_file (const gchar *address); +GConfBackend* gconf_get_backend (const gchar *address, + GError **err); void gconf_backend_ref (GConfBackend *backend); void gconf_backend_unref (GConfBackend *backend); GConfSource* gconf_backend_resolve_address (GConfBackend *backend, - const gchar *address, - GError **err); + const gchar *address, + GError **err);
-

Description

+

Description

-

Details

+

Details

-

+

GConfBackendVTable

-
typedef struct {
+
typedef struct {
   /* Set to sizeof (GConfBackendVTable) - used for future proofing */
   gsize                  vtable_size;
 
@@ -429,9 +409,9 @@
 

-

+

GConfBackend

-
typedef struct {
+
typedef struct {
   const gchar* name;
   guint refcount;
   GConfBackendVTable vtable;
@@ -444,13 +424,9 @@
 

-

+

gconf_address_backend ()

-
gchar*              gconf_address_backend               (const gchar *address);
+
gchar*              gconf_address_backend               (const gchar *address);

@@ -474,13 +450,9 @@

-

+

gconf_address_resource ()

-
gchar*              gconf_address_resource              (const gchar *address);
+
gchar*              gconf_address_resource              (const gchar *address);

@@ -504,13 +476,9 @@

-

+

gconf_backend_file ()

-
gchar*              gconf_backend_file                  (const gchar *address);
+
gchar*              gconf_backend_file                  (const gchar *address);

@@ -534,14 +502,10 @@

-

+

gconf_get_backend ()

-
GConfBackend*       gconf_get_backend                   (const gchar *address,
-                                                         GError **err);
+
GConfBackend*       gconf_get_backend                   (const gchar *address,
+                                                         GError **err);

@@ -570,9 +534,9 @@

-

+

gconf_backend_ref ()

-
void                gconf_backend_ref                   (GConfBackend *backend);
+
void                gconf_backend_ref                   (GConfBackend *backend);

@@ -589,9 +553,9 @@

-

+

gconf_backend_unref ()

-
void                gconf_backend_unref                 (GConfBackend *backend);
+
void                gconf_backend_unref                 (GConfBackend *backend);

@@ -608,15 +572,11 @@

-

+

gconf_backend_resolve_address ()

-
GConfSource*        gconf_backend_resolve_address       (GConfBackend *backend,
-                                                         const gchar *address,
-                                                         GError **err);
+
GConfSource*        gconf_backend_resolve_address       (GConfBackend *backend,
+                                                         const gchar *address,
+                                                         GError **err);

@@ -650,9 +610,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-engine.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-engine.html @@ -21,16 +21,16 @@ - + Description

-gconf-backend +gconf-backend

gconf-backend

GConf Reference Manual Next
Top +
Top  |  - Description
- @@ -175,14 +149,10 @@
-

+

gconf_engine_get_for_addresses ()

-
GConfEngine*        gconf_engine_get_for_addresses      (GSList *addresses,
-                                                         GError **err);
+
GConfEngine*        gconf_engine_get_for_addresses      (GSList *addresses,
+                                                         GError **err);

Similar to gconf_engine_get_for_address() , but takes a list of addresses instead of a single address. @@ -197,9 +167,7 @@

- @@ -216,9 +184,9 @@
-

+

gconf_engine_unref ()

-
void                gconf_engine_unref                  (GConfEngine *conf);
+
void                gconf_engine_unref                  (GConfEngine *conf);

Decreases the reference count of a GConfEngine by one; if the reference count reaches 0, destroys the GConfEngine. @@ -236,9 +204,9 @@


-

+

gconf_engine_ref ()

-
void                gconf_engine_ref                    (GConfEngine *conf);
+
void                gconf_engine_ref                    (GConfEngine *conf);

Increases the reference count of a GConfEngine by one.

@@ -255,12 +223,10 @@

-

+

gconf_engine_get_local ()

-
GConfEngine*        gconf_engine_get_local              (const char *address,
-                                                         GError **err);
+
GConfEngine*        gconf_engine_get_local              (const char *address,
+                                                         GError **err);

Obtain a local (non-process-transparent) GConfEngine. Local engines do not support notification, and can only access config databases @@ -277,9 +243,7 @@

- @@ -294,15 +258,11 @@
-

+

gconf_engine_get_local_for_addresses ()

-
GConfEngine*        gconf_engine_get_local_for_addresses
-                                                        (GSList *addresses,
-                                                         GError **err);
+
GConfEngine*        gconf_engine_get_local_for_addresses
+                                                        (GSList *addresses,
+                                                         GError **err);

Obtains a local GConfEngine similar to gconf_engine_get_local(). Instead of taking the address of the local database, this function takes @@ -318,9 +278,7 @@

- @@ -337,15 +295,11 @@
-

+

gconf_engine_set_user_data ()

-
void                gconf_engine_set_user_data          (GConfEngine *engine,
-                                                         gpointer data,
-                                                         GDestroyNotify dnotify);
+
void                gconf_engine_set_user_data          (GConfEngine *engine,
+                                                         gpointer data,
+                                                         GDestroyNotify dnotify);

Sets the user_data and the destroy notification function fields of a GConfEngine.

@@ -359,9 +313,7 @@
- @@ -376,11 +328,9 @@
-

+

gconf_engine_get_user_data ()

-
gpointer            gconf_engine_get_user_data          (GConfEngine *engine);
+
gpointer            gconf_engine_get_user_data          (GConfEngine *engine);

Returns the user_data field of a GConfEngine.

@@ -404,9 +354,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-error.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-error.html @@ -21,16 +21,16 @@ - + Description

-GConfEngine +GConfEngine

GConfEngine — a GConf "database"

@@ -45,45 +45,25 @@ GConfEngine; GConfEngine* gconf_engine_get_default (void); -GConfEngine* gconf_engine_get_for_address (const gchar *address, - GError **err); -GConfEngine* gconf_engine_get_for_addresses (GSList *addresses, - GError **err); +GConfEngine* gconf_engine_get_for_address (const gchar *address, + GError **err); +GConfEngine* gconf_engine_get_for_addresses (GSList *addresses, + GError **err); void gconf_engine_unref (GConfEngine *conf); void gconf_engine_ref (GConfEngine *conf); GConfEngine* gconf_engine_get_local (const char *address, - GError **err); + GError **err); GConfEngine* gconf_engine_get_local_for_addresses - (GSList *addresses, - GError **err); + (GSList *addresses, + GError **err); void gconf_engine_set_user_data (GConfEngine *engine, - gpointer data, - GDestroyNotify dnotify); -gpointer gconf_engine_get_user_data (GConfEngine *engine); + gpointer data, + GDestroyNotify dnotify); +gpointer gconf_engine_get_user_data (GConfEngine *engine);
-

Description

+

Description

A GConfEngine represents a connection to the GConf database. The default GConfEngine, returned from gconf_engine_get_default(), represents the @@ -98,20 +78,20 @@

-

Details

+

Details

-

+

GConfEngine

-
typedef struct _GConfEngine GConfEngine;
+
typedef struct _GConfEngine GConfEngine;

An opaque data type representing one or more configuration sources.


-

+

gconf_engine_get_default ()

-
GConfEngine*        gconf_engine_get_default            (void);
+
GConfEngine*        gconf_engine_get_default            (void);

Returns the default GConfEngine. All clients should use this, unless they are special configuration-related tools. The caller of this @@ -134,14 +114,10 @@


-

+

gconf_engine_get_for_address ()

-
GConfEngine*        gconf_engine_get_for_address        (const gchar *address,
-                                                         GError **err);
+
GConfEngine*        gconf_engine_get_for_address        (const gchar *address,
+                                                         GError **err);

Obtains a special GConfEngine; mostly useful for specialized GConf-related tools. Normal clients shouldn't need to use it. @@ -158,9 +134,7 @@

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

return location of an allocated GError. +return location of an allocated GError.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

data :

a gpointer. +a gpointer.
GConf Reference Manual Next
Top +
Top  |  - Description
- @@ -283,14 +243,10 @@
-

+

gconf_error_new ()

-
GError*             gconf_error_new                     (GConfError en,
-                                                         const gchar *format,
+
GError*             gconf_error_new                     (GConfError en,
+                                                         const gchar *format,
                                                          ...);

Creates a new error. Normally the GConf library does this, but you @@ -319,9 +275,7 @@

- @@ -331,23 +285,17 @@
-

+

gconf_error_quark ()

-
GQuark              gconf_error_quark                   (void);
+
GQuark              gconf_error_quark                   (void);

-Converts the string 'gconf-error-quark' to a GQuark and returns the value. +Converts the string 'gconf-error-quark' to a GQuark and returns the value.

-GError +GError

GError — error reporting.

@@ -44,50 +44,28 @@ enum GConfError; -GError* gconf_error_new (GConfError en, - const gchar *format, +GError* gconf_error_new (GConfError en, + const gchar *format, ...); -GQuark gconf_error_quark (void); -void gconf_set_error (GError **err, +GQuark gconf_error_quark (void); +void gconf_set_error (GError **err, GConfError en, - const gchar *format, + const gchar *format, ...); -GError* gconf_compose_errors (GError *err1, - GError *err2); +GError* gconf_compose_errors (GError *err1, + GError *err2);
-

Description

+

Description

-The GError object is used to report errors that occur in GConf +The GError object is used to report errors that occur in GConf library routines. All functions that report errors work the same way:

  • -The last argument to the function is a GError**, a pointer to a -location where a GError* can be placed. +The last argument to the function is a GError**, a pointer to a +location where a GError* can be placed.

  • This last argument may be NULL, in which case no @@ -95,21 +73,13 @@

  • If non-NULL, the argument should be the address of a -GError* variable, which should be initialized to +GError* variable, which should be initialized to NULL.

  • -If an error occurs, a GError will be allocated and placed in the -return location; the caller must free the GError with -g_error_free(). If no error occurs, the return location will be +If an error occurs, a GError will be allocated and placed in the +return location; the caller must free the GError with +g_error_free(). If no error occurs, the return location will be left untouched. That is, the test error != NULL should always be a reliable indicator of whether the operation failed.

  • @@ -122,21 +92,13 @@ on success. In some cases, a NULL return value indicates failure. Either way, if the return value indicates failure and you passed a non-NULL value for the last argument -to the function, a GError will be returned. If the return value -indicates success, then a GError will never be returned. These +to the function, a GError will be returned. If the return value +indicates success, then a GError will never be returned. These relationships are guaranteed; that is, you can reliably use the return -value to decide whether a GError was placed in the return +value to decide whether a GError was placed in the return location. If a function does not indicate success/failure by return value, you must check whether the -GError is NULL to detect errors. +GError is NULL to detect errors.

    Here's a short error handling example: @@ -155,11 +117,11 @@

-

Details

+

Details

-

+

enum GConfError

-
typedef enum {
+
typedef enum {
   GCONF_ERROR_SUCCESS = 0,
   GCONF_ERROR_FAILED = 1,        /* Something didn't work, don't know why, probably unrecoverable
                                     so there's no point having a more specific errno */
@@ -192,9 +154,7 @@
 

GCONF_ERROR_SUCCESS

indicates that no error occurred, won't be returned in a GError. +indicates that no error occurred, won't be returned in a GError.

Returns :

newly-allocated GError. +newly-allocated GError.
- @@ -356,15 +304,11 @@
-

+

gconf_set_error ()

-
void                gconf_set_error                     (GError **err,
+
void                gconf_set_error                     (GError **err,
                                                          GConfError en,
-                                                         const gchar *format,
+                                                         const gchar *format,
                                                          ...);

Internal function. @@ -399,16 +343,10 @@


-

+

gconf_compose_errors ()

-
GError*             gconf_compose_errors                (GError *err1,
-                                                         GError *err2);
+
GError*             gconf_compose_errors                (GError *err1,
+                                                         GError *err2);

Internal function.

@@ -437,9 +375,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-internals.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-internals.html @@ -21,16 +21,16 @@ - + Description

Returns :

the GQuark representing the string. +the GQuark representing the string. GConf Reference Manual Next
Top +
Top  |  - Description
@@ -42,181 +42,79 @@ -gchar* gconf_key_directory (const gchar *key); -const gchar* gconf_key_key (const gchar *key); +gchar* gconf_key_directory (const gchar *key); +const gchar* gconf_key_key (const gchar *key); GConfValue* gconf_value_from_corba_value (const ConfigValue *value); GConfSchema* gconf_schema_from_corba_schema (const ConfigSchema *cs); -const gchar* gconf_value_type_to_string (GConfValueType type); -GConfValueTypegconf_value_type_from_string (const gchar *str); -GSList* gconf_load_source_path (const gchar *filename, - GError **err); -void gconf_shutdown_daemon (GError **err); -gbooleangconf_ping_daemon (void); -gbooleangconf_spawn_daemon (GError **err); -gulonggconf_string_to_gulong (const gchar *str); -const gchar* gconf_current_locale (void); +const gchar* gconf_value_type_to_string (GConfValueType type); +GConfValueTypegconf_value_type_from_string (const gchar *str); +GSList* gconf_load_source_path (const gchar *filename, + GError **err); +void gconf_shutdown_daemon (GError **err); +gboolean gconf_ping_daemon (void); +gboolean gconf_spawn_daemon (GError **err); +gulong gconf_string_to_gulong (const gchar *str); +const gchar* gconf_current_locale (void); enum GConfLogPriority; void gconf_log (GConfLogPriority pri, - const gchar *format, + const gchar *format, ...); -gbooleangconf_key_check (const gchar *key, - GError **err); +gboolean gconf_key_check (const gchar *key, + GError **err); GConfValue* gconf_value_new_list_from_string (GConfValueType list_type, - const gchar *str, - GError **err); + const gchar *str, + GError **err); GConfValue* gconf_value_new_pair_from_string (GConfValueType car_type, GConfValueType cdr_type, - const gchar *str, - GError **err); -gchar* gconf_quote_string (const gchar *str); -gchar* gconf_unquote_string (const gchar *str, - const gchar **end, - GError **err); -void gconf_unquote_string_inplace (gchar *str, - gchar **end, - GError **err); -GConfValue* gconf_value_decode (const gchar *encoded); -gchar* gconf_value_encode (GConfValue *val); + const gchar *str, + GError **err); +gchar* gconf_quote_string (const gchar *str); +gchar* gconf_unquote_string (const gchar *str, + const gchar **end, + GError **err); +void gconf_unquote_string_inplace (gchar *str, + gchar **end, + GError **err); +GConfValue* gconf_value_decode (const gchar *encoded); +gchar* gconf_value_encode (GConfValue *val); GConfValue* gconf_value_list_from_primitive_list (GConfValueType list_type, - GSList *list, - GError **err); + GSList *list, + GError **err); GConfValue* gconf_value_pair_from_primitive_pair (GConfValueType car_type, GConfValueType cdr_type, - gconstpointer address_of_car, - gconstpointer address_of_cdr, - GError **err); -GSList* gconf_value_list_to_primitive_list_destructive + gconstpointer address_of_car, + gconstpointer address_of_cdr, + GError **err); +GSList* gconf_value_list_to_primitive_list_destructive (GConfValue *val, GConfValueType list_type, - GError **err); -gbooleangconf_value_pair_to_primitive_pair_destructive + GError **err); +gboolean gconf_value_pair_to_primitive_pair_destructive (GConfValue *val, GConfValueType car_type, GConfValueType cdr_type, - gpointer car_retloc, - gpointer cdr_retloc, - GError **err); -void gconf_set_daemon_mode (gboolean setting); -gbooleangconf_handle_oaf_exception (CORBA_Environment *ev, - GError **err); + gpointer car_retloc, + gpointer cdr_retloc, + GError **err); +void gconf_set_daemon_mode (gboolean setting); +gboolean gconf_handle_oaf_exception (CORBA_Environment *ev, + GError **err);
-

Description

+

Description

-

Details

+

Details

-

+

gconf_key_directory ()

-
gchar*              gconf_key_directory                 (const gchar *key);
+
gchar*              gconf_key_directory                 (const gchar *key);

@@ -240,13 +138,9 @@

-

+

gconf_key_key ()

-
const gchar*        gconf_key_key                       (const gchar *key);
+
const gchar*        gconf_key_key                       (const gchar *key);

@@ -270,9 +164,9 @@

-

+

gconf_value_from_corba_value ()

-
GConfValue*         gconf_value_from_corba_value        (const ConfigValue *value);
+
GConfValue*         gconf_value_from_corba_value        (const ConfigValue *value);

@@ -296,9 +190,9 @@

-

+

gconf_schema_from_corba_schema ()

-
GConfSchema*        gconf_schema_from_corba_schema      (const ConfigSchema *cs);
+
GConfSchema*        gconf_schema_from_corba_schema      (const ConfigSchema *cs);

@@ -322,11 +216,9 @@

-

+

gconf_value_type_to_string ()

-
const gchar*        gconf_value_type_to_string          (GConfValueType type);
+
const gchar*        gconf_value_type_to_string          (GConfValueType type);

@@ -350,11 +242,9 @@

-

+

gconf_value_type_from_string ()

-
GConfValueType      gconf_value_type_from_string        (const gchar *str);
+
GConfValueType      gconf_value_type_from_string        (const gchar *str);

@@ -378,16 +268,10 @@

-

+

gconf_load_source_path ()

-
GSList*             gconf_load_source_path              (const gchar *filename,
-                                                         GError **err);
+
GSList*             gconf_load_source_path              (const gchar *filename,
+                                                         GError **err);

@@ -416,11 +300,9 @@

-

+

gconf_shutdown_daemon ()

-
void                gconf_shutdown_daemon               (GError **err);
+
void                gconf_shutdown_daemon               (GError **err);

@@ -437,11 +319,9 @@

-

+

gconf_ping_daemon ()

-
gboolean            gconf_ping_daemon                   (void);
+
gboolean            gconf_ping_daemon                   (void);

@@ -458,13 +338,9 @@

-

+

gconf_spawn_daemon ()

-
gboolean            gconf_spawn_daemon                  (GError **err);
+
gboolean            gconf_spawn_daemon                  (GError **err);

@@ -488,13 +364,9 @@

-

+

gconf_string_to_gulong ()

-
gulong              gconf_string_to_gulong              (const gchar *str);
+
gulong              gconf_string_to_gulong              (const gchar *str);

@@ -518,11 +390,9 @@

-

+

gconf_current_locale ()

-
const gchar*        gconf_current_locale                (void);
+
const gchar*        gconf_current_locale                (void);

@@ -539,9 +409,9 @@

-

+

enum GConfLogPriority

-
typedef enum {
+
typedef enum {
   GCL_EMERG,
   GCL_ALERT,
   GCL_CRIT,
@@ -558,12 +428,10 @@
 

-

+

gconf_log ()

-
void                gconf_log                           (GConfLogPriority pri,
-                                                         const gchar *format,
+
void                gconf_log                           (GConfLogPriority pri,
+                                                         const gchar *format,
                                                          ...);

@@ -593,16 +461,10 @@


-

+

gconf_key_check ()

-
gboolean            gconf_key_check                     (const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_key_check                     (const gchar *key,
+                                                         GError **err);

@@ -631,15 +493,11 @@

-

+

gconf_value_new_list_from_string ()

-
GConfValue*         gconf_value_new_list_from_string    (GConfValueType list_type,
-                                                         const gchar *str,
-                                                         GError **err);
+
GConfValue*         gconf_value_new_list_from_string    (GConfValueType list_type,
+                                                         const gchar *str,
+                                                         GError **err);

This function does not work. Don't use it.

@@ -673,16 +531,12 @@

-

+

gconf_value_new_pair_from_string ()

-
GConfValue*         gconf_value_new_pair_from_string    (GConfValueType car_type,
+
GConfValue*         gconf_value_new_pair_from_string    (GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         const gchar *str,
-                                                         GError **err);
+ const gchar *str, + GError **err);

This function does not work. Don't use it.

@@ -721,13 +575,9 @@

-

+

gconf_quote_string ()

-
gchar*              gconf_quote_string                  (const gchar *str);
+
gchar*              gconf_quote_string                  (const gchar *str);

@@ -751,19 +601,11 @@

-

+

gconf_unquote_string ()

-
gchar*              gconf_unquote_string                (const gchar *str,
-                                                         const gchar **end,
-                                                         GError **err);
+
gchar*              gconf_unquote_string                (const gchar *str,
+                                                         const gchar **end,
+                                                         GError **err);

@@ -797,17 +639,11 @@

-

+

gconf_unquote_string_inplace ()

-
void                gconf_unquote_string_inplace        (gchar *str,
-                                                         gchar **end,
-                                                         GError **err);
+
void                gconf_unquote_string_inplace        (gchar *str,
+                                                         gchar **end,
+                                                         GError **err);

@@ -836,11 +672,9 @@

-

+

gconf_value_decode ()

-
GConfValue*         gconf_value_decode                  (const gchar *encoded);
+
GConfValue*         gconf_value_decode                  (const gchar *encoded);

@@ -864,11 +698,9 @@

-

+

gconf_value_encode ()

-
gchar*              gconf_value_encode                  (GConfValue *val);
+
gchar*              gconf_value_encode                  (GConfValue *val);

@@ -892,16 +724,12 @@

-

+

gconf_value_list_from_primitive_list ()

-
GConfValue*         gconf_value_list_from_primitive_list
+
GConfValue*         gconf_value_list_from_primitive_list
                                                         (GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);
+ GSList *list, + GError **err);

@@ -935,20 +763,14 @@

-

+

gconf_value_pair_from_primitive_pair ()

-
GConfValue*         gconf_value_pair_from_primitive_pair
+
GConfValue*         gconf_value_pair_from_primitive_pair
                                                         (GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);
+ gconstpointer address_of_car, + gconstpointer address_of_cdr, + GError **err);

@@ -992,16 +814,12 @@

-

+

gconf_value_list_to_primitive_list_destructive ()

-
GSList*             gconf_value_list_to_primitive_list_destructive
+
GSList*             gconf_value_list_to_primitive_list_destructive
                                                         (GConfValue *val,
                                                          GConfValueType list_type,
-                                                         GError **err);
+ GError **err);

@@ -1035,23 +853,15 @@

-

+

gconf_value_pair_to_primitive_pair_destructive ()

-
gboolean            gconf_value_pair_to_primitive_pair_destructive
+
gboolean            gconf_value_pair_to_primitive_pair_destructive
                                                         (GConfValue *val,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);
+ gpointer car_retloc, + gpointer cdr_retloc, + GError **err);

@@ -1100,11 +910,9 @@

-

+

gconf_set_daemon_mode ()

-
void                gconf_set_daemon_mode               (gboolean setting);
+
void                gconf_set_daemon_mode               (gboolean setting);

@@ -1121,14 +929,10 @@

-

+

gconf_handle_oaf_exception ()

-
gboolean            gconf_handle_oaf_exception          (CORBA_Environment *ev,
-                                                         GError **err);
+
gboolean            gconf_handle_oaf_exception          (CORBA_Environment *ev,
+                                                         GError **err);

@@ -1157,9 +961,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-listeners.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-listeners.html @@ -21,16 +21,16 @@ - + Description

-gconf-internals +gconf-internals

gconf-internals

GConf Reference Manual Next
Top +
Top  |  - Description
@@ -44,73 +44,37 @@ GConfListeners; void (*GConfListenersCallback) (GConfListeners *listeners, - const gchar *all_above_key, - guint cnxn_id, - gpointer listener_data, - gpointer user_data); + const gchar *all_above_key, + guint cnxn_id, + gpointer listener_data, + gpointer user_data); GConfListeners* gconf_listeners_new (void); void gconf_listeners_free (GConfListeners *listeners); -guintgconf_listeners_add (GConfListeners *listeners, - const gchar *listen_point, - gpointer listener_data, - GFreeFunc destroy_notify); +guint gconf_listeners_add (GConfListeners *listeners, + const gchar *listen_point, + gpointer listener_data, + GFreeFunc destroy_notify); void gconf_listeners_remove (GConfListeners *listeners, - guint cnxn_id); + guint cnxn_id); void gconf_listeners_notify (GConfListeners *listeners, - const gchar *all_above, + const gchar *all_above, GConfListenersCallback callback, - gpointer user_data); -guintgconf_listeners_count (GConfListeners *listeners); + gpointer user_data); +guint gconf_listeners_count (GConfListeners *listeners); void gconf_listeners_foreach (GConfListeners *listeners, GConfListenersForeach callback, - gpointer user_data); -gbooleangconf_listeners_get_data (GConfListeners *listeners, - guint cnxn_id, - gpointer *listener_data_p, - const gchar **location_p); + gpointer user_data); +gboolean gconf_listeners_get_data (GConfListeners *listeners, + guint cnxn_id, + gpointer *listener_data_p, + const gchar **location_p); void gconf_listeners_remove_if (GConfListeners *listeners, GConfListenersPredicate predicate, - gpointer user_data); + gpointer user_data);
-

Description

+

Description

A GConfListeners object is used to store listeners who want notification of changes in a namespace section. It is a public API shared between gconfd and the GObject @@ -118,11 +82,11 @@

-

Details

+

Details

-

+

GConfListeners

-
typedef struct _GConfListeners GConfListeners;
+
typedef struct _GConfListeners GConfListeners;

The GConfListeners structure contains nothing other than a dummy pointer. Internally the data about listeners is maintained through a listener table structure, @@ -133,21 +97,13 @@


-

+

GConfListenersCallback ()

-
void                (*GConfListenersCallback)           (GConfListeners *listeners,
-                                                         const gchar *all_above_key,
-                                                         guint cnxn_id,
-                                                         gpointer listener_data,
-                                                         gpointer user_data);
+
void                (*GConfListenersCallback)           (GConfListeners *listeners,
+                                                         const gchar *all_above_key,
+                                                         guint cnxn_id,
+                                                         gpointer listener_data,
+                                                         gpointer user_data);

This is the signature of a user function added with gconf_listeners_notify(). This function is called whenever the value of a key changes. @@ -187,9 +143,9 @@


-

+

gconf_listeners_new ()

-
GConfListeners*     gconf_listeners_new                 (void);
+
GConfListeners*     gconf_listeners_new                 (void);

Creates a new listener table and typecasts it to a GConfListeners.

@@ -206,9 +162,9 @@

-

+

gconf_listeners_free ()

-
void                gconf_listeners_free                (GConfListeners *listeners);
+
void                gconf_listeners_free                (GConfListeners *listeners);

Destroys the listener table.

@@ -225,20 +181,12 @@

-

+

gconf_listeners_add ()

-
guint               gconf_listeners_add                 (GConfListeners *listeners,
-                                                         const gchar *listen_point,
-                                                         gpointer listener_data,
-                                                         GFreeFunc destroy_notify);
+
guint               gconf_listeners_add                 (GConfListeners *listeners,
+                                                         const gchar *listen_point,
+                                                         gpointer listener_data,
+                                                         GFreeFunc destroy_notify);

Creates a new Listener with the next available connection id and inserts it into the listener table. The newly created listener listens for changes below and including the listen_point.Returns the newly @@ -269,9 +217,7 @@

- @@ -281,12 +227,10 @@
-

+

gconf_listeners_remove ()

-
void                gconf_listeners_remove              (GConfListeners *listeners,
-                                                         guint cnxn_id);
+
void                gconf_listeners_remove              (GConfListeners *listeners,
+                                                         guint cnxn_id);

Removes the listener from the listener table.

@@ -310,16 +254,12 @@

-

+

gconf_listeners_notify ()

-
void                gconf_listeners_notify              (GConfListeners *listeners,
-                                                         const gchar *all_above,
+
void                gconf_listeners_notify              (GConfListeners *listeners,
+                                                         const gchar *all_above,
                                                          GConfListenersCallback callback,
-                                                         gpointer user_data);
+ gpointer user_data);

Notifies all the associated listeners that a key has changed.

@@ -353,11 +293,9 @@

-

+

gconf_listeners_count ()

-
guint               gconf_listeners_count               (GConfListeners *listeners);
+
guint               gconf_listeners_count               (GConfListeners *listeners);

Returns the number of alive listeners in the listener table.

@@ -381,13 +319,11 @@

-

+

gconf_listeners_foreach ()

-
void                gconf_listeners_foreach             (GConfListeners *listeners,
+
void                gconf_listeners_foreach             (GConfListeners *listeners,
                                                          GConfListenersForeach callback,
-                                                         gpointer user_data);
+ gpointer user_data);

Execute a function for each of the GConfListeners.

@@ -416,20 +352,12 @@

-

+

gconf_listeners_get_data ()

-
gboolean            gconf_listeners_get_data            (GConfListeners *listeners,
-                                                         guint cnxn_id,
-                                                         gpointer *listener_data_p,
-                                                         const gchar **location_p);
+
gboolean            gconf_listeners_get_data            (GConfListeners *listeners,
+                                                         guint cnxn_id,
+                                                         gpointer *listener_data_p,
+                                                         const gchar **location_p);

Obtains the data particular to a GConfListener.

@@ -470,13 +398,11 @@

-

+

gconf_listeners_remove_if ()

-
void                gconf_listeners_remove_if           (GConfListeners *listeners,
+
void                gconf_listeners_remove_if           (GConfListeners *listeners,
                                                          GConfListenersPredicate predicate,
-                                                         gpointer user_data);
+ gpointer user_data);

Remove the listener if a predicate is satisfied.

@@ -495,9 +421,7 @@
- @@ -507,9 +431,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-schema.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-schema.html @@ -21,16 +21,16 @@ - + Description

-gconf-listeners +gconf-listeners

gconf-listeners

Returns :

the newly assigned connection id, a guint value. +the newly assigned connection id, a guint value.

user_data :

a gpointer. +a gpointer. GConf Reference Manual Next
Top +
Top  |  - Description
- + Description

-GConfSchema +GConfSchema

GConfSchema — A GConfSchema describes a GConfEntry

@@ -59,21 +59,13 @@ void gconf_schema_set_type (GConfSchema *sc, GConfValueType type); void gconf_schema_set_locale (GConfSchema *sc, - const gchar *locale); + const gchar *locale); void gconf_schema_set_short_desc (GConfSchema *sc, - const gchar *desc); + const gchar *desc); void gconf_schema_set_long_desc (GConfSchema *sc, - const gchar *desc); + const gchar *desc); void gconf_schema_set_owner (GConfSchema *sc, - const gchar *owner); + const gchar *owner); void gconf_schema_set_default_value (GConfSchema *sc, const GConfValue *val); void gconf_schema_set_default_value_nocopy @@ -88,7 +80,7 @@
-

Description

+

Description

A "schema" describes a key-value pair in a GConf database. It may include information such as default value and value @@ -103,20 +95,20 @@

-

Details

+

Details

-

+

GConfSchema

-
typedef struct _GConfSchema GConfSchema;
+
typedef struct _GConfSchema GConfSchema;

An opaque data type representing a description of a key-value pair.


-

+

gconf_schema_new ()

-
GConfSchema*        gconf_schema_new                    (void);
+
GConfSchema*        gconf_schema_new                    (void);

Creates a new GConfSchema.

@@ -133,9 +125,9 @@

-

+

gconf_schema_free ()

-
void                gconf_schema_free                   (GConfSchema *sc);
+
void                gconf_schema_free                   (GConfSchema *sc);

Deallocates a GConfSchema. Also frees any allocated memory inside the GConfSchema. @@ -153,9 +145,9 @@


-

+

gconf_schema_copy ()

-
GConfSchema*        gconf_schema_copy                   (const GConfSchema *sc);
+
GConfSchema*        gconf_schema_copy                   (const GConfSchema *sc);

Copies a GConfSchema. The copy is a deep copy, that is, any allocated memory inside the GConfSchema will also be copied. @@ -180,9 +172,9 @@


-

+

gconf_schema_get_type ()

-
GConfValueType      gconf_schema_get_type               (const GConfSchema *schema);
+
GConfValueType      gconf_schema_get_type               (const GConfSchema *schema);

Returns the type of the entry described by a GConfSchema

@@ -207,9 +199,9 @@

-

+

gconf_schema_get_locale ()

-
const char*         gconf_schema_get_locale             (const GConfSchema *schema);
+
const char*         gconf_schema_get_locale             (const GConfSchema *schema);

Returns the locale for a GConfSchema. The returned string is not a copy, so don't try to free it. It is @@ -237,9 +229,9 @@


-

+

gconf_schema_get_short_desc ()

-
const char*         gconf_schema_get_short_desc         (const GConfSchema *schema);
+
const char*         gconf_schema_get_short_desc         (const GConfSchema *schema);

Returns the short description for a GConfSchema. The returned string is not a copy, don't try to free it. It is @@ -266,9 +258,9 @@


-

+

gconf_schema_get_long_desc ()

-
const char*         gconf_schema_get_long_desc          (const GConfSchema *schema);
+
const char*         gconf_schema_get_long_desc          (const GConfSchema *schema);

Returns the long description for a GConfSchema. The returned string is not a copy, don't try to free it. It is @@ -295,9 +287,9 @@


-

+

gconf_schema_get_owner ()

-
const char*         gconf_schema_get_owner              (const GConfSchema *schema);
+
const char*         gconf_schema_get_owner              (const GConfSchema *schema);

Returns the owner of a GConfSchema. The returned string is not a copy, don't try to free it. It is @@ -324,9 +316,9 @@


-

+

gconf_schema_get_default_value ()

-
GConfValue*         gconf_schema_get_default_value      (const GConfSchema *schema);
+
GConfValue*         gconf_schema_get_default_value      (const GConfSchema *schema);

Returns the default value of the entry that is described by a GConfSchema.

@@ -350,9 +342,9 @@

-

+

gconf_schema_get_car_type ()

-
GConfValueType      gconf_schema_get_car_type           (const GConfSchema *schema);
+
GConfValueType      gconf_schema_get_car_type           (const GConfSchema *schema);

Returns the default type of the first member of the pair in the entry (which should be of type GCONF_VALUE_PAIR) described by schema. @@ -377,9 +369,9 @@


-

+

gconf_schema_get_cdr_type ()

-
GConfValueType      gconf_schema_get_cdr_type           (const GConfSchema *schema);
+
GConfValueType      gconf_schema_get_cdr_type           (const GConfSchema *schema);

Returns the default type of the second member of the pair in the entry (which should be of type GCONF_VALUE_PAIR) described by schema. @@ -404,9 +396,9 @@


-

+

gconf_schema_get_list_type ()

-
GConfValueType      gconf_schema_get_list_type          (const GConfSchema *schema);
+
GConfValueType      gconf_schema_get_list_type          (const GConfSchema *schema);

Returns the default type of the list elements of the entry (which should be of default type GCONF_VALUE_LIST) described by schema. @@ -433,9 +425,9 @@


-

+

gconf_schema_set_type ()

-
void                gconf_schema_set_type               (GConfSchema *sc,
+
void                gconf_schema_set_type               (GConfSchema *sc,
                                                          GConfValueType type);

Sets the GConfValueType of the GConfSchema to type. @@ -460,12 +452,10 @@


-

+

gconf_schema_set_locale ()

-
void                gconf_schema_set_locale             (GConfSchema *sc,
-                                                         const gchar *locale);
+
void                gconf_schema_set_locale             (GConfSchema *sc,
+                                                         const gchar *locale);

Sets the locale for a GConfSchema to locale. locale is copied.

@@ -489,12 +479,10 @@

-

+

gconf_schema_set_short_desc ()

-
void                gconf_schema_set_short_desc         (GConfSchema *sc,
-                                                         const gchar *desc);
+
void                gconf_schema_set_short_desc         (GConfSchema *sc,
+                                                         const gchar *desc);

Sets the short description of a GConfSchema to desc. desc is copied.

@@ -518,12 +506,10 @@

-

+

gconf_schema_set_long_desc ()

-
void                gconf_schema_set_long_desc          (GConfSchema *sc,
-                                                         const gchar *desc);
+
void                gconf_schema_set_long_desc          (GConfSchema *sc,
+                                                         const gchar *desc);

Sets the long description of a GConfSchema to desc. desc is copied.

@@ -547,12 +533,10 @@

-

+

gconf_schema_set_owner ()

-
void                gconf_schema_set_owner              (GConfSchema *sc,
-                                                         const gchar *owner);
+
void                gconf_schema_set_owner              (GConfSchema *sc,
+                                                         const gchar *owner);

Sets the "owner" of the GConfSchema, where the owner is the name of the application that created the entry. @@ -577,9 +561,9 @@


-

+

gconf_schema_set_default_value ()

-
void                gconf_schema_set_default_value      (GConfSchema *sc,
+
void                gconf_schema_set_default_value      (GConfSchema *sc,
                                                          const GConfValue *val);

Sets the default value for the entry described by the GConfSchema. @@ -606,9 +590,9 @@


-

+

gconf_schema_set_default_value_nocopy ()

-
void                gconf_schema_set_default_value_nocopy
+
void                gconf_schema_set_default_value_nocopy
                                                         (GConfSchema *sc,
                                                          GConfValue *val);

@@ -636,9 +620,9 @@


-

+

gconf_schema_set_car_type ()

-
void                gconf_schema_set_car_type           (GConfSchema *sc,
+
void                gconf_schema_set_car_type           (GConfSchema *sc,
                                                          GConfValueType type);

Sets the GConfValueType of the first member (car) of the entry (which @@ -664,9 +648,9 @@


-

+

gconf_schema_set_cdr_type ()

-
void                gconf_schema_set_cdr_type           (GConfSchema *sc,
+
void                gconf_schema_set_cdr_type           (GConfSchema *sc,
                                                          GConfValueType type);

Sets the GConfValueType of the second member (cdr) of the entry (which @@ -692,9 +676,9 @@


-

+

gconf_schema_set_list_type ()

-
void                gconf_schema_set_list_type          (GConfSchema *sc,
+
void                gconf_schema_set_list_type          (GConfSchema *sc,
                                                          GConfValueType type);

Sets the GConfValueType of the list elements of the entry (which @@ -720,9 +704,9 @@

-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-sources.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-sources.html @@ -21,16 +21,16 @@
GConf Reference Manual Next
Top +
Top  |  - Description
@@ -44,151 +44,73 @@ GConfSource; enum GConfSourceFlags; -GConfSource* gconf_resolve_address (const gchar *address, - GError **err); +GConfSource* gconf_resolve_address (const gchar *address, + GError **err); void gconf_source_free (GConfSource *source); GConfSources; -GConfSources* gconf_sources_new_from_addresses (GSList *addresses, - GError **err); +GConfSources* gconf_sources_new_from_addresses (GSList *addresses, + GError **err); GConfSources* gconf_sources_new_from_source (GConfSource *source); void gconf_sources_free (GConfSources *sources); GConfValue* gconf_sources_query_value (GConfSources *sources, - const gchar *key, - const gchar **locales, - gboolean use_schema_default, - gboolean *value_is_default, - gboolean *value_is_writable, - gchar **schema_name, - GError **err); + const gchar *key, + const gchar **locales, + gboolean use_schema_default, + gboolean *value_is_default, + gboolean *value_is_writable, + gchar **schema_name, + GError **err); void gconf_sources_set_value (GConfSources *sources, - const gchar *key, + const gchar *key, const GConfValue *value, GConfSources **modified_sources, - GError **err); + GError **err); void gconf_sources_unset_value (GConfSources *sources, - const gchar *key, - const gchar *locale, + const gchar *key, + const gchar *locale, GConfSources **modified_sources, - GError **err); -GSList* gconf_sources_all_entries (GConfSources *sources, - const gchar *dir, - const gchar **locales, - GError **err); -GSList* gconf_sources_all_dirs (GConfSources *sources, - const gchar *dir, - GError **err); -gbooleangconf_sources_dir_exists (GConfSources *sources, - const gchar *dir, - GError **err); + GError **err); +GSList* gconf_sources_all_entries (GConfSources *sources, + const gchar *dir, + const gchar **locales, + GError **err); +GSList* gconf_sources_all_dirs (GConfSources *sources, + const gchar *dir, + GError **err); +gboolean gconf_sources_dir_exists (GConfSources *sources, + const gchar *dir, + GError **err); void gconf_sources_remove_dir (GConfSources *sources, - const gchar *dir, - GError **err); + const gchar *dir, + GError **err); void gconf_sources_set_schema (GConfSources *sources, - const gchar *key, - const gchar *schema_key, - GError **err); -gbooleangconf_sources_sync_all (GConfSources *sources, - GError **err); + const gchar *key, + const gchar *schema_key, + GError **err); +gboolean gconf_sources_sync_all (GConfSources *sources, + GError **err); GConfMetaInfo* gconf_sources_query_metainfo (GConfSources *sources, - const gchar *key, - GError **err); + const gchar *key, + GError **err); GConfValue* gconf_sources_query_default_value (GConfSources *sources, - const gchar *key, - const gchar **locales, - gboolean *is_writable, - GError **err); + const gchar *key, + const gchar **locales, + gboolean *is_writable, + GError **err);
-

Description

+

Description

-

Details

+

Details

-

+

GConfSource

-
typedef struct {
+
typedef struct {
   guint flags;
   gchar* address;
   GConfBackend* backend;
@@ -200,9 +122,9 @@
 

-

+

enum GConfSourceFlags

-
typedef enum {
+
typedef enum {
   /* These are an optimization to avoid calls to
    * the writable/readable methods in the backend
    * vtable
@@ -219,14 +141,10 @@
 

-

+

gconf_resolve_address ()

-
GConfSource*        gconf_resolve_address               (const gchar *address,
-                                                         GError **err);
+
GConfSource*        gconf_resolve_address               (const gchar *address,
+                                                         GError **err);

@@ -255,9 +173,9 @@

-

+

gconf_source_free ()

-
void                gconf_source_free                   (GConfSource *source);
+
void                gconf_source_free                   (GConfSource *source);

@@ -274,9 +192,9 @@

-

+

GConfSources

-
typedef struct {
+
typedef struct {
   GList* sources;
 } GConfSources;
 
@@ -286,14 +204,10 @@

-

+

gconf_sources_new_from_addresses ()

-
GConfSources*       gconf_sources_new_from_addresses    (GSList *addresses,
-                                                         GError **err);
+
GConfSources*       gconf_sources_new_from_addresses    (GSList *addresses,
+                                                         GError **err);

@@ -322,9 +236,9 @@

-

+

gconf_sources_new_from_source ()

-
GConfSources*       gconf_sources_new_from_source       (GConfSource *source);
+
GConfSources*       gconf_sources_new_from_source       (GConfSource *source);

@@ -348,9 +262,9 @@

-

+

gconf_sources_free ()

-
void                gconf_sources_free                  (GConfSources *sources);
+
void                gconf_sources_free                  (GConfSources *sources);

@@ -367,30 +281,16 @@

-

+

gconf_sources_query_value ()

-
GConfValue*         gconf_sources_query_value           (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar **locales,
-                                                         gboolean use_schema_default,
-                                                         gboolean *value_is_default,
-                                                         gboolean *value_is_writable,
-                                                         gchar **schema_name,
-                                                         GError **err);
+
GConfValue*         gconf_sources_query_value           (GConfSources *sources,
+                                                         const gchar *key,
+                                                         const gchar **locales,
+                                                         gboolean use_schema_default,
+                                                         gboolean *value_is_default,
+                                                         gboolean *value_is_writable,
+                                                         gchar **schema_name,
+                                                         GError **err);

@@ -449,17 +349,13 @@

-

+

gconf_sources_set_value ()

-
void                gconf_sources_set_value             (GConfSources *sources,
-                                                         const gchar *key,
+
void                gconf_sources_set_value             (GConfSources *sources,
+                                                         const gchar *key,
                                                          const GConfValue *value,
                                                          GConfSources **modified_sources,
-                                                         GError **err);
+ GError **err);

@@ -498,19 +394,13 @@

-

+

gconf_sources_unset_value ()

-
void                gconf_sources_unset_value           (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar *locale,
+
void                gconf_sources_unset_value           (GConfSources *sources,
+                                                         const gchar *key,
+                                                         const gchar *locale,
                                                          GConfSources **modified_sources,
-                                                         GError **err);
+ GError **err);

@@ -549,20 +439,12 @@

-

+

gconf_sources_all_entries ()

-
GSList*             gconf_sources_all_entries           (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         const gchar **locales,
-                                                         GError **err);
+
GSList*             gconf_sources_all_entries           (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         const gchar **locales,
+                                                         GError **err);

@@ -601,17 +483,11 @@

-

+

gconf_sources_all_dirs ()

-
GSList*             gconf_sources_all_dirs              (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
+
GSList*             gconf_sources_all_dirs              (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         GError **err);

@@ -645,17 +521,11 @@

-

+

gconf_sources_dir_exists ()

-
gboolean            gconf_sources_dir_exists            (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
+
gboolean            gconf_sources_dir_exists            (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         GError **err);

@@ -689,15 +559,11 @@

-

+

gconf_sources_remove_dir ()

-
void                gconf_sources_remove_dir            (GConfSources *sources,
-                                                         const gchar *dir,
-                                                         GError **err);
+
void                gconf_sources_remove_dir            (GConfSources *sources,
+                                                         const gchar *dir,
+                                                         GError **err);

@@ -726,18 +592,12 @@

-

+

gconf_sources_set_schema ()

-
void                gconf_sources_set_schema            (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar *schema_key,
-                                                         GError **err);
+
void                gconf_sources_set_schema            (GConfSources *sources,
+                                                         const gchar *key,
+                                                         const gchar *schema_key,
+                                                         GError **err);

@@ -771,14 +631,10 @@

-

+

gconf_sources_sync_all ()

-
gboolean            gconf_sources_sync_all              (GConfSources *sources,
-                                                         GError **err);
+
gboolean            gconf_sources_sync_all              (GConfSources *sources,
+                                                         GError **err);

@@ -807,15 +663,11 @@

-

+

gconf_sources_query_metainfo ()

-
GConfMetaInfo*      gconf_sources_query_metainfo        (GConfSources *sources,
-                                                         const gchar *key,
-                                                         GError **err);
+
GConfMetaInfo*      gconf_sources_query_metainfo        (GConfSources *sources,
+                                                         const gchar *key,
+                                                         GError **err);

@@ -849,21 +701,13 @@

-

+

gconf_sources_query_default_value ()

-
GConfValue*         gconf_sources_query_default_value   (GConfSources *sources,
-                                                         const gchar *key,
-                                                         const gchar **locales,
-                                                         gboolean *is_writable,
-                                                         GError **err);
+
GConfValue*         gconf_sources_query_default_value   (GConfSources *sources,
+                                                         const gchar *key,
+                                                         const gchar **locales,
+                                                         gboolean *is_writable,
+                                                         GError **err);

@@ -907,9 +751,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-value.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-value.html @@ -21,16 +21,16 @@ - + Description

-gconf-sources +gconf-sources

gconf-sources

GConf Reference Manual Next
Top +
Top  |  - Description
- - - - @@ -278,9 +226,9 @@
-

+

GConfValue

-
typedef struct {
+
typedef struct {
   GConfValueType type;
 } GConfValue;
 
@@ -310,9 +258,9 @@

-

+

GCONF_VALUE_TYPE_VALID()

-
#define GCONF_VALUE_TYPE_VALID(x) (((x) > GCONF_VALUE_INVALID) && ((x) <= GCONF_VALUE_PAIR))
+
#define GCONF_VALUE_TYPE_VALID(x) (((x) > GCONF_VALUE_INVALID) && ((x) <= GCONF_VALUE_PAIR))
 

@@ -330,9 +278,9 @@


-

+

gconf_value_get_string ()

-
const char*         gconf_value_get_string              (const GConfValue *value);
+
const char*         gconf_value_get_string              (const GConfValue *value);

Returns a const gchar* for a GConfValue with type GCONF_VALUE_STRING. The returned string is not a @@ -365,13 +313,11 @@


-

+

gconf_value_get_int ()

-
int                 gconf_value_get_int                 (const GConfValue *value);
+
int                 gconf_value_get_int                 (const GConfValue *value);

-Returns a gint for a GConfValue with type GCONF_VALUE_INT. +Returns a gint for a GConfValue with type GCONF_VALUE_INT.

-GConfValue, GConfEntry, GConfMetaInfo +GConfValue, GConfEntry, GConfMetaInfo

GConfValue, GConfEntry, GConfMetaInfo — A GConfValue stores a dynamically-typed value. A GConfEntry stores a @@ -51,41 +51,25 @@ int gconf_value_get_int (const GConfValue *value); double gconf_value_get_float (const GConfValue *value); GConfValueType gconf_value_get_list_type (const GConfValue *value); -GSList* gconf_value_get_list (const GConfValue *value); +GSList* gconf_value_get_list (const GConfValue *value); GConfValue* gconf_value_get_car (const GConfValue *value); GConfValue* gconf_value_get_cdr (const GConfValue *value); -gboolean gconf_value_get_bool (const GConfValue *value); +gboolean gconf_value_get_bool (const GConfValue *value); GConfSchema* gconf_value_get_schema (const GConfValue *value); GConfValue* gconf_value_new (GConfValueType type); GConfValue* gconf_value_new_from_string (GConfValueType type, - const gchar *str, - GError **err); + const gchar *str, + GError **err); GConfValue* gconf_value_copy (const GConfValue *src); void gconf_value_free (GConfValue *value); void gconf_value_set_int (GConfValue *value, - gint the_int); + gint the_int); void gconf_value_set_string (GConfValue *value, - const gchar *the_str); + const gchar *the_str); void gconf_value_set_float (GConfValue *value, - gdouble the_float); + gdouble the_float); void gconf_value_set_bool (GConfValue *value, - gboolean the_bool); + gboolean the_bool); void gconf_value_set_schema (GConfValue *value, const GConfSchema *sc); void gconf_value_set_schema_nocopy (GConfValue *value, @@ -101,53 +85,31 @@ void gconf_value_set_list_type (GConfValue *value, GConfValueType type); void gconf_value_set_list_nocopy (GConfValue *value, - GSList *list); + GSList *list); void gconf_value_set_list (GConfValue *value, - GSList *list); -gchar* gconf_value_to_string (const GConfValue *value); + GSList *list); +gchar* gconf_value_to_string (const GConfValue *value); GConfMetaInfo; GConfMetaInfo* gconf_meta_info_new (void); void gconf_meta_info_free (GConfMetaInfo *gcmi); const char* gconf_meta_info_get_schema (GConfMetaInfo *gcmi); const char* gconf_meta_info_get_mod_user (GConfMetaInfo *gcmi); -GTime gconf_meta_info_mod_time (GConfMetaInfo *gcmi); +GTime gconf_meta_info_mod_time (GConfMetaInfo *gcmi); void gconf_meta_info_set_schema (GConfMetaInfo *gcmi, - const gchar *schema_name); + const gchar *schema_name); void gconf_meta_info_set_mod_user (GConfMetaInfo *gcmi, - const gchar *mod_user); + const gchar *mod_user); void gconf_meta_info_set_mod_time (GConfMetaInfo *gcmi, - GTime mod_time); + GTime mod_time); GConfEntry; const char* gconf_entry_get_key (const GConfEntry *entry); GConfValue* gconf_entry_get_value (const GConfEntry *entry); const char* gconf_entry_get_schema_name (const GConfEntry *entry); -gboolean gconf_entry_get_is_default (const GConfEntry *entry); -gboolean gconf_entry_get_is_writable (const GConfEntry *entry); -GConfEntry* gconf_entry_new (const gchar *key, +gboolean gconf_entry_get_is_default (const GConfEntry *entry); +gboolean gconf_entry_get_is_writable (const GConfEntry *entry); +GConfEntry* gconf_entry_new (const gchar *key, const GConfValue *val); -GConfEntry* gconf_entry_new_nocopy (gchar *key, +GConfEntry* gconf_entry_new_nocopy (gchar *key, GConfValue *val); GConfEntry* gconf_entry_copy (const GConfEntry *src); void gconf_entry_free (GConfEntry *entry); @@ -159,21 +121,15 @@ void gconf_entry_set_value_nocopy (GConfEntry *entry, GConfValue *val); void gconf_entry_set_schema_name (GConfEntry *entry, - const gchar *name); + const gchar *name); void gconf_entry_set_is_default (GConfEntry *entry, - gboolean is_default); + gboolean is_default); void gconf_entry_set_is_writable (GConfEntry *entry, - gboolean is_writable); + gboolean is_writable);

-

Description

+

Description

GConfValue stores one of the value types GConf understands; GConf uses GConfValue to pass values around because it doesn't know the @@ -192,11 +148,11 @@

-

Details

+

Details

-

+

enum GConfValueType

-
typedef enum {
+
typedef enum {
   GCONF_VALUE_INVALID,
   GCONF_VALUE_STRING,
   GCONF_VALUE_INT,
@@ -227,30 +183,22 @@
 

GCONF_VALUE_STRING

String value (gchar*). +String value (gchar*).

GCONF_VALUE_INT

Integer value (gint). +Integer value (gint).

GCONF_VALUE_FLOAT

Floating point value (gdouble). +Floating point value (gdouble).

GCONF_VALUE_BOOL

Boolean value (gboolean). +Boolean value (gboolean).
@@ -383,9 +329,7 @@ - @@ -395,13 +339,11 @@
-

+

gconf_value_get_float ()

-
double              gconf_value_get_float               (const GConfValue *value);
+
double              gconf_value_get_float               (const GConfValue *value);

-Returns a gdouble for a GConfValue with type GCONF_VALUE_FLOAT. +Returns a gdouble for a GConfValue with type GCONF_VALUE_FLOAT.

Returns :

a gint. +a gint.
@@ -413,9 +355,7 @@ - @@ -425,9 +365,9 @@
-

+

gconf_value_get_list_type ()

-
GConfValueType      gconf_value_get_list_type           (const GConfValue *value);
+
GConfValueType      gconf_value_get_list_type           (const GConfValue *value);

Returns the type of the list elements in a GConfValue with type GCONF_VALUE_LIST. @@ -452,19 +392,13 @@


-

+

gconf_value_get_list ()

-
GSList*             gconf_value_get_list                (const GConfValue *value);
-

-Returns a GSList containing GConfValue objects. Each GConfValue in +

GSList*             gconf_value_get_list                (const GConfValue *value);
+

+Returns a GSList containing GConfValue objects. Each GConfValue in the returned list will have the type returned by -gconf_value_get_list_type(). Remember that the empty GSList is equal to +gconf_value_get_list_type(). Remember that the empty GSList is equal to NULL. The list is not a copy; it is "owned" by the GConfValue and will be destroyed when the GConfValue is destroyed.

@@ -478,9 +412,7 @@
- @@ -490,9 +422,9 @@
-

+

gconf_value_get_car ()

-
GConfValue*         gconf_value_get_car                 (const GConfValue *value);
+
GConfValue*         gconf_value_get_car                 (const GConfValue *value);

Returns the first member (car) of a GConfValue with type GCONF_VALUE_PAIR. The car is another GConfValue, with a primitive @@ -522,9 +454,9 @@


-

+

gconf_value_get_cdr ()

-
GConfValue*         gconf_value_get_cdr                 (const GConfValue *value);
+
GConfValue*         gconf_value_get_cdr                 (const GConfValue *value);

Returns the second member (cdr) of a GConfValue with type GCONF_VALUE_PAIR. The cdr is another GConfValue, with a primitive @@ -554,15 +486,11 @@


-

+

gconf_value_get_bool ()

-
gboolean            gconf_value_get_bool                (const GConfValue *value);
-

-Returns a gboolean for a GConfValue with type GCONF_VALUE_BOOL. +

gboolean            gconf_value_get_bool                (const GConfValue *value);
+

+Returns a gboolean for a GConfValue with type GCONF_VALUE_BOOL.

Returns :

a gdouble. +a gdouble.

Returns :

a GList. +a GList.
@@ -574,9 +502,7 @@ - @@ -586,9 +512,9 @@
-

+

gconf_value_get_schema ()

-
GConfSchema*        gconf_value_get_schema              (const GConfValue *value);
+
GConfSchema*        gconf_value_get_schema              (const GConfValue *value);

Returns a GConfSchema for a GConfValue with type GCONF_VALUE_SCHEMA. If the GConfValue is uninitialized, it @@ -620,9 +546,9 @@


-

+

gconf_value_new ()

-
GConfValue*         gconf_value_new                     (GConfValueType type);
+
GConfValue*         gconf_value_new                     (GConfValueType type);

Creates a new GConfValue with type type. The type is immutable after creation; values have a fixed type. You must @@ -649,15 +575,11 @@


-

+

gconf_value_new_from_string ()

-
GConfValue*         gconf_value_new_from_string         (GConfValueType type,
-                                                         const gchar *str,
-                                                         GError **err);
+
GConfValue*         gconf_value_new_from_string         (GConfValueType type,
+                                                         const gchar *str,
+                                                         GError **err);

Creates a new GConfValue with type type and value set to the string passed. Based on the value of type, this function does the appropriate conversion of the @@ -674,9 +596,7 @@

- @@ -696,9 +616,9 @@
-

+

gconf_value_copy ()

-
GConfValue*         gconf_value_copy                    (const GConfValue *src);
+
GConfValue*         gconf_value_copy                    (const GConfValue *src);

Copies a GConfValue. The copy is a deep copy, that is, any allocated memory inside the GConfValue will also be copied. @@ -723,9 +643,9 @@


-

+

gconf_value_free ()

-
void                gconf_value_free                    (GConfValue *value);
+
void                gconf_value_free                    (GConfValue *value);

Deallocates a GConfValue. Also deallocates any allocated memory inside the GConfValue (such as lists, pair members, strings, and schemas). @@ -743,12 +663,10 @@


-

+

gconf_value_set_int ()

-
void                gconf_value_set_int                 (GConfValue *value,
-                                                         gint the_int);
+
void                gconf_value_set_int                 (GConfValue *value,
+                                                         gint the_int);

Sets the value of a GConfValue with type GCONF_VALUE_INT.

@@ -772,12 +690,10 @@

-

+

gconf_value_set_string ()

-
void                gconf_value_set_string              (GConfValue *value,
-                                                         const gchar *the_str);
+
void                gconf_value_set_string              (GConfValue *value,
+                                                         const gchar *the_str);

Sets the value of a GConfValue with type GCONF_VALUE_STRING. the_str is copied. @@ -802,12 +718,10 @@


-

+

gconf_value_set_float ()

-
void                gconf_value_set_float               (GConfValue *value,
-                                                         gdouble the_float);
+
void                gconf_value_set_float               (GConfValue *value,
+                                                         gdouble the_float);

Sets the value of a GConfValue with type GCONF_VALUE_FLOAT. @@ -832,12 +746,10 @@


-

+

gconf_value_set_bool ()

-
void                gconf_value_set_bool                (GConfValue *value,
-                                                         gboolean the_bool);
+
void                gconf_value_set_bool                (GConfValue *value,
+                                                         gboolean the_bool);

Sets the value of a GConfValue with type GCONF_VALUE_BOOL. @@ -862,9 +774,9 @@


-

+

gconf_value_set_schema ()

-
void                gconf_value_set_schema              (GConfValue *value,
+
void                gconf_value_set_schema              (GConfValue *value,
                                                          const GConfSchema *sc);

Sets the value of a GConfValue with type GCONF_VALUE_SCHEMA. The @@ -891,9 +803,9 @@


-

+

gconf_value_set_schema_nocopy ()

-
void                gconf_value_set_schema_nocopy       (GConfValue *value,
+
void                gconf_value_set_schema_nocopy       (GConfValue *value,
                                                          GConfSchema *sc);

Sets the value of a GConfValue with type @@ -922,9 +834,9 @@


-

+

gconf_value_set_car ()

-
void                gconf_value_set_car                 (GConfValue *value,
+
void                gconf_value_set_car                 (GConfValue *value,
                                                          const GConfValue *car);

Sets the value of the first field (car) of a GConfValue with type @@ -951,9 +863,9 @@


-

+

gconf_value_set_car_nocopy ()

-
void                gconf_value_set_car_nocopy          (GConfValue *value,
+
void                gconf_value_set_car_nocopy          (GConfValue *value,
                                                          GConfValue *car);

Sets the value of the first field (car) of a GConfValue with type @@ -981,9 +893,9 @@


-

+

gconf_value_set_cdr ()

-
void                gconf_value_set_cdr                 (GConfValue *value,
+
void                gconf_value_set_cdr                 (GConfValue *value,
                                                          const GConfValue *cdr);

Sets the value of the second field (cdr) of a GConfValue with type @@ -1010,9 +922,9 @@


-

+

gconf_value_set_cdr_nocopy ()

-
void                gconf_value_set_cdr_nocopy          (GConfValue *value,
+
void                gconf_value_set_cdr_nocopy          (GConfValue *value,
                                                          GConfValue *cdr);

Sets the value of the second field (cdr) of a GConfValue with type @@ -1040,9 +952,9 @@


-

+

gconf_value_set_list_type ()

-
void                gconf_value_set_list_type           (GConfValue *value,
+
void                gconf_value_set_list_type           (GConfValue *value,
                                                          GConfValueType type);

Sets the type of the elements in a GConfValue of type @@ -1069,17 +981,13 @@


-

+

gconf_value_set_list_nocopy ()

-
void                gconf_value_set_list_nocopy         (GConfValue *value,
-                                                         GSList *list);
+
void                gconf_value_set_list_nocopy         (GConfValue *value,
+                                                         GSList *list);

Sets the value of a GConfValue with type GCONF_VALUE_LIST. The -list argument should be a GSList of GConfValue. Each GConfValue in +list argument should be a GSList of GConfValue. Each GConfValue in the list must have the same type, and this type must be specified in advance with gconf_value_set_list_type(). This function does not copy the list; the GConfValue will take @@ -1097,9 +1005,7 @@

- @@ -1109,17 +1015,13 @@
-

+

gconf_value_set_list ()

-
void                gconf_value_set_list                (GConfValue *value,
-                                                         GSList *list);
+
void                gconf_value_set_list                (GConfValue *value,
+                                                         GSList *list);

Sets the value of a GConfValue with type GCONF_VALUE_LIST. The -list argument should be a GSList of GConfValue. Each GConfValue in +list argument should be a GSList of GConfValue. Each GConfValue in the list must have the same type, and this type must be specified in advance with gconf_value_set_list_type(). This function copies the list; it will not modify the list argument. @@ -1134,9 +1036,7 @@

- @@ -1146,11 +1046,9 @@
-

+

gconf_value_to_string ()

-
gchar*              gconf_value_to_string               (const GConfValue *value);
+
gchar*              gconf_value_to_string               (const GConfValue *value);

Creates a human-readable string representation of a GConfValue. This is intended for debugging and the like; the string representation is @@ -1158,9 +1056,7 @@ this function to save a value to a file or anything like that). The exact nature of the string representation may change in future versions. The returned string is newly-allocated and must be freed -with g_free(). +with g_free().

Returns :

a gboolean value. +a gboolean value.

str :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

list :

the GSList of GConfValue to set as the list value. +the GSList of GConfValue to set as the list value.

list :

the GSList of GConfValue to set as the list value. +the GSList of GConfValue to set as the list value.
@@ -1182,9 +1078,9 @@
-

+

GConfMetaInfo

-
typedef struct {
+
typedef struct {
   gchar* schema;
   gchar* mod_user; /* user owning the daemon that made the last modification */
   GTime  mod_time; /* time of the modification */
@@ -1196,9 +1092,9 @@
 

-

+

gconf_meta_info_new ()

-
GConfMetaInfo*      gconf_meta_info_new                 (void);
+
GConfMetaInfo*      gconf_meta_info_new                 (void);

Creates a new GConfMetaInfo structure and returns the newly allocated GConfMetaInfo. @@ -1216,9 +1112,9 @@


-

+

gconf_meta_info_free ()

-
void                gconf_meta_info_free                (GConfMetaInfo *gcmi);
+
void                gconf_meta_info_free                (GConfMetaInfo *gcmi);

Frees the GConfMetaInfo.

@@ -1235,9 +1131,9 @@

-

+

gconf_meta_info_get_schema ()

-
const char*         gconf_meta_info_get_schema          (GConfMetaInfo *gcmi);
+
const char*         gconf_meta_info_get_schema          (GConfMetaInfo *gcmi);

Returns the schema field of the GConfMetaInfo.

@@ -1261,9 +1157,9 @@

-

+

gconf_meta_info_get_mod_user ()

-
const char*         gconf_meta_info_get_mod_user        (GConfMetaInfo *gcmi);
+
const char*         gconf_meta_info_get_mod_user        (GConfMetaInfo *gcmi);

Returns the user owning the daemon that made the last modification of the key.

@@ -1287,11 +1183,9 @@

-

+

gconf_meta_info_mod_time ()

-
GTime               gconf_meta_info_mod_time            (GConfMetaInfo *gcmi);
+
GTime               gconf_meta_info_mod_time            (GConfMetaInfo *gcmi);

Returns the last modification time of the key.

@@ -1305,9 +1199,7 @@
- @@ -1317,12 +1209,10 @@
-

+

gconf_meta_info_set_schema ()

-
void                gconf_meta_info_set_schema          (GConfMetaInfo *gcmi,
-                                                         const gchar *schema_name);
+
void                gconf_meta_info_set_schema          (GConfMetaInfo *gcmi,
+                                                         const gchar *schema_name);

Sets the schema_name field of the GConfMetaInfo to the name passed.

@@ -1346,12 +1236,10 @@

-

+

gconf_meta_info_set_mod_user ()

-
void                gconf_meta_info_set_mod_user        (GConfMetaInfo *gcmi,
-                                                         const gchar *mod_user);
+
void                gconf_meta_info_set_mod_user        (GConfMetaInfo *gcmi,
+                                                         const gchar *mod_user);

Sets the mod_user field of the GConfMetaInfo to the user name passed.

@@ -1375,12 +1263,10 @@

-

+

gconf_meta_info_set_mod_time ()

-
void                gconf_meta_info_set_mod_time        (GConfMetaInfo *gcmi,
-                                                         GTime mod_time);
+
void                gconf_meta_info_set_mod_time        (GConfMetaInfo *gcmi,
+                                                         GTime mod_time);

Sets the mod_last field of the GConfMetaInfo to the mod_time passed.

@@ -1394,9 +1280,7 @@
- @@ -1406,9 +1290,9 @@
-

+

GConfEntry

-
typedef struct {
+
typedef struct {
   char *key;
   GConfValue *value;
 } GConfEntry;
@@ -1446,9 +1330,9 @@
 

-

+

gconf_entry_get_key ()

-
const char*         gconf_entry_get_key                 (const GConfEntry *entry);
+
const char*         gconf_entry_get_key                 (const GConfEntry *entry);

Accesses the key field of a GConfEntry. The returned key is not a copy, and should not be freed or modified. @@ -1473,9 +1357,9 @@


-

+

gconf_entry_get_value ()

-
GConfValue*         gconf_entry_get_value               (const GConfEntry *entry);
+
GConfValue*         gconf_entry_get_value               (const GConfEntry *entry);

Accesses the value field of a GConfEntry. The returned value is not a copy, and should not be freed or modified. If you have called @@ -1502,9 +1386,9 @@


-

+

gconf_entry_get_schema_name ()

-
const char*         gconf_entry_get_schema_name         (const GConfEntry *entry);
+
const char*         gconf_entry_get_schema_name         (const GConfEntry *entry);

Returns the schema_name field of the GConfEntry.

@@ -1528,11 +1412,9 @@

-

+

gconf_entry_get_is_default ()

-
gboolean            gconf_entry_get_is_default          (const GConfEntry *entry);
+
gboolean            gconf_entry_get_is_default          (const GConfEntry *entry);

Returns the is_default field of the GConfEntry , a gboolean value.

@@ -1546,9 +1428,7 @@
- @@ -1558,11 +1438,9 @@
-

+

gconf_entry_get_is_writable ()

-
gboolean            gconf_entry_get_is_writable         (const GConfEntry *entry);
+
gboolean            gconf_entry_get_is_writable         (const GConfEntry *entry);

Returns the is_writable field of the GConfEntry, a gboolean value.

@@ -1576,9 +1454,7 @@
- @@ -1588,11 +1464,9 @@
-

+

gconf_entry_new ()

-
GConfEntry*         gconf_entry_new                     (const gchar *key,
+
GConfEntry*         gconf_entry_new                     (const gchar *key,
                                                          const GConfValue *val);

Creates a new GConfEntry with key key and value val calling gconf_entry_new_nocopy(). @@ -1622,19 +1496,15 @@


-

+

gconf_entry_new_nocopy ()

-
GConfEntry*         gconf_entry_new_nocopy              (gchar *key,
+
GConfEntry*         gconf_entry_new_nocopy              (gchar *key,
                                                          GConfValue *val);

Creates a new GConfEntry with key key and value val. key should be a full path to the key, starting with '/'. Neither the key nor the value is copied; both are freed when the GConfEntry is freed. The string will be freed with -g_free() so should be allocated with a GLib function, not malloc(). +g_free() so should be allocated with a GLib function, not malloc().

Returns :

the mod_time, a GTime value. +the mod_time, a GTime value.

mod_time :

a GTime. +a GTime.

Returns :

a gboolean value. +a gboolean value.

Returns :

a gboolean value. +a gboolean value.
@@ -1661,9 +1531,9 @@
-

+

gconf_entry_copy ()

-
GConfEntry*         gconf_entry_copy                    (const GConfEntry *src);
+
GConfEntry*         gconf_entry_copy                    (const GConfEntry *src);

Copies the fields of an existing GConfEntry and returns the new GConfEntry.

@@ -1687,9 +1557,9 @@

-

+

gconf_entry_free ()

-
void                gconf_entry_free                    (GConfEntry *entry);
+
void                gconf_entry_free                    (GConfEntry *entry);

Warning

gconf_entry_free is deprecated and should not be used in newly-written code.

@@ -1710,9 +1580,9 @@

-

+

gconf_entry_ref ()

-
void                gconf_entry_ref                     (GConfEntry *entry);
+
void                gconf_entry_ref                     (GConfEntry *entry);

Increases the refcount of a GConfEntry by one.

@@ -1729,9 +1599,9 @@

-

+

gconf_entry_unref ()

-
void                gconf_entry_unref                   (GConfEntry *entry);
+
void                gconf_entry_unref                   (GConfEntry *entry);

Decreases the refcount of a GConfEntry by one and frees the GConfEntry when the refcount becomes zero. @@ -1749,9 +1619,9 @@


-

+

gconf_entry_steal_value ()

-
GConfValue*         gconf_entry_steal_value             (GConfEntry *entry);
+
GConfValue*         gconf_entry_steal_value             (GConfEntry *entry);

Extracts the value from a GConfEntry, leaving the value field in GConfEntry set to NULL. Destroying the GConfEntry @@ -1778,9 +1648,9 @@


-

+

gconf_entry_set_value ()

-
void                gconf_entry_set_value               (GConfEntry *entry,
+
void                gconf_entry_set_value               (GConfEntry *entry,
                                                          const GConfValue *val);

Sets the value field of the GConfEntry to the GConfValue passed. @@ -1805,9 +1675,9 @@


-

+

gconf_entry_set_value_nocopy ()

-
void                gconf_entry_set_value_nocopy        (GConfEntry *entry,
+
void                gconf_entry_set_value_nocopy        (GConfEntry *entry,
                                                          GConfValue *val);

Sets the value field to val after freeing the already existing value. @@ -1832,12 +1702,10 @@


-

+

gconf_entry_set_schema_name ()

-
void                gconf_entry_set_schema_name         (GConfEntry *entry,
-                                                         const gchar *name);
+
void                gconf_entry_set_schema_name         (GConfEntry *entry,
+                                                         const gchar *name);

Sets the schema_name field of the GConfEntry to the name passed after freeing the already existing name. @@ -1862,12 +1730,10 @@


-

+

gconf_entry_set_is_default ()

-
void                gconf_entry_set_is_default          (GConfEntry *entry,
-                                                         gboolean is_default);
+
void                gconf_entry_set_is_default          (GConfEntry *entry,
+                                                         gboolean is_default);

Sets the is_default field of the GConfEntry to the boolean value passed.

@@ -1891,12 +1757,10 @@

-

+

gconf_entry_set_is_writable ()

-
void                gconf_entry_set_is_writable         (GConfEntry *entry,
-                                                         gboolean is_writable);
+
void                gconf_entry_set_is_writable         (GConfEntry *entry,
+                                                         gboolean is_writable);

Sets the is_writable field of the GConfEntry to the boolean value passed.

@@ -1920,9 +1784,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf.html @@ -21,16 +21,16 @@ - + Description
GConf Reference Manual Next
Top +
Top  |  - Description
- @@ -518,14 +260,10 @@
-

+

gconf_preinit ()

-
void                gconf_preinit                       (gpointer app,
-                                                         gpointer mod_info);
+
void                gconf_preinit                       (gpointer app,
+                                                         gpointer mod_info);

Warning

gconf_preinit is deprecated and should not be used in newly-written code.

@@ -553,14 +291,10 @@

-

+

gconf_postinit ()

-
void                gconf_postinit                      (gpointer app,
-                                                         gpointer mod_info);
+
void                gconf_postinit                      (gpointer app,
+                                                         gpointer mod_info);

Warning

gconf_postinit is deprecated and should not be used in newly-written code.

@@ -588,11 +322,9 @@

-

+

gconf_is_initialized ()

-
gboolean            gconf_is_initialized                (void);
+
gboolean            gconf_is_initialized                (void);

Warning

gconf_is_initialized is deprecated and should not be used in newly-written code.

@@ -614,16 +346,12 @@

-

+

GConfNotifyFunc ()

-
void                (*GConfNotifyFunc)                  (GConfEngine *conf,
-                                                         guint cnxn_id,
+
void                (*GConfNotifyFunc)                  (GConfEngine *conf,
+                                                         guint cnxn_id,
                                                          GConfEntry *entry,
-                                                         gpointer user_data);
+ gpointer user_data);

A callback function invoked when a key's value changes. The cnxn_id parameter will be the connection ID returned from gconf_engine_notify_add(). key will be the @@ -662,30 +390,20 @@


-

+

gconf_engine_notify_add ()

-
guint               gconf_engine_notify_add             (GConfEngine *conf,
-                                                         const gchar *namespace_section,
+
guint               gconf_engine_notify_add             (GConfEngine *conf,
+                                                         const gchar *namespace_section,
                                                          GConfNotifyFunc func,
-                                                         gpointer user_data,
-                                                         GError **err);
+ gpointer user_data, + GError **err);

Registers a notification request with the gconfd server. The server will notify the client when any key at or below namespace_section is set or unset. Try to watch the smallest possible part of the namespace; otherwise you will slow down the server and your application with unnecessary notifications. Note that you should prefer gconf_client_notify_add() -if you're using the GObject wrapper library, because +if you're using the GObject wrapper library, because gconf_client_notify_add() does not require a client-server conversation for every callback. gconf_engine_notify_add() requests a different server notification for every callback. The function returns an ID you can use to remove the @@ -716,9 +434,7 @@

- @@ -733,12 +449,10 @@
-

+

gconf_engine_notify_remove ()

-
void                gconf_engine_notify_remove          (GConfEngine *conf,
-                                                         guint cnxn);
+
void                gconf_engine_notify_remove          (GConfEngine *conf,
+                                                         guint cnxn);

Removes a notification request.

@@ -762,15 +476,11 @@

-

+

gconf_engine_get ()

-
GConfValue*         gconf_engine_get                    (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
GConfValue*         gconf_engine_get                    (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Returns the GConfValue stored at key, or NULL if no value is set. You must call gconf_value_free() to free the returned value. If you know @@ -794,9 +504,7 @@

- @@ -811,15 +519,11 @@
-

+

gconf_engine_get_without_default ()

-
GConfValue*         gconf_engine_get_without_default    (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
GConfValue*         gconf_engine_get_without_default    (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Identical to gconf_engine_get(), except that it will return NULL in place of the default value if the key is unset. Note that gconf_engine_get() can also @@ -840,9 +544,7 @@

- @@ -857,21 +559,13 @@
-

+

gconf_engine_get_entry ()

-
GConfEntry*         gconf_engine_get_entry              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         GError **err);
+
GConfEntry*         gconf_engine_get_entry              (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *locale,
+                                                         gboolean use_schema_default,
+                                                         GError **err);

Obtain the full GConfEntry for a value.

@@ -895,17 +589,13 @@
- - @@ -920,18 +610,12 @@
-

+

gconf_engine_get_with_locale ()

-
GConfValue*         gconf_engine_get_with_locale        (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         GError **err);
+
GConfValue*         gconf_engine_get_with_locale        (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *locale,
+                                                         GError **err);

Requests the value appropriate for a particular locale. Right now, only values of type GCONF_VALUE_SCHEMA are localized; the locale is @@ -961,9 +645,7 @@

- @@ -978,16 +660,12 @@
-

+

gconf_engine_get_default_from_schema ()

-
GConfValue*         gconf_engine_get_default_from_schema
+
GConfValue*         gconf_engine_get_default_from_schema
                                                         (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+ const gchar *key, + GError **err);

Returns the default value stored in the key's schema, if the key has a schema associated and the schema exists and the schema contains a default value. Note @@ -1012,9 +690,7 @@

- @@ -1029,18 +705,12 @@
-

+

gconf_engine_set ()

-
gboolean            gconf_engine_set                    (GConfEngine *conf,
-                                                         const gchar *key,
+
gboolean            gconf_engine_set                    (GConfEngine *conf,
+                                                         const gchar *key,
                                                          const GConfValue *value,
-                                                         GError **err);
+ GError **err);

Sets the value of key to value. Does not modify the passed-in GConfValue, you must free it yourself. You may prefer a type-specific @@ -1073,9 +743,7 @@

- @@ -1091,17 +759,11 @@
-

+

gconf_engine_unset ()

-
gboolean            gconf_engine_unset                  (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_engine_unset                  (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Unsets the value of key; if key is already unset, has no effect. An error of note is GCONF_OVERRIDDEN, indicating that the system @@ -1122,9 +784,7 @@

- @@ -1140,20 +800,12 @@
-

+

gconf_engine_associate_schema ()

-
gboolean            gconf_engine_associate_schema       (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *schema_key,
-                                                         GError **err);
+
gboolean            gconf_engine_associate_schema       (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *schema_key,
+                                                         GError **err);

Directs GConf to find the schema for key at location schema_key. That is, the value stored at schema_key should have type @@ -1182,9 +834,7 @@

- @@ -1200,26 +850,18 @@
-

+

gconf_engine_all_entries ()

-
GSList*             gconf_engine_all_entries            (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
+
GSList*             gconf_engine_all_entries            (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);

Lists the key-value pairs in dir. Does not list subdirectories; for that use gconf_engine_all_dirs(). The returned list contains GConfEntry objects. A GConfEntry contains an absolute key and a value. The list is not recursive, it contains only the immediate children of dir. To free the returned list, gconf_entry_free() -each list element, then g_slist_free() the list itself. +each list element, then g_slist_free() the list itself.

-GConf Core Interfaces +GConf Core Interfaces

GConf Core Interfaces — Basic functions to initialize GConf and get/set values

@@ -43,412 +43,162 @@ -gboolean gconf_init (int argc, +gboolean gconf_init (int argc, char **argv, - GError **err); -void gconf_preinit (gpointer app, - gpointer mod_info); -void gconf_postinit (gpointer app, - gpointer mod_info); -gboolean gconf_is_initialized (void); + GError **err); +void gconf_preinit (gpointer app, + gpointer mod_info); +void gconf_postinit (gpointer app, + gpointer mod_info); +gboolean gconf_is_initialized (void); void (*GConfNotifyFunc) (GConfEngine *conf, - guint cnxn_id, + guint cnxn_id, GConfEntry *entry, - gpointer user_data); -guint gconf_engine_notify_add (GConfEngine *conf, - const gchar *namespace_section, + gpointer user_data); +guint gconf_engine_notify_add (GConfEngine *conf, + const gchar *namespace_section, GConfNotifyFunc func, - gpointer user_data, - GError **err); + gpointer user_data, + GError **err); void gconf_engine_notify_remove (GConfEngine *conf, - guint cnxn); + guint cnxn); GConfValue* gconf_engine_get (GConfEngine *conf, - const gchar *key, - GError **err); + const gchar *key, + GError **err); GConfValue* gconf_engine_get_without_default (GConfEngine *conf, - const gchar *key, - GError **err); + const gchar *key, + GError **err); GConfEntry* gconf_engine_get_entry (GConfEngine *conf, - const gchar *key, - const gchar *locale, - gboolean use_schema_default, - GError **err); + const gchar *key, + const gchar *locale, + gboolean use_schema_default, + GError **err); GConfValue* gconf_engine_get_with_locale (GConfEngine *conf, - const gchar *key, - const gchar *locale, - GError **err); + const gchar *key, + const gchar *locale, + GError **err); GConfValue* gconf_engine_get_default_from_schema (GConfEngine *conf, - const gchar *key, - GError **err); -gboolean gconf_engine_set (GConfEngine *conf, - const gchar *key, + const gchar *key, + GError **err); +gboolean gconf_engine_set (GConfEngine *conf, + const gchar *key, const GConfValue *value, - GError **err); -gboolean gconf_engine_unset (GConfEngine *conf, - const gchar *key, - GError **err); -gboolean gconf_engine_associate_schema (GConfEngine *conf, - const gchar *key, - const gchar *schema_key, - GError **err); -GSList* gconf_engine_all_entries (GConfEngine *conf, - const gchar *dir, - GError **err); -GSList* gconf_engine_all_dirs (GConfEngine *conf, - const gchar *dir, - GError **err); + GError **err); +gboolean gconf_engine_unset (GConfEngine *conf, + const gchar *key, + GError **err); +gboolean gconf_engine_associate_schema (GConfEngine *conf, + const gchar *key, + const gchar *schema_key, + GError **err); +GSList* gconf_engine_all_entries (GConfEngine *conf, + const gchar *dir, + GError **err); +GSList* gconf_engine_all_dirs (GConfEngine *conf, + const gchar *dir, + GError **err); void gconf_engine_suggest_sync (GConfEngine *conf, - GError **err); -gboolean gconf_engine_dir_exists (GConfEngine *conf, - const gchar *dir, - GError **err); + GError **err); +gboolean gconf_engine_dir_exists (GConfEngine *conf, + const gchar *dir, + GError **err); void gconf_engine_remove_dir (GConfEngine *conf, - const gchar *dir, - GError **err); -gboolean gconf_engine_key_is_writable (GConfEngine *conf, - const gchar *key, - GError **err); -gboolean gconf_valid_key (const gchar *key, - gchar **why_invalid); -gboolean gconf_key_is_below (const gchar *above, - const gchar *below); -gchar* gconf_concat_dir_and_key (const gchar *dir, - const gchar *key); -gchar* gconf_unique_key (void); + const gchar *dir, + GError **err); +gboolean gconf_engine_key_is_writable (GConfEngine *conf, + const gchar *key, + GError **err); +gboolean gconf_valid_key (const gchar *key, + gchar **why_invalid); +gboolean gconf_key_is_below (const gchar *above, + const gchar *below); +gchar* gconf_concat_dir_and_key (const gchar *dir, + const gchar *key); +gchar* gconf_unique_key (void); char* gconf_escape_key (const char *arbitrary_text, int len); char* gconf_unescape_key (const char *escaped_key, int len); -gdouble gconf_engine_get_float (GConfEngine *conf, - const gchar *key, - GError **err); -gint gconf_engine_get_int (GConfEngine *conf, - const gchar *key, - GError **err); -gchar* gconf_engine_get_string (GConfEngine *conf, - const gchar *key, - GError **err); -gboolean gconf_engine_get_bool (GConfEngine *conf, - const gchar *key, - GError **err); +gdouble gconf_engine_get_float (GConfEngine *conf, + const gchar *key, + GError **err); +gint gconf_engine_get_int (GConfEngine *conf, + const gchar *key, + GError **err); +gchar* gconf_engine_get_string (GConfEngine *conf, + const gchar *key, + GError **err); +gboolean gconf_engine_get_bool (GConfEngine *conf, + const gchar *key, + GError **err); GConfSchema* gconf_engine_get_schema (GConfEngine *conf, - const gchar *key, - GError **err); -GSList* gconf_engine_get_list (GConfEngine *conf, - const gchar *key, + const gchar *key, + GError **err); +GSList* gconf_engine_get_list (GConfEngine *conf, + const gchar *key, GConfValueType list_type, - GError **err); -gboolean gconf_engine_get_pair (GConfEngine *conf, - const gchar *key, + GError **err); +gboolean gconf_engine_get_pair (GConfEngine *conf, + const gchar *key, GConfValueType car_type, GConfValueType cdr_type, - gpointer car_retloc, - gpointer cdr_retloc, - GError **err); -gboolean gconf_engine_set_float (GConfEngine *conf, - const gchar *key, - gdouble val, - GError **err); -gboolean gconf_engine_set_int (GConfEngine *conf, - const gchar *key, - gint val, - GError **err); -gboolean gconf_engine_set_string (GConfEngine *conf, - const gchar *key, - const gchar *val, - GError **err); -gboolean gconf_engine_set_bool (GConfEngine *conf, - const gchar *key, - gboolean val, - GError **err); -gboolean gconf_engine_set_schema (GConfEngine *conf, - const gchar *key, + gpointer car_retloc, + gpointer cdr_retloc, + GError **err); +gboolean gconf_engine_set_float (GConfEngine *conf, + const gchar *key, + gdouble val, + GError **err); +gboolean gconf_engine_set_int (GConfEngine *conf, + const gchar *key, + gint val, + GError **err); +gboolean gconf_engine_set_string (GConfEngine *conf, + const gchar *key, + const gchar *val, + GError **err); +gboolean gconf_engine_set_bool (GConfEngine *conf, + const gchar *key, + gboolean val, + GError **err); +gboolean gconf_engine_set_schema (GConfEngine *conf, + const gchar *key, const GConfSchema *val, - GError **err); -gboolean gconf_engine_set_list (GConfEngine *conf, - const gchar *key, + GError **err); +gboolean gconf_engine_set_list (GConfEngine *conf, + const gchar *key, GConfValueType list_type, - GSList *list, - GError **err); -gboolean gconf_engine_set_pair (GConfEngine *conf, - const gchar *key, + GSList *list, + GError **err); +gboolean gconf_engine_set_pair (GConfEngine *conf, + const gchar *key, GConfValueType car_type, GConfValueType cdr_type, - gconstpointer address_of_car, - gconstpointer address_of_cdr, - GError **err); + gconstpointer address_of_car, + gconstpointer address_of_cdr, + GError **err); GConfEnumStringPair; -gboolean gconf_string_to_enum (GConfEnumStringPair lookup_table[], - const gchar *str, - gint *enum_value_retloc); -const gchar* gconf_enum_to_string (GConfEnumStringPair lookup_table[], - gint enum_value); +gboolean gconf_string_to_enum (GConfEnumStringPair lookup_table[], + const gchar *str, + gint *enum_value_retloc); +const gchar* gconf_enum_to_string (GConfEnumStringPair lookup_table[], + gint enum_value); void gconf_clear_cache (GConfEngine *conf, - GError **err); + GError **err); void gconf_synchronous_sync (GConfEngine *conf, - GError **err); + GError **err); GConfValue* gconf_engine_get_full (GConfEngine *conf, - const gchar *key, - const gchar *locale, - gboolean use_schema_default, - gboolean *is_default_p, - gboolean *is_writable_p, - GError **err); + const gchar *key, + const gchar *locale, + gboolean use_schema_default, + gboolean *is_default_p, + gboolean *is_writable_p, + GError **err);
-

Description

+

Description

These functions initialize GConf, and communicate with the gconfd server via a @@ -457,25 +207,19 @@ schema names with keys.

-Most of this interface is replicated in the GObject wrapper +Most of this interface is replicated in the GObject wrapper (GConfClient object); an alternative to the value-setting functions is the GConfChangeSet interface.

-

Details

+

Details

-

+

gconf_init ()

-
gboolean            gconf_init                          (int argc,
+
gboolean            gconf_init                          (int argc,
                                                          char **argv,
-                                                         GError **err);
+ GError **err);

Warning

gconf_init is deprecated and should not be used in newly-written code.

@@ -500,9 +244,7 @@

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

use_schema_default :

a gboolean value indicating whether the default value associated with schema +a gboolean value indicating whether the default value associated with schema should be used.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -1236,9 +878,7 @@ - @@ -1253,24 +893,14 @@
-

+

gconf_engine_all_dirs ()

-
GSList*             gconf_engine_all_dirs               (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
+
GSList*             gconf_engine_all_dirs               (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);

Lists the subdirectories in dir. The returned list contains allocated -strings. Each string is the absolute path of a subdirectory. You should g_free() each string in the list, then g_slist_free() the list itself. +strings. Each string is the absolute path of a subdirectory. You should g_free() each string in the list, then g_slist_free() the list itself.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -1287,9 +917,7 @@ - @@ -1304,12 +932,10 @@
-

+

gconf_engine_suggest_sync ()

-
void                gconf_engine_suggest_sync           (GConfEngine *conf,
-                                                         GError **err);
+
void                gconf_engine_suggest_sync           (GConfEngine *conf,
+                                                         GError **err);

Suggests to gconfd that you've just finished a block of changes, and it would be an optimal time to sync to @@ -1329,9 +955,7 @@

- @@ -1341,17 +965,11 @@
-

+

gconf_engine_dir_exists ()

-
gboolean            gconf_engine_dir_exists             (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
+
gboolean            gconf_engine_dir_exists             (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);

Queries whether the directory dir exists in the GConf database. Returns TRUE or FALSE. @@ -1371,9 +989,7 @@

- @@ -1389,15 +1005,11 @@
-

+

gconf_engine_remove_dir ()

-
void                gconf_engine_remove_dir             (GConfEngine *conf,
-                                                         const gchar *dir,
-                                                         GError **err);
+
void                gconf_engine_remove_dir             (GConfEngine *conf,
+                                                         const gchar *dir,
+                                                         GError **err);

This function first checks the validity of the gconf key. In case of a local GConfEngine it removes the directory from the source backend calling gconf_sources_remove_dir(). Otherwise it obtains the @@ -1419,9 +1031,7 @@

- @@ -1431,17 +1041,11 @@
-

+

gconf_engine_key_is_writable ()

-
gboolean            gconf_engine_key_is_writable        (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_engine_key_is_writable        (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Checks whether the key is writable.

@@ -1460,9 +1064,7 @@
- @@ -1478,16 +1080,10 @@
-

+

gconf_valid_key ()

-
gboolean            gconf_valid_key                     (const gchar *key,
-                                                         gchar **why_invalid);
+
gboolean            gconf_valid_key                     (const gchar *key,
+                                                         gchar **why_invalid);

Asks whether a key is syntactically correct, that is, it ensures that the key consists of slash-separated strings and contains only legal @@ -1509,9 +1105,7 @@

- @@ -1527,16 +1121,10 @@
-

+

gconf_key_is_below ()

-
gboolean            gconf_key_is_below                  (const gchar *above,
-                                                         const gchar *below);
+
gboolean            gconf_key_is_below                  (const gchar *above,
+                                                         const gchar *below);

Asks whether the key below would be found below the key above, were they both to exist in the database. For example, /foo @@ -1570,16 +1158,10 @@


-

+

gconf_concat_dir_and_key ()

-
gchar*              gconf_concat_dir_and_key            (const gchar *dir,
-                                                         const gchar *key);
+
gchar*              gconf_concat_dir_and_key            (const gchar *dir,
+                                                         const gchar *key);

Concatenates the dir and key passed removing the unnecessary '/' characters and returns the new string. @@ -1609,11 +1191,9 @@


-

+

gconf_unique_key ()

-
gchar*              gconf_unique_key                    (void);
+
gchar*              gconf_unique_key                    (void);

Generates a new and unique key using serial number, process id, current time and a random number generated. @@ -1622,9 +1202,7 @@

- @@ -1633,9 +1211,9 @@
-

+

gconf_escape_key ()

-
char*               gconf_escape_key                    (const char *arbitrary_text,
+
char*               gconf_escape_key                    (const char *arbitrary_text,
                                                          int len);

Escape arbitrary_text such that it's a valid key element (i.e. one @@ -1669,9 +1247,9 @@


-

+

gconf_unescape_key ()

-
char*               gconf_unescape_key                  (const char *escaped_key,
+
char*               gconf_unescape_key                  (const char *escaped_key,
                                                          int len);

Converts a string escaped with gconf_escape_key() back into its original @@ -1702,17 +1280,11 @@


-

+

gconf_engine_get_float ()

-
gdouble             gconf_engine_get_float              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
gdouble             gconf_engine_get_float              (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the floating point number (GCONF_VALUE_FLOAT) stored at key. Automatically performs type-checking, so if a non-float is @@ -1734,9 +1306,7 @@

- @@ -1751,17 +1321,11 @@
-

+

gconf_engine_get_int ()

-
gint                gconf_engine_get_int                (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
gint                gconf_engine_get_int                (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the integer (GCONF_VALUE_INT) stored at key. Automatically performs type-checking, so if a non-integer is @@ -1783,9 +1347,7 @@

- @@ -1800,17 +1362,11 @@
-

+

gconf_engine_get_string ()

-
gchar*              gconf_engine_get_string             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
gchar*              gconf_engine_get_string             (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the string (GCONF_VALUE_STRING) stored at key. Automatically performs type-checking, so if a non-string is @@ -1832,9 +1388,7 @@

- @@ -1849,17 +1403,11 @@
-

+

gconf_engine_get_bool ()

-
gboolean            gconf_engine_get_bool               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
gboolean            gconf_engine_get_bool               (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the boolean value (GCONF_VALUE_BOOL) stored at key. Automatically performs type-checking, so if a non-bool is @@ -1881,9 +1429,7 @@

- @@ -1898,15 +1444,11 @@
-

+

gconf_engine_get_schema ()

-
GConfSchema*        gconf_engine_get_schema             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         GError **err);
+
GConfSchema*        gconf_engine_get_schema             (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         GError **err);

Requests the schema (GCONF_VALUE_SCHEMA) stored at key. Automatically performs type-checking, so if a non-schema is stored at @@ -1928,9 +1470,7 @@

- @@ -1945,18 +1485,12 @@
-

+

gconf_engine_get_list ()

-
GSList*             gconf_engine_get_list               (GConfEngine *conf,
-                                                         const gchar *key,
+
GSList*             gconf_engine_get_list               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GError **err);
+ GError **err);

Requests the list (GCONF_VALUE_LIST) stored at key. Automatically performs type-checking, so if a non-list is stored at key, or the @@ -1988,34 +1522,22 @@

- - - - @@ -2028,13 +1550,9 @@

In the GCONF_VALUE_FLOAT and GCONF_VALUE_STRING cases, you must -g_free() each list element. In the GCONF_VALUE_SCHEMA case you must +g_free() each list element. In the GCONF_VALUE_SCHEMA case you must gconf_schema_free() each element. In all cases you must free the -list itself with g_slist_free(). +list itself with g_slist_free().

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

why_invalid :

return location for an explanation of the problem, if any. g_free() the returned string. +return location for an explanation of the problem, if any. g_free() the returned string.

Returns :

a newly created key, a gchar value. +a newly created key, a gchar value.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
GCONF_VALUE_INTThe integer itself, converted with GINT_TO_POINTER() +The integer itself, converted with GINT_TO_POINTER()
GCONF_VALUE_BOOLThe bool itself, converted with GINT_TO_POINTER() +The bool itself, converted with GINT_TO_POINTER()
GCONF_VALUE_FLOATA pointer to gdouble, which should be freed with g_free() +A pointer to gdouble, which should be freed with g_free()
GCONF_VALUE_STRINGA pointer to gchar, which should be freed with g_free() +A pointer to gchar, which should be freed with g_free()
@@ -2056,9 +1574,7 @@ - @@ -2073,25 +1589,15 @@
-

+

gconf_engine_get_pair ()

-
gboolean            gconf_engine_get_pair               (GConfEngine *conf,
-                                                         const gchar *key,
+
gboolean            gconf_engine_get_pair               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gpointer car_retloc,
-                                                         gpointer cdr_retloc,
-                                                         GError **err);
+ gpointer car_retloc, + gpointer cdr_retloc, + GError **err);

Requests the pair (GCONF_VALUE_PAIR) stored at key. Automatically performs type-checking, so if a non-pair is stored at key, or the @@ -2119,30 +1625,22 @@

- - - - + @@ -2152,9 +1650,7 @@

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
GCONF_VALUE_INTpointer to gint +pointer to gint
GCONF_VALUE_BOOLpointer to gboolean +pointer to gboolean
GCONF_VALUE_FLOATpointer to gdouble +pointer to gdouble
GCONF_VALUE_STRINGpointer to gchar*pointer to gchar*
GCONF_VALUE_SCHEMA

-In the GCONF_VALUE_STRING case, you must g_free() the string(s) +In the GCONF_VALUE_STRING case, you must g_free() the string(s) stored in the return location(s). In the GCONF_VALUE_SCHEMA case you must gconf_schema_free() the returned schema. If there's an error or the value is unset, car_retloc and cdr_retloc are left unchanged. @@ -2228,9 +1724,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2246,20 +1740,12 @@

-

+

gconf_engine_set_float ()

-
gboolean            gconf_engine_set_float              (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gdouble val,
-                                                         GError **err);
+
gboolean            gconf_engine_set_float              (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gdouble val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a float (GCONF_VALUE_FLOAT), gconf_engine_set_float() will fail.

@@ -2283,9 +1769,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2301,20 +1785,12 @@

-

+

gconf_engine_set_int ()

-
gboolean            gconf_engine_set_int                (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gint val,
-                                                         GError **err);
+
gboolean            gconf_engine_set_int                (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gint val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store an integer (GCONF_VALUE_INT), gconf_engine_set_int() will fail.

@@ -2338,9 +1814,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2356,20 +1830,12 @@

-

+

gconf_engine_set_string ()

-
gboolean            gconf_engine_set_string             (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *val,
-                                                         GError **err);
+
gboolean            gconf_engine_set_string             (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a string (GCONF_VALUE_STRING), gconf_engine_set_string() will fail.

@@ -2393,9 +1859,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2411,20 +1875,12 @@

-

+

gconf_engine_set_bool ()

-
gboolean            gconf_engine_set_bool               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         gboolean val,
-                                                         GError **err);
+
gboolean            gconf_engine_set_bool               (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         gboolean val,
+                                                         GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but but doesn't store a boolean (GCONF_VALUE_BOOL), gconf_engine_set_bool() will fail.

@@ -2448,9 +1904,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2466,18 +1920,12 @@

-

+

gconf_engine_set_schema ()

-
gboolean            gconf_engine_set_schema             (GConfEngine *conf,
-                                                         const gchar *key,
+
gboolean            gconf_engine_set_schema             (GConfEngine *conf,
+                                                         const gchar *key,
                                                          const GConfSchema *val,
-                                                         GError **err);
+ GError **err);

Change the value of key to val. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a schema value (GCONF_VALUE_SCHEMA), gconf_engine_set_schema() will fail.

@@ -2501,9 +1949,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2519,21 +1965,13 @@

-

+

gconf_engine_set_list ()

-
gboolean            gconf_engine_set_list               (GConfEngine *conf,
-                                                         const gchar *key,
+
gboolean            gconf_engine_set_list               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list,
-                                                         GError **err);
+ GSList *list, + GError **err);

Change the value of key to list of type list_type. Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists but doesn't store a list value @@ -2564,9 +2002,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2582,25 +2018,15 @@

-

+

gconf_engine_set_pair ()

-
gboolean            gconf_engine_set_pair               (GConfEngine *conf,
-                                                         const gchar *key,
+
gboolean            gconf_engine_set_pair               (GConfEngine *conf,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr,
-                                                         GError **err);
+ gconstpointer address_of_car, + gconstpointer address_of_cdr, + GError **err);

Change the value of key to a pair of first type car_type and second type cdr_type . Automatically creates the key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists @@ -2641,9 +2067,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2659,9 +2083,9 @@

-

+

GConfEnumStringPair

-
typedef struct {
+
typedef struct {
   gint enum_value;
   const gchar* str;
 } GConfEnumStringPair;
@@ -2672,17 +2096,11 @@
 

-

+

gconf_string_to_enum ()

-
gboolean            gconf_string_to_enum                (GConfEnumStringPair lookup_table[],
-                                                         const gchar *str,
-                                                         gint *enum_value_retloc);
+
gboolean            gconf_string_to_enum                (GConfEnumStringPair lookup_table[],
+                                                         const gchar *str,
+                                                         gint *enum_value_retloc);

It's best to store enumeration values as strings rather than integers. This is robust against changes in the enumeration, and also human-readable. @@ -2739,14 +2157,10 @@


-

+

gconf_enum_to_string ()

-
const gchar*        gconf_enum_to_string                (GConfEnumStringPair lookup_table[],
-                                                         gint enum_value);
+
const gchar*        gconf_enum_to_string                (GConfEnumStringPair lookup_table[],
+                                                         gint enum_value);

See gconf_string_to_enum() for background information on this function.

@@ -2775,12 +2189,10 @@

-

+

gconf_clear_cache ()

-
void                gconf_clear_cache                   (GConfEngine *conf,
-                                                         GError **err);
+
void                gconf_clear_cache                   (GConfEngine *conf,
+                                                         GError **err);

In case of a local GConfEngine, this function calls gconf_sources_clear_cache() to clear the cache from the source. Otherwise it obtains the configuration database using gconf_engine_get_database() @@ -2796,9 +2208,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2808,12 +2218,10 @@

-

+

gconf_synchronous_sync ()

-
void                gconf_synchronous_sync              (GConfEngine *conf,
-                                                         GError **err);
+
void                gconf_synchronous_sync              (GConfEngine *conf,
+                                                         GError **err);

In case of a local GConfEngine, this function syncs up all the gconf sources calling gconf_synchronous_sync(). Otherwise it obtains the configuration database using @@ -2829,9 +2237,7 @@

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2841,27 +2247,15 @@

-

+

gconf_engine_get_full ()

-
GConfValue*         gconf_engine_get_full               (GConfEngine *conf,
-                                                         const gchar *key,
-                                                         const gchar *locale,
-                                                         gboolean use_schema_default,
-                                                         gboolean *is_default_p,
-                                                         gboolean *is_writable_p,
-                                                         GError **err);
+
GConfValue*         gconf_engine_get_full               (GConfEngine *conf,
+                                                         const gchar *key,
+                                                         const gchar *locale,
+                                                         gboolean use_schema_default,
+                                                         gboolean *is_default_p,
+                                                         gboolean *is_writable_p,
+                                                         GError **err);

Returns the GConfValue of a key and the associated GConfEntry fields depending on the parameters passed.

@@ -2886,33 +2280,25 @@

use_schema_default :

-a gboolean value, indicating whether schema information is to be used as the default +a gboolean value, indicating whether schema information is to be used as the default value.

is_default_p :

-a gpointer if the is_default field of the GConfEntry is required, NULL +a gpointer if the is_default field of the GConfEntry is required, NULL otherwise.

is_writable_p :

-a gpointer if the is_writable field of the GConfEntry is required, NULL +a gpointer if the is_writable field of the GConfEntry is required, NULL otherwise.

err :

-the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors. @@ -2927,9 +2313,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-locale.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-locale.html @@ -21,16 +21,16 @@ GConf Reference Manual Next -Top +Top  |  - Description + Description
@@ -46,44 +46,36 @@ GConfLocaleCache* gconf_locale_cache_new (void); void gconf_locale_cache_free (GConfLocaleCache *cache); void gconf_locale_cache_expire (GConfLocaleCache *cache, - guint max_age_exclusive_in_seconds); + guint max_age_exclusive_in_seconds); GConfLocaleList; void gconf_locale_list_ref (GConfLocaleList *list); void gconf_locale_list_unref (GConfLocaleList *list); GConfLocaleList* gconf_locale_cache_get_list (GConfLocaleCache *cache, - const gchar *locale); -gchar** gconf_split_locale (const gchar *locale); + const gchar *locale); +gchar** gconf_split_locale (const gchar *locale);
-

Description

+

Description

-

Details

+

Details

-

+

GConfLocaleCache

-
typedef struct _GConfLocaleCache GConfLocaleCache;
+
typedef struct _GConfLocaleCache GConfLocaleCache;


-

+

gconf_locale_cache_new ()

-
GConfLocaleCache*   gconf_locale_cache_new              (void);
+
GConfLocaleCache*   gconf_locale_cache_new              (void);

@@ -100,9 +92,9 @@

-

+

gconf_locale_cache_free ()

-
void                gconf_locale_cache_free             (GConfLocaleCache *cache);
+
void                gconf_locale_cache_free             (GConfLocaleCache *cache);

@@ -119,12 +111,10 @@

-

+

gconf_locale_cache_expire ()

-
void                gconf_locale_cache_expire           (GConfLocaleCache *cache,
-                                                         guint max_age_exclusive_in_seconds);
+
void                gconf_locale_cache_expire           (GConfLocaleCache *cache,
+                                                         guint max_age_exclusive_in_seconds);

@@ -148,9 +138,9 @@

-

+

GConfLocaleList

-
typedef struct {
+
typedef struct {
   const gchar** list;
 } GConfLocaleList;
 
@@ -160,9 +150,9 @@

-

+

gconf_locale_list_ref ()

-
void                gconf_locale_list_ref               (GConfLocaleList *list);
+
void                gconf_locale_list_ref               (GConfLocaleList *list);

@@ -179,9 +169,9 @@

-

+

gconf_locale_list_unref ()

-
void                gconf_locale_list_unref             (GConfLocaleList *list);
+
void                gconf_locale_list_unref             (GConfLocaleList *list);

@@ -198,12 +188,10 @@

-

+

gconf_locale_cache_get_list ()

-
GConfLocaleList*    gconf_locale_cache_get_list         (GConfLocaleCache *cache,
-                                                         const gchar *locale);
+
GConfLocaleList*    gconf_locale_cache_get_list         (GConfLocaleCache *cache,
+                                                         const gchar *locale);

@@ -232,13 +220,9 @@

-

+

gconf_split_locale ()

-
gchar**             gconf_split_locale                  (const gchar *locale);
+
gchar**             gconf_split_locale                  (const gchar *locale);

@@ -262,9 +246,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/gconf-gconf-changeset.html +++ gconf-2.21.90/doc/gconf/html/gconf-gconf-changeset.html @@ -20,16 +20,16 @@ - + Description

-gconf-locale +gconf-locale

gconf-locale

GConf Reference Manual  
Top +
Top  |  - Description
- @@ -331,13 +249,11 @@
-

+

gconf_engine_reverse_change_set ()

-
GConfChangeSet*     gconf_engine_reverse_change_set     (GConfEngine *conf,
+
GConfChangeSet*     gconf_engine_reverse_change_set     (GConfEngine *conf,
                                                          GConfChangeSet *cs,
-                                                         GError **err);
+ GError **err);

Creates a change set that would reverse cs. That is, for each change in cs, save the current state of that key in the returned change set. @@ -357,9 +273,7 @@

- @@ -374,16 +288,12 @@
-

+

gconf_engine_change_set_from_currentv ()

-
GConfChangeSet*     gconf_engine_change_set_from_currentv
+
GConfChangeSet*     gconf_engine_change_set_from_currentv
                                                         (GConfEngine *conf,
-                                                         const gchar **keys,
-                                                         GError **err);
+ const gchar **keys, + GError **err);

Creates a change set that will change the keys in NULLterminated array keys to their current state. @@ -404,9 +314,7 @@

- @@ -421,16 +329,12 @@
-

+

gconf_engine_change_set_from_current ()

-
GConfChangeSet*     gconf_engine_change_set_from_current
+
GConfChangeSet*     gconf_engine_change_set_from_current
                                                         (GConfEngine *conf,
-                                                         GError **err,
-                                                         const gchar *first_key,
+                                                         GError **err,
+                                                         const gchar *first_key,
                                                          ...);

Convenient Varags version of gconf_engine_change_set_from_current(). @@ -445,9 +349,7 @@

- @@ -472,9 +374,9 @@
-

+

gconf_change_set_new ()

-
GConfChangeSet*     gconf_change_set_new                (void);
+
GConfChangeSet*     gconf_change_set_new                (void);

Creates a new, empty GConfChangeSet. The caller assumes one reference count, and must call gconf_change_set_unref() eventually. @@ -492,9 +394,9 @@


-

+

gconf_change_set_ref ()

-
void                gconf_change_set_ref                (GConfChangeSet *cs);
+
void                gconf_change_set_ref                (GConfChangeSet *cs);

Increases the reference count of a GConfChangeSet by one.

@@ -511,9 +413,9 @@

-

+

gconf_change_set_unref ()

-
void                gconf_change_set_unref              (GConfChangeSet *cs);
+
void                gconf_change_set_unref              (GConfChangeSet *cs);

Decreases the reference count of a GConfChangeSet by one. If the reference count reaches 0, destroys the GConfChangeSet. @@ -531,9 +433,9 @@


-

+

gconf_change_set_clear ()

-
void                gconf_change_set_clear              (GConfChangeSet *cs);
+
void                gconf_change_set_clear              (GConfChangeSet *cs);

Clears all changes from a GConfChangeSet, so that committing the change set would have no effect. @@ -551,15 +453,11 @@


-

+

gconf_change_set_size ()

-
guint               gconf_change_set_size               (GConfChangeSet *cs);
-

-Returns the size of the changeset, a guint value. +

guint               gconf_change_set_size               (GConfChangeSet *cs);
+

+Returns the size of the changeset, a guint value.

-GConfChangeSet +GConfChangeSet

GConfChangeSet — a set of configuration changes to be made.

@@ -44,149 +44,79 @@ GConfChangeSet; void (*GConfChangeSetForeachFunc) (GConfChangeSet *cs, - const gchar *key, + const gchar *key, GConfValue *value, - gpointer user_data); -gboolean gconf_engine_commit_change_set (GConfEngine *conf, + gpointer user_data); +gboolean gconf_engine_commit_change_set (GConfEngine *conf, GConfChangeSet *cs, - gboolean remove_committed, - GError **err); + gboolean remove_committed, + GError **err); GConfChangeSet* gconf_engine_reverse_change_set (GConfEngine *conf, GConfChangeSet *cs, - GError **err); + GError **err); GConfChangeSet* gconf_engine_change_set_from_currentv (GConfEngine *conf, - const gchar **keys, - GError **err); + const gchar **keys, + GError **err); GConfChangeSet* gconf_engine_change_set_from_current (GConfEngine *conf, - GError **err, - const gchar *first_key, + GError **err, + const gchar *first_key, ...); GConfChangeSet* gconf_change_set_new (void); void gconf_change_set_ref (GConfChangeSet *cs); void gconf_change_set_unref (GConfChangeSet *cs); void gconf_change_set_clear (GConfChangeSet *cs); -guint gconf_change_set_size (GConfChangeSet *cs); +guint gconf_change_set_size (GConfChangeSet *cs); void gconf_change_set_remove (GConfChangeSet *cs, - const gchar *key); + const gchar *key); void gconf_change_set_foreach (GConfChangeSet *cs, GConfChangeSetForeachFunc func, - gpointer user_data); -gboolean gconf_change_set_check_value (GConfChangeSet *cs, - const gchar *key, + gpointer user_data); +gboolean gconf_change_set_check_value (GConfChangeSet *cs, + const gchar *key, GConfValue **value_retloc); void gconf_change_set_set (GConfChangeSet *cs, - const gchar *key, + const gchar *key, GConfValue *value); void gconf_change_set_set_nocopy (GConfChangeSet *cs, - const gchar *key, + const gchar *key, GConfValue *value); void gconf_change_set_unset (GConfChangeSet *cs, - const gchar *key); + const gchar *key); void gconf_change_set_set_float (GConfChangeSet *cs, - const gchar *key, - gdouble val); + const gchar *key, + gdouble val); void gconf_change_set_set_int (GConfChangeSet *cs, - const gchar *key, - gint val); + const gchar *key, + gint val); void gconf_change_set_set_string (GConfChangeSet *cs, - const gchar *key, - const gchar *val); + const gchar *key, + const gchar *val); void gconf_change_set_set_bool (GConfChangeSet *cs, - const gchar *key, - gboolean val); + const gchar *key, + gboolean val); void gconf_change_set_set_schema (GConfChangeSet *cs, - const gchar *key, + const gchar *key, GConfSchema *val); void gconf_change_set_set_list (GConfChangeSet *cs, - const gchar *key, + const gchar *key, GConfValueType list_type, - GSList *list); + GSList *list); void gconf_change_set_set_pair (GConfChangeSet *cs, - const gchar *key, + const gchar *key, GConfValueType car_type, GConfValueType cdr_type, - gconstpointer address_of_car, - gconstpointer address_of_cdr); + gconstpointer address_of_car, + gconstpointer address_of_cdr); void gconf_change_set_set_user_data (GConfChangeSet *cs, - gpointer data, - GDestroyNotify dnotify); -gpointer gconf_change_set_get_user_data (GConfChangeSet *cs); + gpointer data, + GDestroyNotify dnotify); +gpointer gconf_change_set_get_user_data (GConfChangeSet *cs);
-

Description

+

Description

a GConfChangeSet allows you to collect a set of changes to configuration keys (set/unset operations). You can then commit @@ -207,11 +137,11 @@

-

Details

+

Details

-

+

GConfChangeSet

-
typedef struct _GConfChangeSet GConfChangeSet;
+
typedef struct _GConfChangeSet GConfChangeSet;

An opaque data type representing a set of changes to be made. A change set can contain "set" and "unset" operations. @@ -219,16 +149,12 @@


-

+

GConfChangeSetForeachFunc ()

-
void                (*GConfChangeSetForeachFunc)        (GConfChangeSet *cs,
-                                                         const gchar *key,
+
void                (*GConfChangeSetForeachFunc)        (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfValue *value,
-                                                         gpointer user_data);
+ gpointer user_data);

The type of a function passed to gconf_change_set_foreach(). The cs argument is the GConfChangeSet you're iterating over. key is @@ -266,18 +192,12 @@


-

+

gconf_engine_commit_change_set ()

-
gboolean            gconf_engine_commit_change_set      (GConfEngine *conf,
+
gboolean            gconf_engine_commit_change_set      (GConfEngine *conf,
                                                          GConfChangeSet *cs,
-                                                         gboolean remove_committed,
-                                                         GError **err);
+ gboolean remove_committed, + GError **err);

Applies the changes in the change set to the GConfEngine passed as the first argument. If remove_committed is TRUE, @@ -313,9 +233,7 @@

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.

err :

the return location for an allocated GError, or NULL to ignore errors. +the return location for an allocated GError, or NULL to ignore errors.
@@ -571,9 +469,7 @@ - @@ -583,12 +479,10 @@
-

+

gconf_change_set_remove ()

-
void                gconf_change_set_remove             (GConfChangeSet *cs,
-                                                         const gchar *key);
+
void                gconf_change_set_remove             (GConfChangeSet *cs,
+                                                         const gchar *key);

Removes a change from a GConfChangeSet. The key given as the key argument will not be modified if this change set is committed. @@ -614,13 +508,11 @@


-

+

gconf_change_set_foreach ()

-
void                gconf_change_set_foreach            (GConfChangeSet *cs,
+
void                gconf_change_set_foreach            (GConfChangeSet *cs,
                                                          GConfChangeSetForeachFunc func,
-                                                         gpointer user_data);
+ gpointer user_data);

Iterates over a GConfChangeSet by calling a GConfChangeSetForeachFunc for each change in the set. See the @@ -653,14 +545,10 @@


-

+

gconf_change_set_check_value ()

-
gboolean            gconf_change_set_check_value        (GConfChangeSet *cs,
-                                                         const gchar *key,
+
gboolean            gconf_change_set_check_value        (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfValue **value_retloc);

Looks up the hash table associated with the GConfChangeSet for the key key. If the key @@ -697,12 +585,10 @@


-

+

gconf_change_set_set ()

-
void                gconf_change_set_set                (GConfChangeSet *cs,
-                                                         const gchar *key,
+
void                gconf_change_set_set                (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfValue *value);

Adds a "set" operation to a change set. This function is similar to @@ -734,12 +620,10 @@


-

+

gconf_change_set_set_nocopy ()

-
void                gconf_change_set_set_nocopy         (GConfChangeSet *cs,
-                                                         const gchar *key,
+
void                gconf_change_set_set_nocopy         (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfValue *value);

Like gconf_change_set_set(), except that the GConfChangeSet takes @@ -772,12 +656,10 @@


-

+

gconf_change_set_unset ()

-
void                gconf_change_set_unset              (GConfChangeSet *cs,
-                                                         const gchar *key);
+
void                gconf_change_set_unset              (GConfChangeSet *cs,
+                                                         const gchar *key);

Adds an "unset" operation to a GConfChangeSet. This function schedules a gconf_engine_unset(). @@ -802,19 +684,13 @@


-

+

gconf_change_set_set_float ()

-
void                gconf_change_set_set_float          (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gdouble val);
-

-Adds a "set" operation; takes a gdouble argument, so you can avoid +

void                gconf_change_set_set_float          (GConfChangeSet *cs,
+                                                         const gchar *key,
+                                                         gdouble val);
+

+Adds a "set" operation; takes a gdouble argument, so you can avoid creating a GConfValue.

Returns :

the size, a guint value. +the size, a guint value.
@@ -842,19 +718,13 @@
-

+

gconf_change_set_set_int ()

-
void                gconf_change_set_set_int            (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gint val);
-

-Adds a "set" operation; takes a gint argument, so you can avoid +

void                gconf_change_set_set_int            (GConfChangeSet *cs,
+                                                         const gchar *key,
+                                                         gint val);
+

+Adds a "set" operation; takes a gint argument, so you can avoid creating a GConfValue.

@@ -882,19 +752,13 @@
-

+

gconf_change_set_set_string ()

-
void                gconf_change_set_set_string         (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         const gchar *val);
-

-Adds a "set" operation; takes a gchar* argument, so you can avoid +

void                gconf_change_set_set_string         (GConfChangeSet *cs,
+                                                         const gchar *key,
+                                                         const gchar *val);
+

+Adds a "set" operation; takes a gchar* argument, so you can avoid creating a GConfValue.

@@ -922,19 +786,13 @@
-

+

gconf_change_set_set_bool ()

-
void                gconf_change_set_set_bool           (GConfChangeSet *cs,
-                                                         const gchar *key,
-                                                         gboolean val);
-

-Adds a "set" operation; takes a gboolean argument, so you can avoid +

void                gconf_change_set_set_bool           (GConfChangeSet *cs,
+                                                         const gchar *key,
+                                                         gboolean val);
+

+Adds a "set" operation; takes a gboolean argument, so you can avoid creating a GConfValue.

@@ -962,12 +820,10 @@
-

+

gconf_change_set_set_schema ()

-
void                gconf_change_set_set_schema         (GConfChangeSet *cs,
-                                                         const gchar *key,
+
void                gconf_change_set_set_schema         (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfSchema *val);

Adds a "set" operation; takes a GConfSchema argument, so you can @@ -999,20 +855,14 @@


-

+

gconf_change_set_set_list ()

-
void                gconf_change_set_set_list           (GConfChangeSet *cs,
-                                                         const gchar *key,
+
void                gconf_change_set_set_list           (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfValueType list_type,
-                                                         GSList *list);
-

-Adds a "set" operation; takes a GList argument and the type of the + GSList *list);

+

+Adds a "set" operation; takes a GList argument and the type of the list, so you can avoid creating a GConfValue. This results in the list of values being set for the key.

@@ -1036,9 +886,7 @@
- @@ -1048,20 +896,14 @@
-

+

gconf_change_set_set_pair ()

-
void                gconf_change_set_set_pair           (GConfChangeSet *cs,
-                                                         const gchar *key,
+
void                gconf_change_set_set_pair           (GConfChangeSet *cs,
+                                                         const gchar *key,
                                                          GConfValueType car_type,
                                                          GConfValueType cdr_type,
-                                                         gconstpointer address_of_car,
-                                                         gconstpointer address_of_cdr);
+ gconstpointer address_of_car, + gconstpointer address_of_cdr);

Adds a "set" operation; takes a pointer to the addresses of the pair of values, so you can avoid creating a GConfValue. This results in @@ -1107,15 +949,11 @@


-

+

gconf_change_set_set_user_data ()

-
void                gconf_change_set_set_user_data      (GConfChangeSet *cs,
-                                                         gpointer data,
-                                                         GDestroyNotify dnotify);
+
void                gconf_change_set_set_user_data      (GConfChangeSet *cs,
+                                                         gpointer data,
+                                                         GDestroyNotify dnotify);

Sets the user_data and the destroy notification function fields of the GConfChangeSet. @@ -1130,9 +968,7 @@

- @@ -1147,11 +983,9 @@
-

+

gconf_change_set_get_user_data ()

-
gpointer            gconf_change_set_get_user_data      (GConfChangeSet *cs);
+
gpointer            gconf_change_set_get_user_data      (GConfChangeSet *cs);

Returns the user_data field of the GConfChangeSet.

@@ -1175,9 +1009,9 @@
-
+

-
+
--- gconf-2.21.90.orig/doc/gconf/html/ch01.html +++ gconf-2.21.90/doc/gconf/html/ch01.html @@ -22,7 +22,7 @@

list :

a GList containing the values to be set. +a GList containing the values to be set.

data :

a gpointer. +a gpointer.

-Using the GConf library

+Using the GConf library
GConfClient — --- gconf-2.21.90.orig/doc/gconf/html/gconf.devhelp +++ gconf-2.21.90/doc/gconf/html/gconf.devhelp @@ -67,8 +67,8 @@ - - + + @@ -78,8 +78,8 @@ - - + + @@ -90,15 +90,15 @@ - - + + - - + + @@ -127,8 +127,8 @@ - - + + @@ -140,8 +140,8 @@ - - + + @@ -165,8 +165,8 @@ - - + + @@ -186,8 +186,8 @@ - - + + @@ -245,8 +245,8 @@ - - + + @@ -294,8 +294,8 @@ - - + + @@ -305,8 +305,8 @@ - - + + @@ -333,7 +333,7 @@ - - + + --- gconf-2.21.90.orig/doc/gconf/html/gconf.devhelp2 +++ gconf-2.21.90/doc/gconf/html/gconf.devhelp2 @@ -67,8 +67,8 @@ - - + + @@ -78,8 +78,8 @@ - - + + @@ -90,15 +90,15 @@ - - + + - - + + @@ -127,8 +127,8 @@ - - + + @@ -140,8 +140,8 @@ - - + + @@ -165,8 +165,8 @@ - - + + @@ -186,8 +186,8 @@ - - + + @@ -245,8 +245,8 @@ - - + + @@ -294,8 +294,8 @@ - - + + @@ -305,8 +305,8 @@ - - + + @@ -333,7 +333,7 @@ - - + + --- gconf-2.21.90.orig/debian/patches/02_ldap_deprecated.patch +++ gconf-2.21.90/debian/patches/02_ldap_deprecated.patch @@ -0,0 +1,67 @@ +--- backends/evoldap-backend.c.orig 2008-02-16 18:08:41.075271428 +0100 ++++ backends/evoldap-backend.c 2008-02-16 18:36:12.863272803 +0100 +@@ -258,14 +258,14 @@ + attr = ldap_first_attribute (connection, entry, &berptr); + while (attr != NULL && retval == NULL) + { +- char **values; ++ struct berval **values; + + if (strcmp (attr, varname) == 0) + { +- values = ldap_get_values (connection, entry, attr); +- if (values != NULL) +- retval = g_strdup (values[0]); +- ldap_value_free (values); ++ values = ldap_get_values_len (connection, entry, attr); ++ if (values != NULL && values[0] != NULL) ++ retval = g_strdup (values[0]->bv_val); ++ ldap_value_free_len (values); + } + + attr = ldap_next_attribute (connection, entry, berptr); +@@ -562,6 +562,7 @@ + GError **err) + { + LDAP *connection; ++ char *url; + + g_assert (esource->conf_file_parsed); + +@@ -578,13 +579,15 @@ + _("Contacting LDAP server: host '%s', port '%d', base DN '%s'"), + esource->ldap_host, esource->ldap_port, esource->base_dn); + +- if ((connection = ldap_init (esource->ldap_host, esource->ldap_port)) == NULL) ++ url = g_strdup_printf ("ldap://%s:%i", esource->ldap_host, esource->ldap_port); ++ if (ldap_initialize (&connection, url) != LDAP_SUCCESS) + { + gconf_log (GCL_ERR, + _("Failed to contact LDAP server: %s"), + g_strerror (errno)); + return NULL; + } ++ g_free (url); + + esource->connection = connection; + +@@ -672,12 +675,13 @@ + esource->filter_str); + + entries = NULL; +- ret = ldap_search_s (connection, +- esource->base_dn, +- LDAP_SCOPE_ONELEVEL, +- esource->filter_str, +- NULL, 0, +- &entries); ++ ret = ldap_search_ext_s (connection, ++ esource->base_dn, ++ LDAP_SCOPE_ONELEVEL, ++ esource->filter_str, ++ NULL, 0, ++ NULL, NULL, NULL, 0, ++ &entries); + if (ret != LDAP_SUCCESS) + { + gconf_log (GCL_ERR, --- gconf-2.21.90.orig/debian/patches/25_gconf-path-max-hurd.patch +++ gconf-2.21.90/debian/patches/25_gconf-path-max-hurd.patch @@ -0,0 +1,30 @@ +diff -Naur GConf-2.6.4.orig/backends/markup-tree.c GConf-2.6.4/backends/markup-tree.c +--- GConf-2.8.1.orig/backends/markup-tree.c 2004-09-29 14:09:44.000000000 +0200 ++++ GConf-2.8.1/backends/markup-tree.c 2004-09-29 14:14:01.000000000 +0200 +@@ -33,6 +33,11 @@ + #include + #include + ++/* PATH_MAX is not defined in limits.h on some platforms */ ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + typedef struct + { + char *locale; +diff -Naur GConf-2.6.4.orig/backends/xml-dir.c GConf-2.6.4/backends/xml-dir.c +--- GConf-2.8.1.orig/backends/xml-dir.c 2004-09-29 14:09:44.000000000 +0200 ++++ GConf-2.8.1/backends/xml-dir.c 2004-09-29 14:11:59.000000000 +0200 +@@ -37,6 +37,11 @@ + #include + #include "xml-entry.h" + ++/* PATH_MAX is not defined in limits.h on some platforms */ ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + /* This makes hash table safer when debugging */ + #ifndef GCONF_ENABLE_DEBUG + #define safe_g_hash_table_insert g_hash_table_insert --- gconf-2.21.90.orig/debian/patches/01_no_syslog_thanks.patch +++ gconf-2.21.90/debian/patches/01_no_syslog_thanks.patch @@ -0,0 +1,273 @@ +diff -Nur -x '*.orig' -x '*~' gconf-2.21.1/gconf/gconfd.c gconf-2.21.1.new/gconf/gconfd.c +--- gconf-2.21.1/gconf/gconfd.c 2008-01-08 15:27:41.000000000 +0100 ++++ gconf-2.21.1.new/gconf/gconfd.c 2008-01-14 12:06:23.000000000 +0100 +@@ -49,9 +49,6 @@ + #include + #include + #include +-#ifdef HAVE_SYSLOG_H +-#include +-#endif + #include + #ifdef HAVE_SYS_WAIT_H + #include +@@ -500,41 +497,6 @@ + return the_poa; + } + +-static void +-log_handler (const gchar *log_domain, +- GLogLevelFlags log_level, +- const gchar *message, +- gpointer user_data) +-{ +- GConfLogPriority pri = GCL_WARNING; +- +- switch (log_level & G_LOG_LEVEL_MASK) +- { +- case G_LOG_LEVEL_ERROR: +- case G_LOG_LEVEL_CRITICAL: +- pri = GCL_ERR; +- break; +- +- case G_LOG_LEVEL_WARNING: +- pri = GCL_WARNING; +- break; +- +- case G_LOG_LEVEL_MESSAGE: +- case G_LOG_LEVEL_INFO: +- pri = GCL_INFO; +- break; +- +- case G_LOG_LEVEL_DEBUG: +- pri = GCL_DEBUG; +- break; +- +- default: +- break; +- } +- +- gconf_log (pri, "%s", message); +-} +- + /* From ORBit2 */ + /* There is a DOS attack if another user creates + * the given directory and keeps us from creating +@@ -597,8 +559,6 @@ + #endif + CORBA_Environment ev; + CORBA_ORB orb; +- gchar* logname; +- const gchar* username; + gchar* ior; + int exit_code = 0; + GError *err; +@@ -646,27 +606,7 @@ + + gconf_set_daemon_mode(TRUE); + +- /* Logs */ +- username = g_get_user_name(); +- logname = g_strdup_printf("gconfd (%s-%u)", username, (guint)getpid()); +- +-#ifdef HAVE_SYSLOG_H +- openlog (logname, LOG_NDELAY, LOG_USER); +-#endif +- +- g_log_set_handler (NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, +- log_handler, NULL); +- +- g_log_set_handler ("GLib", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, +- log_handler, NULL); +- +- g_log_set_handler ("GLib-GObject", G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, +- log_handler, NULL); +- +- /* openlog() does not copy logname - what total brokenness. +- So we free it at the end of main() */ +- +- gconf_log (GCL_INFO, _("starting (version %s), pid %u user '%s'"), ++ gconf_log (GCL_DEBUG, _("starting (version %s), pid %u user '%s'"), + VERSION, (guint)getpid(), g_get_user_name()); + + #ifdef GCONF_ENABLE_DEBUG +@@ -831,14 +771,7 @@ + + daemon_lock = NULL; + +- gconf_log (GCL_INFO, _("Exiting")); +- +-#ifdef HAVE_SYSLOG_H +- closelog (); +-#endif +- +- /* Can't do this due to stupid atexit() handler that calls g_log stuff */ +- /* g_free (logname); */ ++ gconf_log (GCL_DEBUG, _("Exiting")); + + return exit_code; + } +diff -Nur -x '*.orig' -x '*~' gconf-2.21.1/gconf/gconf-internals.c gconf-2.21.1.new/gconf/gconf-internals.c +--- gconf-2.21.1/gconf/gconf-internals.c 2008-01-08 15:28:59.000000000 +0100 ++++ gconf-2.21.1.new/gconf/gconf-internals.c 2008-01-14 12:06:23.000000000 +0100 +@@ -1096,105 +1096,46 @@ + * Log + */ + +-#ifdef HAVE_SYSLOG_H +-#include +-#endif +- + void + gconf_log(GConfLogPriority pri, const gchar* fmt, ...) + { +- gchar* msg; + va_list args; +-#ifdef HAVE_SYSLOG_H +- gchar* convmsg; +- int syslog_pri = LOG_DEBUG; +-#endif ++ GLogLevelFlags loglevel; + + if (!gconf_log_debug_messages && + pri == GCL_DEBUG) + return; +- +- va_start (args, fmt); +- msg = g_strdup_vprintf(fmt, args); +- va_end (args); + +-#ifdef HAVE_SYSLOG_H +- if (gconf_daemon_mode) ++ switch (pri) + { +- switch (pri) +- { +- case GCL_EMERG: +- syslog_pri = LOG_EMERG; +- break; +- +- case GCL_ALERT: +- syslog_pri = LOG_ALERT; +- break; +- +- case GCL_CRIT: +- syslog_pri = LOG_CRIT; +- break; +- +- case GCL_ERR: +- syslog_pri = LOG_ERR; +- break; +- +- case GCL_WARNING: +- syslog_pri = LOG_WARNING; +- break; +- +- case GCL_NOTICE: +- syslog_pri = LOG_NOTICE; +- break; +- +- case GCL_INFO: +- syslog_pri = LOG_INFO; +- break; +- +- case GCL_DEBUG: +- syslog_pri = LOG_DEBUG; +- break; +- +- default: +- g_assert_not_reached(); +- break; +- } +- +- convmsg = g_locale_from_utf8 (msg, -1, NULL, NULL, NULL); +- if (!convmsg) +- syslog (syslog_pri, "%s", msg); +- else +- { +- syslog (syslog_pri, "%s", convmsg); +- g_free (convmsg); +- } ++ case GCL_EMERG: ++ case GCL_ALERT: ++ case GCL_CRIT: ++ loglevel = G_LOG_LEVEL_ERROR; ++ break; ++ case GCL_ERR: ++ loglevel = G_LOG_LEVEL_CRITICAL; ++ break; ++ case GCL_WARNING: ++ loglevel = G_LOG_LEVEL_WARNING; ++ break; ++ case GCL_NOTICE: ++ loglevel = G_LOG_LEVEL_MESSAGE; ++ break; ++ case GCL_INFO: ++ loglevel = G_LOG_LEVEL_INFO; ++ break; ++ case GCL_DEBUG: ++ loglevel = G_LOG_LEVEL_DEBUG; ++ break; ++ default: ++ g_assert_not_reached(); ++ break; + } +- else +-#endif +- { +- switch (pri) +- { +- case GCL_EMERG: +- case GCL_ALERT: +- case GCL_CRIT: +- case GCL_ERR: +- case GCL_WARNING: +- g_printerr ("%s\n", msg); +- break; +- +- case GCL_NOTICE: +- case GCL_INFO: +- case GCL_DEBUG: +- g_print ("%s\n", msg); +- break; + +- default: +- g_assert_not_reached(); +- break; +- } +- } +- +- g_free(msg); ++ va_start (args, fmt); ++ g_logv (G_LOG_DOMAIN, loglevel, fmt, args); ++ va_end (args); + } + + /* +diff -Nur -x '*.orig' -x '*~' gconf-2.21.1/gconf/gconf-sources.c gconf-2.21.1.new/gconf/gconf-sources.c +--- gconf-2.21.1/gconf/gconf-sources.c 2008-01-08 15:29:55.000000000 +0100 ++++ gconf-2.21.1.new/gconf/gconf-sources.c 2008-01-14 12:06:52.000000000 +0100 +@@ -407,20 +407,20 @@ + if (source->flags & GCONF_SOURCE_ALL_WRITEABLE) + { + some_writable = TRUE; +- gconf_log (GCL_INFO, ++ gconf_log (GCL_DEBUG, + _("Resolved address \"%s\" to a writable configuration source at position %d"), + source->address, i); + } + else if (source->flags & GCONF_SOURCE_NEVER_WRITEABLE) + { +- gconf_log (GCL_INFO, ++ gconf_log (GCL_DEBUG, + _("Resolved address \"%s\" to a read-only configuration source at position %d"), + source->address, i); + } + else + { + some_writable = TRUE; +- gconf_log (GCL_INFO, ++ gconf_log (GCL_DEBUG, + _("Resolved address \"%s\" to a partially writable configuration source at position %d"), + source->address, i); + } --- gconf-2.21.90.orig/debian/watch +++ gconf-2.21.90/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/GConf/([\d\.]+)[02468]/GConf-([\d\.]+)\.tar\.gz --- gconf-2.21.90.orig/debian/libgconf2-dev.install +++ gconf-2.21.90/debian/libgconf2-dev.install @@ -0,0 +1,7 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/*.so +debian/tmp/usr/lib/*.a +debian/tmp/usr/lib/*.la +debian/tmp/usr/share/aclocal +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/share/gtk-doc/html/gconf/* usr/share/doc/gconf2/html/ --- gconf-2.21.90.orig/debian/gconf2.manpages +++ gconf-2.21.90/debian/gconf2.manpages @@ -0,0 +1 @@ +debian/update-gconf-defaults.8 --- gconf-2.21.90.orig/debian/changelog +++ gconf-2.21.90/debian/changelog @@ -0,0 +1,1065 @@ +gconf (2.21.90-0ubuntu2) hardy; urgency=low + + * 02_ldap_deprecated.patch: new patch to replace deprecated LDAP + functions by currently working ones; thanks to Josselin Mouette + . + + -- Steve Langasek Mon, 18 Feb 2008 08:23:03 +0000 + +gconf (2.21.90-0ubuntu1) hardy; urgency=low + + * New upstream development release; no API change. + - Upstream NEWS: + . Don't use deprecated functions + - Drop spurious changes from the .diff.gz. + + -- Loic Minier Mon, 28 Jan 2008 17:59:03 +0100 + +gconf (2.21.2-0ubuntu2) hardy; urgency=low + + * No-change rebuild against libldap-2.4-2. + + -- Steve Langasek Tue, 22 Jan 2008 17:35:39 +0000 + +gconf (2.21.2-0ubuntu1) hardy; urgency=low + + * New upstream version: + Misc + - Build fixes. (LP: #184607) + - Various cleanups + + -- Sebastien Bacher Mon, 21 Jan 2008 19:19:54 +0000 + +gconf (2.21.1-0ubuntu1) hardy; urgency=low + + * New upstream version: + Misc + - Lots of string fixes + - Documentation fixes + * debian/control.in: + - updated maintainer information + * debian/patches/01_no_syslog_thanks.patch: + - new version update + + -- Sebastien Bacher Mon, 14 Jan 2008 12:02:38 +0100 + +gconf (2.20.1-1) unstable; urgency=low + + * Add a "--register-all" option to gconf-schemas, to rebuild the GConf + defaults database from scratch. + * New upstream translation and minor bugfix release. + * Rename the source package to gconf, to remove the (finally unused!) + GConf 1 stuff. + * gconf2.postinst: + + Run gconf-schemas --register-all on the first installation. This + allows installing packages shipping gconf schemas but not + depending on gconf2. + + Also run update-gconf-defaults. + * gconf2.postrm: remove the directory contents in /var/lib/gconf/*/ to + enforce a correct behavior in the postinst. + + -- Josselin Mouette Thu, 01 Nov 2007 18:47:26 +0100 + +gconf2 (2.20.0-1) unstable; urgency=low + + [ Sebastien Bacher ] + * debian/gconf2.postinst, debian/gconf2.prerm: + - don't remove the alternative on upgrade + + [ Josselin Mouette ] + * debian/gconf2.postinst: check the version we upgrade from before + not installing the alternative. + + [ Sebastian Dröge ] + * New upstream release, with no API/ABI changes. + * Upload to unstable, drop check-dist include. + + -- Sebastian Dröge Fri, 21 Sep 2007 09:30:39 +0200 + +gconf2 (2.19.1-1) experimental; urgency=low + + [ Josselin Mouette ] + * gconf2-common.preinst: removed, it has been in the stable release. + + [ Loic Minier ] + * New upstream development release; no API change. + - Target at experimenta; include check-dist. + - Add -z defs to LDFLAGS; build failure with this flag were fixed + upstream. + * Wrap build-deps and deps. + * Cleanups. + + -- Loic Minier Sat, 23 Jun 2007 22:08:06 +0200 + +gconf2 (2.18.0.1-3) unstable; urgency=low + + * Upload to unstable; drop check-dist include. + * Include pointer to /usr/share/common-licenses/LGPL and fix URL in + copyright. + + -- Loic Minier Wed, 11 Apr 2007 15:46:08 +0200 + +gconf2 (2.18.0.1-2) experimental; urgency=low + + * 01_no_syslog_thanks.patch: stop the syslog madness (closes: #188433) + + Use a DEBUG loglevel for things that really are debugging + information (thanks David Förster). + + Remove all syslog calls and g_log custom handlers. + + Log everything through GLib. This should end in .xsession-errors + anyway. + + -- Josselin Mouette Fri, 30 Mar 2007 00:40:42 +0200 + +gconf2 (2.18.0.1-1) experimental; urgency=low + + * Build-depend on python-support (>= 0.5.3) and call dh_pysupport to + generate python:Depends instead of dh_python. + * Build-depend on autotools-dev to permit CDBS to update config.guess and + .sub. + * Set LDFLAGS instead of overriding them via DEB_CONFIGURE_SCRIPT_ENV; + build-depend on cdbs (>= 0.4.41). + * Do not override DEB_INSTALL_DOCS_gconf2, DEB_CONFIGURE_EXTRA_FLAGS, + DEB_DH_MAKESHLIBS_ARGS_libgconf2-4, DEB_DH_SHLIBDEPS_ARGS. + * Drop local clean target which attempted to work around upstream make clean + issues, but there are many many more clean issues upstream unfortunately. + * New upstream release. + - Drop patch 30_broken-g-stat, merged upstream. + * Bump up Debhelper compatibility level to 5. + + -- Loic Minier Tue, 6 Mar 2007 12:50:29 +0100 + +gconf2 (2.18.0-2) experimental; urgency=low + + * New patch, 30_broken-g-stat, only restore file permissions on the new file + if we can retrieve the file stats of the old files; fixes gconftool not + generating %gconf-tree.xml when missing. + + -- Loic Minier Mon, 5 Mar 2007 15:16:57 +0100 + +gconf2 (2.18.0-1) experimental; urgency=low + + * New upstream stable release; bug fixes and cleanups. + - Target at experimental for now. + - Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + + -- Loic Minier Sun, 4 Mar 2007 22:19:21 +0100 + +gconf2 (2.16.1-1) unstable; urgency=medium + + * Add a get-orig-source target to retrieve the upstream tarball. + * New upstream stable release; bug fixes and translations. + + -- Loic Minier Mon, 26 Feb 2007 20:40:25 +0100 + +gconf2 (2.16.0-3) unstable; urgency=low + + [ Josselin Mouette ] + * rules: call clean-la.mk. + * Build-depend on gnome-pkg-tools 0.7. + + [ Loic Minier ] + * Fix gconf-schemas to not die with an OSError when gconfd processes die + before being killed or can not be killed, for example when they belong to + a different user. + + -- Loic Minier Fri, 24 Nov 2006 14:26:38 +0100 + +gconf2 (2.16.0-2) unstable; urgency=low + + * Merge the final 2.14.0-5. + * Add CDBS' utils. + * Upload to unstable. + * Ship sample /etc/gconf/2/evoldap.conf as a conffile as we're unlikely to + tweak it a lot for Debian. + * Ship the evoldap LDAP schema in /usr/share/doc/gconf2-common. + * Drop debian/gconftool-2.1; merged upstream. + * Add upstream programming examples to libgconf2-dev. + * Ship upstream doc/FAQ.txt and drop our local debian/FAQ. + + -- Loic Minier Thu, 19 Oct 2006 09:01:48 +0200 + +gconf2 (2.16.0-1) experimental; urgency=low + + * New upstream release; no API change. + - Drop patch 20_gconftool-2-manpage-typo, merged upstream. + - Build-depend on libxml-parser-perl. + + -- Loic Minier Thu, 5 Oct 2006 15:50:05 +0200 + +gconf2 (2.14.0-5) unstable; urgency=medium + + [ Josselin Mouette ] + * Require gnome-pkg-tools 0.6. + * Use ${gnome:Version} and ${gnome:NextVersion}. + * Include the gnome-versions.mk snippet. + + [ Loic Minier ] + * Include the mandatory and default paths for desktop-profiles + ($(ENV_MANDATORY_PATH) and $(ENV_DEFAULTS_PATH)); closes: #310065. + * Build-depend on gtk-doc-tools for the devhelp file. + * Build-depend on and libldap2-dev for the evoldap backend. + + -- Loic Minier Tue, 10 Oct 2006 15:51:06 +0200 + +gconf2 (2.14.0-4) unstable; urgency=medium + + * Let update-gconf-defaults ignore .dpkg-tmp files in + /usr/share/gconf/defaults, as it breaks upgrades of packages with .entries + files. + + -- Loic Minier Tue, 8 Aug 2006 12:36:41 +0200 + +gconf2 (2.14.0-3) unstable; urgency=low + + * update-gconf-defaults: better error handling. + + When it isn't run as root. + + When /usr/share/gconf/defaults is empty (closes: #381734). + + -- Josselin Mouette Sun, 6 Aug 2006 23:09:41 +0200 + +gconf2 (2.14.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version}. + * Rework update-gconf-defaults to accept .entries files in + /usr/share/gconf/defaults. + * Standards version is 3.7.2. + + [ Loic Minier ] + * Fix {$source:Version} versus ${source:Version}. + * Use ${binary:Version} instead of ${Source-Version} to make package fully + binNMU-safe + * New patch, 20_gconftool-2-manpage-typo, to add missing newline in man + page, thanks Remi Vanicat. + (Closes: #372695) + * Rename gconf_path_max patch to 25_gconf-path-max-hurd. + * Fix watch file. + + -- Josselin Mouette Wed, 2 Aug 2006 23:40:47 +0200 + +gconf2 (2.14.0-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + * debian/patches/gconftool_speed.diff: + - dropped; similar change applied upstream. + + J.H.M. Dassen (Ray): + * [debian/control.in] Made glib build dependency explicit and versioned it + following configure.in . + + [ Sjoerd Simons ] + * Updated watch file + + -- Sjoerd Simons Mon, 20 Mar 2006 11:54:58 +0100 + +gconf2 (2.13.5-1) experimental; urgency=low + + * New upstream release. + * 60gconf2_merge-tree: give up on merging the user's home directory by + default, as it can break with NFS servers, including the ones in + Debian. + + gconf2-common.{install,preinst}: remove the file. + + Stop recommending zenity. + + Document that in the README.Debian. + * rules: update shlibs. + + -- Josselin Mouette Sun, 5 Mar 2006 19:15:47 +0100 + +gconf2 (2.12.1-12) unstable; urgency=low + + * gconftool_speed.diff: don't sync after every schema file when using + --makefile-[un]install-rule. This should solve the speed issue. + * gconf-schemas: remove the hack to merge the schemas in a single + file, it should be unnecessary now. + + -- Josselin Mouette Fri, 3 Mar 2006 14:53:31 +0100 + +gconf2 (2.12.1-11) unstable; urgency=low + + * debian/gconf-schemas: + - patch by Gabor Burjan slightly modified, fix the case + where there is no gconfd-2 running + + -- Sebastien Bacher Thu, 2 Mar 2006 17:41:03 +0100 + +gconf2 (2.12.1-10) unstable; urgency=low + + [ Josselin Mouette ] + + * gconf-schemas: + + Complete rewrite, in python. + + Now run gconftool only once, for better performance (closes: #353986). + + Improve performance even further by merging files when there are + several ones. + + -- Sebastien Bacher Thu, 2 Mar 2006 13:47:48 +0100 + +gconf2 (2.12.1-9) unstable; urgency=high + + * The "it's good to parse options, it's better to use them" release. + * gconf-schemas: really uninstall the defaults (closes: #352071). + + -- Josselin Mouette Thu, 9 Feb 2006 17:56:51 +0100 + +gconf2 (2.12.1-8) unstable; urgency=low + + * update-gconf-defaults.8: documentation for update-gconf-defaults. + * gconf2.manpages: ship it. + + -- Josselin Mouette Sun, 8 Jan 2006 11:20:11 +0100 + +gconf2 (2.12.1-7) unstable; urgency=low + + * rules: Pass --as-needed to ld, so that gconf-sanity-check doesn't + get linked with an overly long list of dependencies + (closes: #346375). + + -- Josselin Mouette Sat, 7 Jan 2006 15:14:22 +0100 + +gconf2 (2.12.1-6) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Thu, 5 Jan 2006 07:59:03 +0100 + +gconf2 (2.12.1-5) experimental; urgency=low + + * 60gconf2_merge-tree: if zenity is installed, ask for confirmation + upon login before migrating the gconf tree to %gconf-tree.xml. + * control.in: recommend zenity. + * README.Debian: time to document all the Debian specifities GConf now + has. + * rules: libgconfbackend has moved to libgconf2-4, reflect this for + dh_makeshlibs. + + -- Josselin Mouette Thu, 15 Dec 2005 23:49:03 +0100 + +gconf2 (2.12.1-4) experimental; urgency=high + + * Quote directory and file variables to permit spaces and to compare strings + when they could be empty. (Closes: #339425) + [debian/gconf2.postinst, debian/libgconf2-dev.postinst] + + -- Loic Minier Wed, 16 Nov 2005 09:27:26 +0100 + +gconf2 (2.12.1-3) experimental; urgency=low + + * control.in: really build-depend on python (closes: #338957). + + -- Josselin Mouette Tue, 15 Nov 2005 11:03:15 +0100 + +gconf2 (2.12.1-2) experimental; urgency=low + + * debian/control.in: + - drop version of the build-dependency on libgtk2.0-dev + - fix FTBFS by build-depending on python (Closes: #338957) + + -- Guilherme de S. Pastore Mon, 14 Nov 2005 00:57:45 -0200 + +gconf2 (2.12.1-1) experimental; urgency=low + + * New upstream release. + * gconf2-common.postrm: check for /etc/gconf/2 before removing it + (closes: #335941). + * Merge the gconf directory trees for better performance: + + 60gconf2_merge-tree: new session startup script. This script + forces the rebuild of ~/.gconf. + + gconf2-common.install: install this script in /etc/X11/Xsession.d. + + control.in: depend on psmisc (for killall). + + gconf2.postinst: run gconf-merge-tree on /var/lib/gconf/defaults + if necessary. + + gconf2-common.postrm: entirely purge /var/lib/gconf, + /etc/gconf.xml.defaults and /etc/gconf.xml.mandatory. + + gconf2-common.postinst: the chmod-fixes aren't necessary anymore. + * uupdate: removed, unused. + * Provide a framework to easily set up defaults in Debian packages + (closes: #329340). + + update-gconf-defaults: new script, takes defaults in a specific format + in /usr/share/gconf/defaults and generates a gconf tree in + /var/lib/gconf/debian.defaults. + + gconf2.install: install it. + + control.in: depend on python for its execution. + + rules: run dh_python. + + gconf2-common.dirs: create /var/lib/gconf/debian.defaults and + /usr/share/gconf/defaults, and remove the unused directories + in /usr/share/gconf. + + default.path: remove references to the /usr/share directories, and + reference the brand new /var/lib/gconf/debian.defaults instead. + * Settle for World domination. + + -- Josselin Mouette Sun, 13 Nov 2005 23:05:39 +0100 + +gconf2 (2.12.0-4) experimental; urgency=low + + * Forward some changes in the unstable packages: + * debian/gconf2-common.dirs: + - list "/etc/gconf/2". + * Make the new gconf2 package conflict with the old libgconf2-4 + package, to avoid the case where there is no gconfd-2 binary + installed at all. + * watch: update to 2.12. + * load_empty_dirs.diff: removed, I finally have other projects to + support changing the default values. + + -- Josselin Mouette Sun, 25 Sep 2005 21:33:54 +0200 + +gconf2 (2.12.0-3) experimental; urgency=low + + * gconf2-common.postinst: fix permissions that seem to be set wrong in + some cases. + * load_empty_dirs.diff: load directories even when they are empty. + This should be better for distribution of defaults in Debian + packages. + + -- Josselin Mouette Wed, 21 Sep 2005 20:12:16 +0200 + +gconf2 (2.12.0-2) experimental; urgency=low + + * Remove circular dependency between libgconf2-4 and gconf2 + (closes: #316403). + + move libexecdir to /usr/lib/libgconf2-4, + + new package: gconf2-common, + + move the defaults directories to gconf2-common, + + move the documentation to libgconf2-dev, + + move the configuration file to gconf2-common and handle it with ucf, + + move locale and SGML stuff to gconf2-common. + * Rewrite the package descriptions. + + -- Josselin Mouette Sun, 18 Sep 2005 13:22:59 +0200 + +gconf2 (2.12.0-1) experimental; urgency=low + + * New upstream release. + * rules: bump shlibs version. + * gconf2.postinst: remove bashism. + + -- Josselin Mouette Wed, 14 Sep 2005 22:40:23 +0200 + +gconf2 (2.10.1-2) unstable; urgency=low + + * gconf2.postinst: install the manpage as a slave alternative + (closes: #314999). + * gconf2.{install,links}: install documentation to /usr/share/doc + (closes: #272226). + + rules: don't compress these files. + + gconf2.postinst: make the symlink by hand for the transition. + * rules,control.in: only recommend libgtk2.0-0, for gconf-sanity-check + (closes: #267304). + * Customize the default path file, which now: + - allows to set defaults or mandatory settings in packages; + - sets a place for autogenerated defaults in /var/lib; + - reads user customization files for Sabayon. + (closes: #310065). + + path: the new file. + + gconf2.install: install it in place of the other one. + + gconf2.dirs: create the corresponding directories. + * gconf-schemas: new script, to be used by dh_gconf. + + gconf2.install: install it. + * copyright: update FSF address. + * control.in: bump debhelper dependency to 4.1. + * gconf.devhelp: removed, unused. + * postinst,prerm: renamed to gconf2.{postinst,prerm}. + + -- Josselin Mouette Thu, 8 Sep 2005 01:12:45 +0200 + +gconf2 (2.10.1-1) unstable; urgency=low + + * New upstream release. + + gconfd now exits when unused (closes: #311252). + * gconfd_notify_other_listeners.diff: removed, integrated upstream. + * Set myself as maintainer. + * Standards-version is 3.6.2. + + -- Josselin Mouette Wed, 13 Jul 2005 00:55:47 +0200 + +gconf2 (2.10.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Tue, 7 Jun 2005 20:28:17 +0200 + +gconf2 (2.10.0-1) experimental; urgency=low + + * New upstream release. + * Replaces the .files with .install files. + * debian/compat: + - added. + * debian/gconf2.lintian, debian/libgconf.lintian: + - removed + * debian/FAQ: + - removed iso8859 characters. + * debian/control.in: + - removed packages need for the doc building from Build-Depends since we + don't build it anymore, changed dbs with cdbs. + - added the homepage to descriptions. + * debian/patches/01_default_locale.patch: + - removed, the changes are in the new version. + * debian/rules: + - switched to CDBS. + - turned the doc building off since the html files are provided upstream. + * debian/watch: + - updated. + + -- Sebastien Bacher Thu, 24 Mar 2005 00:53:21 +0100 + +gconf2 (2.8.1-4) unstable; urgency=low + + * debian/patches/01_default_locale.patch: + - fix the problem with default values missing in some locales. + * debian/patches/gconf_path_max.diff: + - patch by Michael Banck to build on hurd. + + -- Sebastien Bacher Sun, 21 Nov 2004 18:25:39 +0100 + +gconf2 (2.8.1-3) unstable; urgency=low + + * gconfd_notify_other_listeners.diff: fix null-pointer free that caused + crashes of gconfd in some cases. + * Removed build-depend on libdb3-dev (closes: #282325). + + -- Josselin Mouette Sun, 21 Nov 2004 14:01:09 +0100 + +gconf2 (2.8.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Wed, 17 Nov 2004 21:23:26 +0100 + +gconf2 (2.8.1-1) experimental; urgency=low + + * New upstream release. + * [debian/watch] Updated. + + -- J.H.M. Dassen (Ray) Tue, 12 Oct 2004 19:53:53 +0200 + +gconf2 (2.8.0-1) experimental; urgency=low + + * New upstream release. + * [debian/control.in] Removed gtk-doc-tools, docbook-xml build dependencies; + we just use the HTML docs from the upstream tarball. + Added explicit autoconf, autotools-dev build dependencies. + * [debian/rules] configure --disable-gtk-doc . + + -- J.H.M. Dassen (Ray) Tue, 14 Sep 2004 18:56:58 +0200 + +gconf2 (2.7.92-1) experimental; urgency=low + + * New upstream development release. + + -- J.H.M. Dassen (Ray) Mon, 30 Aug 2004 14:22:59 +0200 + +gconf2 (2.7.91.1-1) experimental; urgency=low + + * New upstream development release. + + -- J.H.M. Dassen (Ray) Fri, 20 Aug 2004 18:12:41 +0200 + +gconf2 (2.7.91-1) experimental; urgency=low + + * New upstream development release. + * [debian/control.in] Moved the devel package to the `libdevel' section. + + -- J.H.M. Dassen (Ray) Tue, 17 Aug 2004 19:59:12 +0200 + +gconf2 (2.7.90-1) experimental; urgency=low + + * New upstream development release. + * [debian/rules] Ensure at build time all symbols are resolvable; make the + linker work a bit harder so dynamic loading can be done faster. + * [patches/gnu_os_maxpathlen_fix.diff] Disabled as it no longer applies + cleanly. + * [debian/shlibs.local] Bumped just in case. + + -- J.H.M. Dassen (Ray) Sun, 15 Aug 2004 10:45:26 +0200 + +gconf2 (2.7.1-1) experimental; urgency=low + + * GNOME Team Upload. + * New (development) upstream release. + + -- Marc 'HE' Brockschmidt Sat, 19 Jun 2004 17:00:55 +0200 + +gconf2 (2.6.1-2) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable + + -- Sebastien Bacher Tue, 25 May 2004 19:57:37 +0200 + +gconf2 (2.6.1-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Tue, 20 Apr 2004 19:23:36 +0200 + +gconf2 (2.6.0-2) experimental; urgency=low + + * Added Build-Depends on docbook-xml (Closes: #240184). + + -- Sebastien Bacher Wed, 31 Mar 2004 23:05:55 +0200 + +gconf2 (2.6.0-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + + updated Build-Depends. + * debian/libgconf2-2.substvars: + + removed. + + -- Sebastien Bacher Tue, 23 Mar 2004 23:32:26 +0100 + +gconf2 (2.4.0.1-3) unstable; urgency=low + + * debian/control.in: + + update for the Gnome Team. + * debian/gconf.devhelp: + + include this file to have the API available in devhelp. + * debian/gconftool-2.1: + + include manpage from the CVS (Closes: #178887). + * debian/rules: + + change dh_installmanpages for dh_installman. + + install the devhelp file. + + remove dh_undocumented call. + + update for the Gnome Team. + + use --enable-gtk-doc to generate the missing doc (Closes: #203645). + + -- Sebastien Bacher Thu, 1 Jan 2004 16:14:15 +0100 + +gconf2 (2.4.0.1-2) unstable; urgency=low + + * Fix Build-Depends : liborbit2-dev (2.8.0, should be 1:2.8.0). + + -- Sebastien Bacher Sat, 18 Oct 2003 02:53:23 +0200 + +gconf2 (2.4.0.1-1) unstable; urgency=low + + * New upstream release + * GNOME Team upload + + -- Sebastien Bacher Wed, 15 Oct 2003 18:36:26 +0200 + +gconf2 (2.2.1-4) unstable; urgency=low + + * Build-Depends on gtk2 again. + It is necessary to build gconf-sanity-check-2 (close: #213437) + + -- Takuo KITAME Thu, 2 Oct 2003 12:28:51 +0900 + +gconf2 (2.2.1-3) unstable; urgency=low + + * Fix again postinst (closes: #208600, #208611, #208604) + + -- Takuo KITAME Thu, 4 Sep 2003 10:13:16 +0900 + +gconf2 (2.2.1-2) unstable; urgency=low + + * Fix postinst (closes: #205703) + * remove libgtk2.0-dev from Build-Depends, it is not needed. + and fix configure (closes: #187700) + * remove symlink to manpage which does not exist(closes: #198857) + * register gconf-1.0.dtd (closes: #177905) + + -- Takuo KITAME Wed, 3 Sep 2003 17:08:44 +0900 + +gconf2 (2.2.1-1) unstable; urgency=low + + * New upstream release + * applied PATH_MAX patch for GNU/Hurd (closes: #164583) + * Build-Depends on libgtk2.0-dev (closes: #187700) + * maintainer upload, closes NMU fixes (closes: #172387, #172388, #175309, #175515) + * fix description (closes: #189515) + + -- Takuo KITAME Tue, 17 Jun 2003 12:31:34 +0900 + +gconf2 (2.2.0-1) unstable; urgency=low + + * New upstream release + * Fix build-depends (closes: #177743, #177768) + + -- Takuo KITAME Wed, 22 Jan 2003 12:19:55 +0900 + +gconf2 (2.1.90-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 20 Jan 2003 11:58:41 +0900 + +gconf2 (1.2.1-4) unstable; urgency=low + + * Update config.{guess,sub} + * change Maintainer address to @debian.org + + -- Takuo KITAME Wed, 13 Nov 2002 14:44:43 +0900 + +gconf2 (1.2.1-3) unstable; urgency=low + + * Maintainer upload. (closes: #156240, #149733) + Thanks to Michael and Christian's NMU + * fix shlibs. include version number + * Conflict with older libgconf11 versions which expected gconfd-2 in /usr/bin. + + -- Takuo KITAME Mon, 26 Aug 2002 15:45:01 +0900 + +gconf2 (1.2.1-2.1) unstable; urgency=low + + * NMU + * Really fix 156240. Those binaries should go in /usr/lib/gconf2 and not + /usr/bin (Closes: #156240) + * Build with --disable-gtk-doc Documentation already generated by + upstream. + * Remove debian/libgconf2.postinst This file contains a ldconfig call not + needed with DH_COMPAT=3 + * debian/rules remove not needed double dh_makeshlibs calls and make a + versioned gconf2 dependency for libgconf2-4 to really fix #149733. + + -- Christian Marillat Thu, 22 Aug 2002 18:58:46 +0200 + +gconf2 (1.2.1-2) unstable; urgency=low + + * configure with --libexecdir=\$${prefix}/bin (closes: #156240) + + -- Takuo KITAME Fri, 16 Aug 2002 15:40:35 +0900 + +gconf2 (1.2.1-1) unstable; urgency=low + + * New upstream release + * build against libgtk2.0-0png3 + + -- Takuo KITAME Thu, 8 Aug 2002 12:37:14 +0900 + +gconf2 (1.2.0-1) unstable; urgency=low + + * New upstream release + * libgconf2-4: change shlibs to gconf2 (>= ${VERSION}) + Package will depends on gconf2 instead of libgconf2, + No problems, gconf2 depends on versioned libgconf2. (closes: #149733) + + -- Takuo KITAME Thu, 13 Jun 2002 03:07:55 +0900 + +gconf2 (1.1.11-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 4 Jun 2002 00:13:36 +0900 + +gconf2 (1.1.10-2) unstable; urgency=low + + * move /usr/lib/GConf/2/libgconfbackend-xml.so into gconf2 (closes: #148136) + + -- Takuo KITAME Fri, 31 May 2002 15:53:49 +0900 + +gconf2 (1.1.10-1) unstable; urgency=low + + * New upstream release + * use dbs + + -- Takuo KITAME Wed, 1 May 2002 09:47:52 +0900 + +gconf2 (1.1.9-2) unstable; urgency=low + + * fix place of Documentation (closes: #140782) + * includes FAQ and README.Debian + + -- Takuo KITAME Tue, 23 Apr 2002 12:36:11 +0900 + +gconf2 (1.1.9-1) unstable; urgency=low + + * New upstream release + * bug fixed by upstrem. + closes: #138188 Can't deal with locales not specified in the schema file + + -- Takuo KITAME Mon, 1 Apr 2002 06:18:50 +0900 + +gconf2 (1.1.8-6) unstable; urgency=high + + * fix bashism in postrm (closes: #140133, #140221) + + -- Takuo KITAME Thu, 28 Mar 2002 11:33:57 +0900 + +gconf2 (1.1.8-5) unstable; urgency=low + + * build against glib2.0 (closes: #139611) + + -- Takuo KITAME Thu, 21 Mar 2002 00:32:52 +0900 + +gconf2 (1.1.8-4) unstable; urgency=low + + * build against libgtk1.3-15 + * debian/gconf2.postrm: + - rmdir -p /etc/gconf/2 on purge (closes: #135687) + + -- Takuo KITAME Tue, 26 Feb 2002 13:09:39 +0900 + +gconf2 (1.1.8-3) unstable; urgency=low + + * build against libgtk1.3-14 + + -- Takuo KITAME Fri, 22 Feb 2002 20:48:34 +0900 + +gconf2 (1.1.8-2) unstable; urgency=low + + * build against libatk12 + + -- Takuo KITAME Fri, 15 Feb 2002 10:18:31 +0900 + +gconf2 (1.1.8-1) unstable; urgency=low + + * New upstream release + * libgconf2-dev depends on liborbit2-dev (closes: #133630) + * build against libatk11 + + -- Takuo KITAME Wed, 13 Feb 2002 14:32:23 +0900 + +gconf2 (1.1.7-3) unstable; urgency=low + + * build against new linc and ORBit2 + + -- Takuo KITAME Mon, 11 Feb 2002 22:26:43 +0900 + +gconf2 (1.1.7-2) unstable; urgency=low + + * change soname to 4 + + -- Takuo KITAME Fri, 8 Feb 2002 05:05:07 +0900 + +gconf2 (1.1.7-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 6 Feb 2002 01:13:05 +0900 + +gconf2 (1.1.6-2) unstable; urgency=low + + * Build against libglib1.3-13 + * update Build-Depends: libglib1.3-dev (>= 1.3.13) + + -- Takuo KITAME Sun, 3 Feb 2002 23:36:56 +0900 + +gconf2 (1.1.6-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 18 Jan 2002 20:59:27 +0000 + +gconf2 (1.1.5-2) unstable; urgency=low + + * build against latest libraries. + * update Build-Depends. + + -- Takuo KITAME Tue, 8 Jan 2002 10:01:24 +0000 + +gconf2 (1.1.5-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 2 Jan 2002 10:39:56 +0000 + +gconf2 (1.1.4-6) unstable; urgency=low + + * debian/control: + - Fix Build-Depends: line and add 'indent' (closes: #126581) + + -- Takuo KITAME Thu, 27 Dec 2001 06:14:23 +0000 + +gconf2 (1.1.4-5) unstable; urgency=low + + * debian/control: + - fixed typo in description (closes: #124952) + + -- Takuo KITAME Mon, 17 Dec 2001 23:45:27 +0000 + +gconf2 (1.1.4-4) unstable; urgency=low + + * fix build-depends, again (closes: #122995) + + -- Takuo KITAME Sun, 9 Dec 2001 03:30:49 +0000 + +gconf2 (1.1.4-3) unstable; urgency=low + + * Build against new glib1.3.11 + * fix glib-object.h problem. + * Build-Depends: liborbit2-dev (>= 2.3.99) (closes: #122263) + + -- Takuo KITAME Fri, 7 Dec 2001 20:48:19 +0000 + +gconf2 (1.1.4-2) unstable; urgency=low + + * fix build-depends. (closes: #121554) + + -- Takuo KITAME Wed, 28 Nov 2001 15:53:43 +0000 + +gconf2 (1.1.4-1) unstable; urgency=low + + * New upstream release + * Build against glib1.3.10 + + -- Takuo KITAME Tue, 13 Nov 2001 00:11:10 +0000 + +gconf2 (1.1.3-1) unstable; urgency=low + + * New upstream release + * New package name gconf2, libgconf2, libgconf2-dev + + -- Takuo KITAME Fri, 26 Oct 2001 04:30:43 +0000 + +gconf (1.0.6-3) unstable; urgency=low + + * g_utf8_validate renamed to gconf_g_utf8_validate (It is internal!!) + comment out unused g_utf8_skip + It'll fix Evolution(Summary) with gconf 1.0.6. (closes: #116423) + + -- Takuo KITAME Mon, 22 Oct 2001 19:39:59 +0900 + +gconf (1.0.6-2) unstable; urgency=low + + * Fixed postinst (closes: #116176, #116177, #116178, #116179) + + -- Takuo KITAME Fri, 19 Oct 2001 12:25:55 +0900 + +gconf (1.0.6-1) unstable; urgency=low + + * New upstream release + * fixed wrong URL in README (closes: #112000) + * fix permission of /etc/gconf/gconf.xml.defaults (closes: #112875, #115920) + + -- Takuo KITAME Thu, 18 Oct 2001 10:01:17 +0900 + +gconf (1.0.5-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 15 Oct 2001 13:35:23 +0900 + +gconf (1.0.4-3) unstable; urgency=low + + * libgconf-dev: depends liboaf-dev (closes: #111251) + + -- Takuo KITAME Fri, 7 Sep 2001 21:35:36 +0900 + +gconf (1.0.4-2) unstable; urgency=low + + * rebuild with latest oaf. It will be fix Bug#110874. (closes: Bug#110874) + + -- Takuo KITAME Sun, 2 Sep 2001 01:20:31 +0900 + +gconf (1.0.4-1) unstable; urgency=low + + * New upstream release (closes: Bug#109689) + + -- Takuo KITAME Fri, 24 Aug 2001 02:30:51 +0900 + +gconf (1.0.3-2) unstable; urgency=low + + * install /etc/gconf/gconf.xml.mandatory (closes: Bug#108054) + + -- Takuo KITAME Thu, 9 Aug 2001 00:48:00 +0900 + +gconf (1.0.3-1) unstable; urgency=low + + * New upstream release + * include gconf.xml.defaults (closes: Bug#105894) + * include /etc/gconf/1/ (closes: Bug#105896) + * rm -rf /etc/gconf when purge gconf (closes: Bug#104415) + + -- Takuo KITAME Tue, 7 Aug 2001 03:55:17 +0900 + +gconf (1.0.1-3) unstable; urgency=low + + * update config.{guess,sub} (closes: Bug#103376) + + -- Takuo KITAME Sun, 8 Jul 2001 19:06:37 +0900 + +gconf (1.0.1-2) unstable; urgency=low + + * escape gnome-config checks in configure.in. + It's not needed, I think. (closes: Bug#98350) + + -- Takuo KITAME Sun, 27 May 2001 16:50:45 +0900 + +gconf (1.0.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Sun, 20 May 2001 04:16:32 +0900 + +gconf (1.0.0-4) unstable; urgency=low + + * debian/control: fix description. (closes: Bug#94179) + + -- Takuo KITAME Thu, 19 Apr 2001 03:07:13 +0900 + +gconf (1.0.0-3) unstable; urgency=low + + * Build-Depends: added versionned libguile-dev (>= 1:1.4-10) (closes: Bug#93101) + * Built with libdb3 (closes: Bug#93192, Bug#93185) + + -- Takuo KITAME Sun, 8 Apr 2001 13:59:35 +0900 + +gconf (1.0.0-2) unstable; urgency=low + + * fix Build-Depends zlib1g-dev (closes: Bug#90380) + + -- Takuo KITAME Thu, 22 Mar 2001 13:12:36 +0900 + +gconf (1.0.0-1) unstable; urgency=low + + * New upstream release + * fix Build-Depends libgtk1.2-dev. (closes: Bug#89567) + + -- Takuo KITAME Wed, 14 Mar 2001 12:07:30 +0900 + +gconf (0.50-2) unstable; urgency=low + + * libgconf-dev: Depends on gconf (= ${Source-Version}) (closes: Bug#89309) + * --disable-debug (closes: Bug#81210) + + -- Takuo KITAME Tue, 13 Mar 2001 19:00:54 +0900 + +gconf (0.50-1) unstable; urgency=low + + * New upstream release + * libguile-dev is now availeable, Build-Depends: libguile-dev is right. (closes: Bug#84454) + * gconf binaries are now in own package 'gconf'. + + -- Takuo KITAME Wed, 28 Feb 2001 12:11:35 +0900 + +gconf (0.12-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 1 Feb 2001 13:13:38 +0900 + +gconf (0.11-2) unstable; urgency=low + + * debian/control: Build-Depends (closes: Bug#77623) + + -- Takuo KITAME Wed, 22 Nov 2000 09:02:56 +0900 + +gconf (0.11-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Sun, 29 Oct 2000 03:54:31 +0900 + +gconf (0.10-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 11 Oct 2000 09:47:19 +0900 + +gconf (0.8-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 18 Aug 2000 05:47:20 +0900 + +gconf (0.5.000512-1) unstable; urgency=low + + * Initial Release. + + -- Vincent Renardias Mon, 15 May 2000 17:43:46 +0200 + --- gconf-2.21.90.orig/debian/gconf2-common.install +++ gconf-2.21.90/debian/gconf2-common.install @@ -0,0 +1,5 @@ +debian/default.path* usr/share/gconf/ +debian/tmp/etc/gconf/2/evoldap.conf +debian/tmp/usr/share/locale +debian/tmp/usr/share/sgml +debian/tmp/usr/share/GConf/schema usr/share/doc/gconf2-common/ --- gconf-2.21.90.orig/debian/gconf2.postrm +++ gconf-2.21.90/debian/gconf2.postrm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then + find /var/lib/gconf -mindepth 2 -maxdepth 2 -exec rm -rf \{} \; +fi + +#DEBHELPER# --- gconf-2.21.90.orig/debian/libgconf2-4.install +++ gconf-2.21.90/debian/libgconf2-4.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/*.so.* +debian/tmp/usr/lib/libgconf2-4/gconf* +debian/tmp/usr/lib/libgconf2-4/2/*.so --- gconf-2.21.90.orig/debian/gconf2-common.postinst +++ gconf-2.21.90/debian/gconf2-common.postinst @@ -0,0 +1,6 @@ +#! /bin/sh +set -e + +ucf /usr/share/gconf/default.path /etc/gconf/2/path + +#DEBHELPER# --- gconf-2.21.90.orig/debian/update-gconf-defaults.8 +++ gconf-2.21.90/debian/update-gconf-defaults.8 @@ -0,0 +1,57 @@ +.TH UPDATE-GCONF-DEFAULTS 8 "8 Jan 2006" +.\" Please adjust this date whenever revising the manpage. +.SH NAME +update-gconf-defaults \- generate GConf defaults shipped in Debian packages +.SH SYNOPSIS +.B update-gconf-defaults +.SH DESCRIPTION +This manual page documents briefly the +.B update-gconf-defaults +command. +.PP +.B update-gconf-defaults +is responsible for generating defaults used by GConf from the files +found in +.IR /usr/share/gconf/defaults . +.PP +The syntax of files in this directory consists in lines containing the +key name, some white space, and the key value, which can be an integer, +a boolean, a float, a string or a list of strings. Example: +.PP +/apps/myprogram/frob_number 42 +.br +/apps/myprogram/do_foo true +.br +/apps/myprogram/priority 1.25 +.br +/apps/myprogram/name "Gotcha !" +.br +/apps/myprogram/names [Ha ha!,Let's keep serious,Ho ho!] +.PP +Files are processed in alphabetical order. Files processed later take +precedence over the previous ones if they include the same defaults. +Thus, it is recommended to name +them +.IR NN _ package +with +.I NN +being a 2-digit number and +.I package +the package name. It is recommended to set +.I NN +as 10 for packages in the Debian archive, 20 for derived distributions, +50 for CDD distributions, and 90 for site-specific packages. +.SH OPTIONS +There are no options for this program. +.SH FILES +.TP +.I /usr/share/gconf/defaults/ +The directory where defaults files are read. +.TP +.I /var/lib/gconf/debian.defaults/%gconf-tree.xml +The value tree generated. It is read by GConf with the default Debian +configuration, and it takes precedence over upstream defaults. +.SH SEE ALSO +.BR dh_gconf (1), gconftool (1). +.SH AUTHOR +Josselin Mouette . --- gconf-2.21.90.orig/debian/rules +++ gconf-2.21.90/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := GConf + +DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO +DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4 +DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2-4 + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +DEB_DH_MAKESHLIBS_ARGS_libgconf2-4 += -Xbackend -V"libgconf2-4 (>= 2.13.5)" +DEB_DH_SHLIBDEPS_ARGS += -Xgconf-sanity-check + +DEB_COMPRESS_EXCLUDE += usr/share/doc/gconf2/html + +binary-predeb/gconf2:: + dh_pysupport -p$(cdbs_curpkg) --- gconf-2.21.90.orig/debian/control +++ gconf-2.21.90/debian/control @@ -0,0 +1,99 @@ +Source: gconf +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge +Build-Depends: debhelper (>= 5), + cdbs (>= 0.4.41), + libglib2.0-dev (>= 2.9), + liborbit2-dev (>= 1:2.10.2-1.1), + libpopt-dev, + libxml2-dev, + zlib1g-dev, + gettext, + gcc (>= 3:3.2.2), + libgtk2.0-dev, + gnome-pkg-tools (>= 0.10), + dpkg-dev (>= 1.13.19), + python (>= 2.3), + libldap2-dev, + gtk-doc-tools, + libxml-parser-perl, + python-support (>= 0.5.3), + autotools-dev +Standards-Version: 3.7.2 + +Package: gconf2 +Architecture: any +Depends: ${shlibs:Depends}, + gconf2-common (>= ${gnome:Version}), + gconf2-common (<< ${gnome:NextVersion}), + psmisc, + ${python:Depends} +Recommends: libgtk2.0-0 +Conflicts: libgconf2-4 (<< 2.12.0-2) +Description: GNOME configuration database system (support tools) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the command line tools: gconftool and + gconf-merge-tree. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: gconf2-common +Architecture: all +Depends: ${misc:Depends}, + ucf +Replaces: gconf2 (<< 2.12.0-2) +Description: GNOME configuration database system (common files) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the default configuration and localization files. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: libgconf2-4 +Architecture: any +Depends: ${shlibs:Depends}, + gconf2-common (>= ${gnome:Version}), + gconf2-common (<< ${gnome:NextVersion}) +Description: GNOME configuration database system (shared libraries) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the shared libraries and the GConf daemon. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: libgconf2-dev +Section: libdevel +Architecture: any +Depends: libgconf2-4 (= ${binary:Version}), + libglib2.0-dev, + libpopt-dev, + liborbit2-dev (>= 1:2.8.0), + gconf2 (= ${binary:Version}) +Replaces: gconf2 (<< 2.12.0-2) +Description: GNOME configuration database system (development) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the static libraries, header files and + documentation needed to build applications using GConf. + . + Homepage: http://www.gnome.org/projects/gconf/ --- gconf-2.21.90.orig/debian/compat +++ gconf-2.21.90/debian/compat @@ -0,0 +1 @@ +5 --- gconf-2.21.90.orig/debian/update-gconf-defaults +++ gconf-2.21.90/debian/update-gconf-defaults @@ -0,0 +1,135 @@ +#! /usr/bin/python +# -*- coding: UTF-8 -*- +# +# © 2005 Josselin Mouette +# Licensed under the GNU LGPL, see /usr/share/common-licenses/LGPL-2.1 + + +defaults_dir = '/usr/share/gconf/defaults' +outdir = '/var/lib/gconf/debian.defaults' +treefile = '%gconf-tree.xml' + +import os,tempfile,shutil,sys + +if os.geteuid(): + sys.stderr.write("%s needs to be run as root.\n"%sys.argv[0]) + sys.exit(1) + +tmp_dir=tempfile.mkdtemp(prefix="gconf-") +tmp_home=tmp_dir+'/home' +tmp_gconf=tmp_dir+'/gconf' +tmp_file=tmp_dir+'/temp.entries' + +save_stdout=os.dup(1) +os.close(1) + +def cleanup(): + os.dup2(save_stdout,1) + os.close(save_stdout) + shutil.rmtree(tmp_dir) + +def htmlescape(str): + return str.replace('&','&').replace('>','>').replace('<','<').replace('"','"') + +def int_entry(value): + return ' ' + value + '\n' + +def bool_entry(value): + return ' ' + value + '\n' + +def float_entry(value): + return ' ' + value + '\n' + +def string_entry(value): + return ' ' + htmlescape(value) + '\n' + +def list_entry(value): + ret = ' \n' + for v in value[1:-1].split(','): + ret += ' ' + htmlescape(v) + '\n' + ret += ' \n' + return ret + + +def listcmp(a,b): + """Number of starting similar elements in a and b""" + m = min(len(a),len(b)) + for i in range(m): + if a[i] != b[i]: + return i + return m + +def apply_entries(filename): + res=os.spawnvpe(os.P_WAIT,'gconftool-2', + ['gconftool-2','--direct','--config-source', + 'xml:merged:'+tmp_gconf,'--load',filename], + {'HOME': tmp_home}) + if res: + cleanup() + sys.exit(res) + +gconf_val = {} + +def write_and_apply_entries(filename): + out=file(filename,'w') + out.write('\n\n') + for key in gconf_val: + out.write('\n' + key + '\n\n') + # write the current entry + value = gconf_val[key] + if value[0] == '"' and value[-1] == '"': + out.write(string_entry(value[1:-1])) + elif value in ['true','false']: + out.write(bool_entry(value)) + elif value[0] == '[' and value[-1] == ']': + out.write(list_entry(value)) + elif value.isdigit(): + out.write(int_entry(value)) + else: + try: + float(value) + out.write(float_entry(value)) + except ValueError: + out.write(string_entry(value)) + out.write('\n\n') + out.write('\n\n') + out.close() + apply_entries(filename) + +def read_entries(filename): + for line in file(filename): + l = line.rstrip('\n').split(None,1) + if len(l) == 2: + gconf_val[l[0]] = l[1] + + +defaults_files = os.listdir(defaults_dir) +defaults_files.sort() +for f in defaults_files: + realname=defaults_dir+'/'+f + if f.endswith('.dpkg-tmp'): + pass + elif f.endswith('.entries'): + if gconf_val: + write_and_apply_entries(tmp_file) + gconf_val={} + apply_entries(realname) + else: + read_entries(realname) +if gconf_val: + write_and_apply_entries(tmp_file) + +try: + shutil.copyfile(tmp_gconf+'/'+treefile,outdir+'/'+treefile+'.tmp') + os.rename(outdir+'/'+treefile+'.tmp',outdir+'/'+treefile) +except IOError: + # No %gconf-tree.xml file was created. + try: + os.remove(outdir+'/'+treefile) + except OSError: + # No existing file + pass + +cleanup() + +os.system('kill -s HUP `pidof gconfd-2` >/dev/null 2>&1') --- gconf-2.21.90.orig/debian/gconf2.prerm +++ gconf-2.21.90/debian/gconf2.prerm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove gconftool /usr/bin/gconftool-2 +fi + +#DEBHELPER# --- gconf-2.21.90.orig/debian/default.path.md5sum +++ gconf-2.21.90/debian/default.path.md5sum @@ -0,0 +1,2 @@ +9f90335546f7c57ae6fb552cc2b919c5 2.8.1-6 +65faa85aca651fa9313cb78e0915d392 2.12.0-1 --- gconf-2.21.90.orig/debian/gconf2-common.dirs +++ gconf-2.21.90/debian/gconf2-common.dirs @@ -0,0 +1,6 @@ +/etc/gconf/2 +/etc/gconf/gconf.xml.mandatory +/etc/gconf/gconf.xml.defaults +/usr/share/gconf/defaults +/var/lib/gconf/defaults +/var/lib/gconf/debian.defaults --- gconf-2.21.90.orig/debian/README.Debian +++ gconf-2.21.90/debian/README.Debian @@ -0,0 +1,39 @@ +GConf 2 for Debian +================== + +The default GConf sources accessed by the GConf daemon are the following: + +* /etc/gconf/gconf.xml.mandatory/ + Mandatory settings set by the administrator. You can edit them with + gconf-editor, as root, to override any user settings. + +* ~/.gconf/ + The user's settings. + +* /etc/gconf/gconf.xml.defaults/ + Default settings set by the administrator. Edit them as root with + gconf-editor. + +* /var/lib/gconf/debian.defaults/ + This directory contains some defaults provided by Debian, CDD or local + packages. Packages can ship files of the form NNpackage, larger NN + values meaning larger priorities, in /usr/share/gconf/defaults/, + before launching update-gconf-defaults. Debian packages themselves use + 01, CDD distributions are encouraged to use values larger than 10, and + site-specific packages can use the largest values. The purpose is for + CDD to overwrite Debian defaults, and for site-specific packages to + overwrite all other defaults. + +* /var/lib/gconf/defaults/ + This directory contains the defaults computed from the upstream + schemas that lie in /usr/share/gconf/schemas. This is done by the + gconf-schemas script in the package's post-installation script. + +All system directories use a %gconf-tree.xml file containing the whole +structure, for performance reasons. The upgrade from the previous +situation (tree of %gconf.xml files) is done in gconf2 2.12.1-5. + +By default, the home directory structure is created as a tree layout. If +you want to use a merged tree on the home directory, you should run the +following command: + gconf-merge-tree ~/.gconf/ --- gconf-2.21.90.orig/debian/control.in +++ gconf-2.21.90/debian/control.in @@ -0,0 +1,99 @@ +Source: gconf +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + cdbs (>= 0.4.41), + libglib2.0-dev (>= 2.9), + liborbit2-dev (>= 1:2.10.2-1.1), + libpopt-dev, + libxml2-dev, + zlib1g-dev, + gettext, + gcc (>= 3:3.2.2), + libgtk2.0-dev, + gnome-pkg-tools (>= 0.10), + dpkg-dev (>= 1.13.19), + python (>= 2.3), + libldap2-dev, + gtk-doc-tools, + libxml-parser-perl, + python-support (>= 0.5.3), + autotools-dev +Standards-Version: 3.7.2 + +Package: gconf2 +Architecture: any +Depends: ${shlibs:Depends}, + gconf2-common (>= ${gnome:Version}), + gconf2-common (<< ${gnome:NextVersion}), + psmisc, + ${python:Depends} +Recommends: libgtk2.0-0 +Conflicts: libgconf2-4 (<< 2.12.0-2) +Description: GNOME configuration database system (support tools) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the command line tools: gconftool and + gconf-merge-tree. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: gconf2-common +Architecture: all +Depends: ${misc:Depends}, + ucf +Replaces: gconf2 (<< 2.12.0-2) +Description: GNOME configuration database system (common files) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the default configuration and localization files. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: libgconf2-4 +Architecture: any +Depends: ${shlibs:Depends}, + gconf2-common (>= ${gnome:Version}), + gconf2-common (<< ${gnome:NextVersion}) +Description: GNOME configuration database system (shared libraries) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the shared libraries and the GConf daemon. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: libgconf2-dev +Section: libdevel +Architecture: any +Depends: libgconf2-4 (= ${binary:Version}), + libglib2.0-dev, + libpopt-dev, + liborbit2-dev (>= 1:2.8.0), + gconf2 (= ${binary:Version}) +Replaces: gconf2 (<< 2.12.0-2) +Description: GNOME configuration database system (development) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the static libraries, header files and + documentation needed to build applications using GConf. + . + Homepage: http://www.gnome.org/projects/gconf/ --- gconf-2.21.90.orig/debian/gconf-schemas +++ gconf-2.21.90/debian/gconf-schemas @@ -0,0 +1,86 @@ +#! /usr/bin/python +# +# copyright (c) 2006 Josselin Mouette +# Licensed under the GNU Lesser General Public License, version 2.1 +# See COPYING for details + +from optparse import OptionParser +import sys,os,os.path,shutil,tempfile + +parser = OptionParser(usage="usage: %prog --[un]register file1.schemas [file2.schemas [...]]") + +parser.add_option("--register", action="store_true", dest="register", + help="register schemas to the GConf database", + default=None) +parser.add_option("--unregister", action="store_false", dest="register", + help="unregister schemas from the GConf database", + default=None) +parser.add_option("--register-all", action="store_true", dest="register_all", + help="clean up the GConf database and register all schemas again", + default=False) + +(options, args) = parser.parse_args() + +if options.register==None and not options.register_all: + parser.error("You need to specify --register or --unregister.") + +schema_location="/usr/share/gconf/schemas" +defaults_dest="/var/lib/gconf/defaults" + +schemas = [ ] +if options.register_all: + for f in os.listdir(schema_location): + if f.endswith(".schemas"): + schemas.append(os.path.join(schema_location,f)) +else: + for schema in args: + if not os.path.isabs(schema): + schema=os.path.join(schema_location,schema) + if os.path.isfile(schema): + schemas.append(schema) + else: + sys.stderr.write('Warning: %s could not be found.\n'%schema) + +if len(schemas)<1: + parser.error("You need at least a file to (un)register.") + +if os.geteuid(): + parser.error("You must be root to launch this program.") + +if options.register_all: + options.register=True + for f in os.listdir(defaults_dest): + os.remove(os.path.join(defaults_dest,f)) + open(os.path.join(defaults_dest,"%gconf-tree.xml"),"w").close() + +tmp_home=tempfile.mkdtemp(prefix='gconf-') +env={'HOME': tmp_home, + 'GCONF_CONFIG_SOURCE': 'xml:readwrite:'+defaults_dest} +if options.register: + arg='--makefile-install-rule' +else: + arg='--makefile-uninstall-rule' + +save_stdout=os.dup(1) +os.close(1) +res=os.spawnvpe(os.P_WAIT,'gconftool-2',['gconftool-2',arg]+schemas,env) +os.dup2(save_stdout,1) +os.close(save_stdout) + +shutil.rmtree(tmp_home) + +if(res): + sys.exit(res) + +if options.register: + # tell running processes to re-read the GConf database + import signal + try: + pids=os.popen('pidof gconfd-2').readlines()[0].split() + for pid in pids: + try: + os.kill(int(pid),signal.SIGHUP) + except OSError: + pass + except IndexError: + pass --- gconf-2.21.90.orig/debian/gconf2-common.postrm +++ gconf-2.21.90/debian/gconf2-common.postrm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ];then + if [ -x /usr/bin/ucf ]; then + ucf --purge /etc/gconf/2/path + fi + if [ -d /etc/gconf/2 ]; then + rm -f /etc/gconf/2/path + rmdir -p --ignore-fail-on-non-empty /etc/gconf/2 + fi + rm -rf /var/lib/gconf + rm -rf /etc/gconf/gconf.xml.mandatory + rm -rf /etc/gconf/gconf.xml.defaults +fi + +#DEBHELPER# --- gconf-2.21.90.orig/debian/gconf2.install +++ gconf-2.21.90/debian/gconf2.install @@ -0,0 +1,4 @@ +debian/tmp/usr/bin +debian/gconf-schemas usr/sbin/ +debian/update-gconf-defaults usr/sbin/ +debian/tmp/usr/share/man --- gconf-2.21.90.orig/debian/default.path +++ gconf-2.21.90/debian/default.path @@ -0,0 +1,52 @@ +###################### +# 1. Forced settings # +###################### + +# Settings forced by the local administrator +xml:readonly:/etc/gconf/gconf.xml.mandatory + +# Other forced sources imagined by the local administrator +include /etc/gconf/2/local-mandatory.path + + +####################### +# 2. User Preferences # +####################### + +# mandatory path for sabayon +include "$(HOME)/.gconf.path.mandatory" + +# mandatory path for desktop-profiles +include $(ENV_MANDATORY_PATH) + +# Other sources imagined by the user +include "$(HOME)/.gconf.path" + +# The default storage location, ~/.gconf +# This should be the only readwrite source +xml:readwrite:$(HOME)/.gconf + +# default path for sabayon +include "$(HOME)/.gconf.path.defaults" + +# default path for desktop-profiles +include $(ENV_DEFAULTS_PATH) + + +###################### +# 3. System defaults # +###################### + +# Other default sources imagined by the local administrator +include /etc/gconf/2/local-defaults.path + +# System administrator's defaults. This source also serves as a legacy +# source for packages not using a recent dh_gconf, or for applications +# installed by hand. +xml:readonly:/etc/gconf/gconf.xml.defaults + +# Debian branding, including CDD or packaged branding +xml:readonly:/var/lib/gconf/debian.defaults + +# Upstream application defaults +xml:readonly:/var/lib/gconf/defaults --- gconf-2.21.90.orig/debian/libgconf2-dev.examples +++ gconf-2.21.90/debian/libgconf2-dev.examples @@ -0,0 +1 @@ +examples/*.c --- gconf-2.21.90.orig/debian/libgconf2-dev.links +++ gconf-2.21.90/debian/libgconf2-dev.links @@ -0,0 +1 @@ +usr/share/doc/gconf2/html usr/share/gtk-doc/html/gconf --- gconf-2.21.90.orig/debian/copyright +++ gconf-2.21.90/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Vincent Renardias on +Fri, 12 May 2000 20:53:21 +0200. + +It was downloaded from + + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + --- gconf-2.21.90.orig/debian/gconf2.postinst +++ gconf-2.21.90/debian/gconf2.postinst @@ -0,0 +1,43 @@ +#!/bin/sh +set -e + +if [ "$1" != "configure" ] || dpkg --compare-versions "$2" lt 2.19.1-2; then + update-alternatives \ + --install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \ + --slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \ + /usr/share/man/man1/gconftool-2.1.gz +fi + +#DEBHELPER# + +for GCONF_DIR in /var/lib/gconf/defaults \ + /etc/gconf/gconf.xml.mandatory \ + /etc/gconf/gconf.xml.defaults ; do + GCONF_TREE=$GCONF_DIR/%gconf-tree.xml + if [ ! -f "$GCONF_TREE" ]; then + gconf-merge-tree "$GCONF_DIR" + chmod 644 "$GCONF_TREE" + find "$GCONF_DIR" -mindepth 1 -maxdepth 1 -type d -exec rm -rf \{\} \; + rm -f "$GCONF_DIR/%gconf.xml" + SIGNAL_DAEMONS=yes + fi +done + +if [ -d /usr/share/gconf/schemas ]; then + if [ "$1" = configure ] && [ -z "$2" ] || [ ! -s /var/lib/gconf/defaults/%gconf-tree.xml ]; then + # First installation: rebuild the defaults database in case + # of packages shipping schemas but not depending on gconf2 + gconf-schemas --register-all + SIGNAL_DAEMONS=no + fi +fi +if [ -d /usr/share/gconf/defaults ] && [ ! -s /var/lib/gconf/debian.defaults/%gconf-tree.xml ]; then + # Same for the defaults + update-gconf-defaults + SIGNAL_DAEMONS=no +fi + +if [ "$SIGNAL_DAEMONS" = yes ]; then + # re-read gconf databases + kill -s HUP `pidof gconfd-2` >/dev/null 2>&1 || true +fi --- gconf-2.21.90.orig/debian/libgconf2-dev.postinst +++ gconf-2.21.90/debian/libgconf2-dev.postinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +DOCDIR=/usr/share/gtk-doc/html/gconf +if [ -d "$DOCDIR" ]; then + if [ ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" + ln -s ../../doc/gconf2/html "$DOCDIR" + fi +fi + +#DEBHELPER#