From 84a0605342368c2edad99abd364791bf3b2ebc14 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 24 May 2010 22:20:47 -0400 Subject: [PATCH] change GSettingsBackend.list() API --- gio/gsettingsbackend.c | 2 +- gio/gsettingsbackend.h | 58 ++++++++++++++++++++++-------------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c index 0d857a9be..1bd7a1136 100644 --- a/gio/gsettingsbackend.c +++ b/gio/gsettingsbackend.c @@ -269,7 +269,7 @@ g_settings_backend_watch (GSettingsBackend *backend, * All access to the list holds a mutex. We have some strategies to * avoid some of the pain that would be associated with that. */ - + watch = g_slice_new (GSettingsBackendWatch); watch->context = context; watch->target = target; diff --git a/gio/gsettingsbackend.h b/gio/gsettingsbackend.h index aa4622364..b454b42ca 100644 --- a/gio/gsettingsbackend.h +++ b/gio/gsettingsbackend.h @@ -65,35 +65,37 @@ struct _GSettingsBackendClass { GObjectClass parent_class; - gboolean (*supports_context) (const gchar *context); + gboolean (*supports_context) (const gchar *context); - GVariant * (*read) (GSettingsBackend *backend, - const gchar *key, - const GVariantType *expected_type, - gboolean default_value); - gchar ** (*list) (GSettingsBackend *backend, - const gchar *path, - gsize *length); - gboolean (*write) (GSettingsBackend *backend, - const gchar *key, - GVariant *value, - gpointer origin_tag); - gboolean (*write_keys) (GSettingsBackend *backend, - GTree *tree, - gpointer origin_tag); - void (*reset) (GSettingsBackend *backend, - const gchar *key, - gpointer origin_tag); - void (*reset_path) (GSettingsBackend *backend, - const gchar *path, - gpointer origin_tag); - gboolean (*get_writable) (GSettingsBackend *backend, - const gchar *key); - void (*subscribe) (GSettingsBackend *backend, - const gchar *name); - void (*unsubscribe) (GSettingsBackend *backend, - const gchar *name); - void (*sync) (GSettingsBackend *backend); + GVariant * (*read) (GSettingsBackend *backend, + const gchar *key, + const GVariantType *expected_type, + gboolean default_value); + gchar ** (*list) (GSettingsBackend *backend, + const gchar *path, + gchar **resets, + gsize n_resets, + gsize *length); + gboolean (*write) (GSettingsBackend *backend, + const gchar *key, + GVariant *value, + gpointer origin_tag); + gboolean (*write_keys) (GSettingsBackend *backend, + GTree *tree, + gpointer origin_tag); + void (*reset) (GSettingsBackend *backend, + const gchar *key, + gpointer origin_tag); + void (*reset_path) (GSettingsBackend *backend, + const gchar *path, + gpointer origin_tag); + gboolean (*get_writable) (GSettingsBackend *backend, + const gchar *key); + void (*subscribe) (GSettingsBackend *backend, + const gchar *name); + void (*unsubscribe) (GSettingsBackend *backend, + const gchar *name); + void (*sync) (GSettingsBackend *backend); gpointer padding[8]; };