[dconf] the dbus call is "Unset", not reset.



commit d2b1aefd7a19ad54d87c90be16923019969cf575
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Oct 7 15:48:38 2009 -0400

    the dbus call is "Unset", not reset.

 dconf/dconf-dbus.c |   14 +++++++-------
 dconf/dconf-dbus.h |    4 ++--
 dconf/dconf.c      |    4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/dconf/dconf-dbus.c b/dconf/dconf-dbus.c
index 97c92fe..e9a09e8 100644
--- a/dconf/dconf-dbus.c
+++ b/dconf/dconf-dbus.c
@@ -693,15 +693,15 @@ dconf_dbus_set_async (DConfDBus                   *bus,
   dconf_dbus_async_call (bus, message, callback, user_data);
 }
 
-/* == reset == */
+/* == unset == */
 static DBusMessage *
-dconf_dbus_new_reset_call (DConfDBus    *bus,
+dconf_dbus_new_unset_call (DConfDBus    *bus,
                            const gchar  *key)
 {
   DBusMessageIter iter;
   DBusMessage *message;
 
-  message = dconf_dbus_new_call (bus, "Reset");
+  message = dconf_dbus_new_call (bus, "Unset");
 
   dbus_message_iter_init_append (message, &iter);
   dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &key);
@@ -710,22 +710,22 @@ dconf_dbus_new_reset_call (DConfDBus    *bus,
 }
 
 gboolean
-dconf_dbus_reset (DConfDBus    *bus,
+dconf_dbus_unset (DConfDBus    *bus,
                   const gchar  *key,
                   gchar       **event_id,
                   GError      **error)
 {
-  DBusMessage *message = dconf_dbus_new_reset_call (bus, key);
+  DBusMessage *message = dconf_dbus_new_unset_call (bus, key);
   return dconf_dbus_blocking_call (bus, message, "u", event_id, error);
 }
 
 void
-dconf_dbus_reset_async (DConfDBus                   *bus,
+dconf_dbus_unset_async (DConfDBus                   *bus,
                         const gchar                 *key,
                         DConfDBusAsyncReadyCallback  callback,
                         gpointer                     user_data)
 {
-  DBusMessage *message = dconf_dbus_new_reset_call (bus, key);
+  DBusMessage *message = dconf_dbus_new_unset_call (bus, key);
   dconf_dbus_async_call (bus, message, callback, user_data);
 }
 
diff --git a/dconf/dconf-dbus.h b/dconf/dconf-dbus.h
index b506c22..4b72a59 100644
--- a/dconf/dconf-dbus.h
+++ b/dconf/dconf-dbus.h
@@ -39,11 +39,11 @@ void                    dconf_dbus_set_async                            (DConfDB
                                                                          DConfDBusAsyncReadyCallback   callback,
                                                                          gpointer                      user_data);
 
-gboolean                dconf_dbus_reset                                (DConfDBus                    *bus,
+gboolean                dconf_dbus_unset                                (DConfDBus                    *bus,
                                                                          const gchar                  *path,
                                                                          gchar                       **event_id,
                                                                          GError                      **error);
-void                    dconf_dbus_reset_async                          (DConfDBus                    *bus,
+void                    dconf_dbus_unset_async                          (DConfDBus                    *bus,
                                                                          const gchar                  *path,
                                                                          DConfDBusAsyncReadyCallback   callback,
                                                                          gpointer                      user_data);
diff --git a/dconf/dconf.c b/dconf/dconf.c
index dd934eb..933a7dd 100644
--- a/dconf/dconf.c
+++ b/dconf/dconf.c
@@ -920,7 +920,7 @@ dconf_reset (const gchar  *key,
   if ((mount = dconf_demux_path (&key, TRUE, error)) == NULL)
     return FALSE;
 
-  return dconf_dbus_reset (mount->dbs[0]->bus, key, event_id, error);
+  return dconf_dbus_unset (mount->dbs[0]->bus, key, event_id, error);
 }
 
 /**
@@ -954,7 +954,7 @@ dconf_reset_async (const gchar             *key,
       return;
     }
 
-  dconf_dbus_reset_async (mount->dbs[0]->bus, key,
+  dconf_dbus_unset_async (mount->dbs[0]->bus, key,
                           (DConfDBusAsyncReadyCallback) callback,
                           user_data);
 }



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