Create GSettingsListenerVTable

...instead of passing a whole whack of function pointers around

This is an internal API.

1 files changed, 51 insertions, 57 deletions

diff --git a/gio/gsettingsbackendinternal.h b/gio/gsettingsbackendinternal.h
index aa8ac0c37..68a61a8f3 100644
--- a/gio/gsettingsbackendinternal.h
+++ b/gio/gsettingsbackendinternal.h
@@ -26,77 +26,71 @@
 
 #include "gsettingsbackend.h"
 
-typedef void          (*GSettingsBackendChangedFunc)                    (GSettingsBackend    *backend,
-                                                                         GObject             *target,
-                                                                         const gchar         *key,
-                                                                         gpointer             origin_tag);
-typedef void          (*GSettingsBackendPathChangedFunc)                (GSettingsBackend    *backend,
-                                                                         GObject             *target,
-                                                                         const gchar         *path,
-                                                                         gpointer             origin_tag);
-typedef void          (*GSettingsBackendKeysChangedFunc)                (GSettingsBackend    *backend,
-                                                                         GObject             *target,
-                                                                         const gchar         *prefix,
-                                                                         const gchar * const *names,
-                                                                         gpointer             origin_tag);
-typedef void          (*GSettingsBackendWritableChangedFunc)            (GSettingsBackend    *backend,
-                                                                         GObject             *target,
-                                                                         const gchar         *key);
-typedef void          (*GSettingsBackendPathWritableChangedFunc)        (GSettingsBackend    *backend,
-                                                                         GObject             *target,
-                                                                         const gchar         *path);
+typedef struct
+{
+  void (* changed)               (GObject             *target,
+                                  GSettingsBackend    *backend,
+                                  const gchar         *key,
+                                  gpointer             origin_tag);
+  void (* path_changed)          (GObject             *target,
+                                  GSettingsBackend    *backend,
+                                  const gchar         *path,
+                                  gpointer             origin_tag);
+  void (* keys_changed)          (GObject             *target,
+                                  GSettingsBackend    *backend,
+                                  const gchar         *prefix,
+                                  const gchar * const *names,
+                                  gpointer             origin_tag);
+  void (* writable_changed)      (GObject             *target,
+                                  GSettingsBackend    *backend,
+                                  const gchar         *key);
+  void (* path_writable_changed) (GObject             *target,
+                                  GSettingsBackend    *backend,
+                                  const gchar         *path);
+} GSettingsListenerVTable;
 
 G_GNUC_INTERNAL
-void                    g_settings_backend_watch                        (GSettingsBackend                        *backend,
-                                                                         GObject                                 *target,
-                                                                         GMainContext                            *context,
-                                                                         GSettingsBackendChangedFunc              changed,
-                                                                         GSettingsBackendPathChangedFunc          path_changed,
-                                                                         GSettingsBackendKeysChangedFunc          keys_changed,
-                                                                         GSettingsBackendWritableChangedFunc      writable_changed,
-                                                                         GSettingsBackendPathWritableChangedFunc  path_writable_changed);
+void                    g_settings_backend_watch                        (GSettingsBackend               *backend,
+                                                                         const GSettingsListenerVTable  *vtable,
+                                                                         GObject                        *target,
+                                                                         GMainContext                   *context);
 G_GNUC_INTERNAL
-void                    g_settings_backend_unwatch                      (GSettingsBackend                     *backend,
-                                                                         GObject                              *target);
+void                    g_settings_backend_unwatch                      (GSettingsBackend               *backend,
+                                                                         GObject                        *target);
 
 G_GNUC_INTERNAL
 GTree *                 g_settings_backend_create_tree                  (void);
+
 G_GNUC_INTERNAL
-GVariant *              g_settings_backend_read                         (GSettingsBackend                     *backend,
-                                                                         const gchar                          *key,
-                                                                         const GVariantType                   *expected_type,
-                                                                         gboolean                              default_value);
-G_GNUC_INTERNAL
-gboolean                g_settings_backend_write                        (GSettingsBackend                     *backend,
-                                                                         const gchar                          *key,
-                                                                         GVariant                             *value,
-                                                                         gpointer                              origin_tag);
+GVariant *              g_settings_backend_read                         (GSettingsBackend               *backend,
+                                                                         const gchar                    *key,
+                                                                         const GVariantType             *expected_type,
+                                                                         gboolean                        default_value);
 G_GNUC_INTERNAL
-gboolean                g_settings_backend_write_tree                   (GSettingsBackend                     *backend,
-                                                                         GTree                                *tree,
-                                                                         gpointer                              origin_tag);
+gboolean                g_settings_backend_write                        (GSettingsBackend               *backend,
+                                                                         const gchar                    *key,
+                                                                         GVariant                       *value,
+                                                                         gpointer                        origin_tag);
 G_GNUC_INTERNAL
-void                    g_settings_backend_reset                        (GSettingsBackend                     *backend,
-                                                                         const gchar                          *key,
-                                                                         gpointer                              origin_tag);
-
+gboolean                g_settings_backend_write_tree                   (GSettingsBackend               *backend,
+                                                                         GTree                          *tree,
+                                                                         gpointer                        origin_tag);
 G_GNUC_INTERNAL
-void                    g_settings_backend_reset_path                   (GSettingsBackend                     *backend,
-                                                                         const gchar                          *path,
-                                                                         gpointer                              origin_tag);
-
+void                    g_settings_backend_reset                        (GSettingsBackend               *backend,
+                                                                         const gchar                    *key,
+                                                                         gpointer                        origin_tag);
 G_GNUC_INTERNAL
-gboolean                g_settings_backend_get_writable                 (GSettingsBackend                     *backend,
-                                                                         const char                           *key);
+gboolean                g_settings_backend_get_writable                 (GSettingsBackend               *backend,
+                                                                         const char                     *key);
 G_GNUC_INTERNAL
-void                    g_settings_backend_unsubscribe                  (GSettingsBackend                     *backend,
-                                                                         const char                           *name);
+void                    g_settings_backend_unsubscribe                  (GSettingsBackend               *backend,
+                                                                         const char                     *name);
 G_GNUC_INTERNAL
-void                    g_settings_backend_subscribe                    (GSettingsBackend                     *backend,
-                                                                         const char                           *name);
+void                    g_settings_backend_subscribe                    (GSettingsBackend               *backend,
+                                                                         const char                     *name);
 G_GNUC_INTERNAL
-GPermission *           g_settings_backend_get_permission               (GSettingsBackend                     *backend,
-                                                                         const gchar                          *path);
+GPermission *           g_settings_backend_get_permission               (GSettingsBackend               *backend,
+                                                                         const gchar                    *path);
 G_GNUC_INTERNAL
 GMainContext *          g_settings_backend_get_active_context           (void);
 G_GNUC_INTERNAL