diff options
| author | Richard Hult <rhult@src.gnome.org> | 2003-11-26 15:18:45 +0000 |
|---|---|---|
| committer | Richard Hult <rhult@src.gnome.org> | 2003-11-26 15:18:45 +0000 |
| commit | 76d6835903440252d2281377975e5673386e0b6e (patch) | |
| tree | 07315f49a1c0c53d6bcf12fde76d54eb06578245 | |
| parent | 5c777e6400e22037bb34d723b245e01ba4a9aba7 (diff) | |
| download | gconf-76d6835903440252d2281377975e5673386e0b6e.tar.gz | |
More work.
| -rw-r--r-- | gconf/gconf-dbus-utils.c | 9 | ||||
| -rw-r--r-- | gconf/gconf-dbus-utils.h | 4 | ||||
| -rw-r--r-- | gconf/gconf-dbus.c | 2 |
3 files changed, 5 insertions, 10 deletions
diff --git a/gconf/gconf-dbus-utils.c b/gconf/gconf-dbus-utils.c index 2f13ca0b..1a9c0bc8 100644 --- a/gconf/gconf-dbus-utils.c +++ b/gconf/gconf-dbus-utils.c @@ -676,7 +676,7 @@ check_next_dict_key (DBusMessageIter *dict, const gchar *key) gchar *name; gboolean ret_val = FALSE; - name = dbus_message_iter_get_dict_key (&dict); + name = dbus_message_iter_get_dict_key (dict); if (!name) return FALSE; @@ -690,17 +690,14 @@ check_next_dict_key (DBusMessageIter *dict, const gchar *key) gboolean gconf_dbus_get_entry_values_from_message_iter (DBusMessageIter *iter, - const gchar **key, + gchar **key, GConfValue **value, gboolean *is_default, gboolean *is_writable, - const gchar **schema_name) + gchar **schema_name) { DBusMessageIter dict; - g_return_val_if_fail (key != NULL, FALSE); - g_return_val_if_fail (value != NULL, FALSE); - dbus_message_iter_init_dict_iterator (iter, &dict); while (1) diff --git a/gconf/gconf-dbus-utils.h b/gconf/gconf-dbus-utils.h index 02c803cc..811b499a 100644 --- a/gconf/gconf-dbus-utils.h +++ b/gconf/gconf-dbus-utils.h @@ -93,10 +93,10 @@ void gconf_dbus_message_append_entry (DBusMessage *messa gboolean is_writable, const gchar *schema_name); gboolean gconf_dbus_get_entry_values_from_message_iter (DBusMessageIter *iter, - const gchar **key, + gchar **key, GConfValue **value, gboolean *is_default, gboolean *is_writable, - const gchar **schema_name); + gchar **schema_name); #endif/* GCONF_DBUS_UTILS_H */ diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c index be0d2312..c2101723 100644 --- a/gconf/gconf-dbus.c +++ b/gconf/gconf-dbus.c @@ -1939,8 +1939,6 @@ gconf_activate_service (gboolean start_if_not_found, { const gchar *msg; - g_print ("ERROR\n"); - if (dbus_error_is_set (&error)) msg = error.message; else |