[glib/new-gsettings] signals changes



commit 171d293b6fa0ed148e8e939c356d191cee4d4400
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Apr 14 09:37:14 2010 -0400

    signals changes

 gio/gio-marshal.list   |    2 +-
 gio/gsettingsbackend.c |   32 +++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/gio/gio-marshal.list b/gio/gio-marshal.list
index 49c2916..b4d5390 100644
--- a/gio/gio-marshal.list
+++ b/gio/gio-marshal.list
@@ -4,5 +4,5 @@ VOID:BOOLEAN,POINTER
 VOID:OBJECT,OBJECT,ENUM
 BOOLEAN:OBJECT,OBJECT
 VOID:STRING,BOXED,BOXED
-VOID:STRING,BOXED,INT,POINTER
+VOID:STRING,BOXED,POINTER
 VOID:POINTER,INT
diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c
index a348dd1..1940e5d 100644
--- a/gio/gsettingsbackend.c
+++ b/gio/gsettingsbackend.c
@@ -62,7 +62,6 @@ enum {
  * @backend: a #GSettingsBackend implementation
  * @prefix: a common prefix of the changed keys
  * @items: the %NULL-terminated list of changed keys
- * @n_items: the number of items in @items. May be -1
  * @origin_tag: the origin tag
  *
  * Emits the changed signal on @backend.  This function should only be
@@ -349,8 +348,6 @@ g_settings_backend_class_init (GSettingsBackendClass *class)
    * @backend: the object on which the signal was emitted
    * @prefix: a common prefix of the changed keys
    * @items: the list of changed keys
-   * @n_items: the number of items in @items. May be -1 if @items is
-   *     %NULL-terminated
    * @origin_tag: the origin tag
    *
    * The "changed" signal gets emitted when one or more keys change
@@ -365,15 +362,32 @@ g_settings_backend_class_init (GSettingsBackendClass *class)
    *
    * Since: 2.26
    */
-  changed_signal =
-    g_signal_new ("changed", G_TYPE_SETTINGS_BACKEND,
+  value_changed_signal =
+    g_signal_new ("value-changed", G_TYPE_SETTINGS_BACKEND,
                   G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GSettingsBackendClass, changed),
+                  G_STRUCT_OFFSET (GSettingsBackendClass, value_changed),
+                  NULL, NULL,
+                  _gio_marshal_VOID__STRING_POINTER, G_TYPE_NONE,
+                  2, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE |
+                  G_TYPE_POINTER);
+
+  multiple_changed_signal =
+    g_signal_new ("multiple-changed", G_TYPE_SETTINGS_BACKEND,
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GSettingsBackendClass, multiple_changed),
                   NULL, NULL,
                   _gio_marshal_VOID__STRING_BOXED_INT_POINTER, G_TYPE_NONE,
-                  4, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
-                  G_TYPE_STRV | G_SIGNAL_TYPE_STATIC_SCOPE,
-                  G_TYPE_INT, G_TYPE_POINTER);
+                  3, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
+                  G_TYPE_STRV | G_SIGNAL_TYPE_STATIC_SCOPE, G_TYPE_POINTER);
+
+  writable_changed_signal =
+    g_signal_new ("writable-changed", G_TYPE_SETTINGS_BACKEND,
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GSettingsBackendClass, writable_changed),
+                  NULL, NULL,
+                  _gio_marshal_VOID__STRING_POINTER, G_TYPE_NONE,
+                  2, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE |
+                  G_TYPE_POINTER);
 
   /**
    * GSettingsBackend:context:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]