summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2011-07-30 23:06:53 +0200
committerRob Bradford <rob@linux.intel.com>2011-08-15 15:29:41 +0100
commit6736f42ce5172b44083a9089ff4a777ed1c5bdc3 (patch)
treecc45c8a0f6ee894c28fdc940fd7db0bc0e3e8c8b
parentc9c85796088485f84aede8ffe649f9bdf0c609f9 (diff)
downloadgconf-6736f42ce5172b44083a9089ff4a777ed1c5bdc3.tar.gz
gconf(d)-dbus: Use correct type, 'o', for object paths
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=655656
-rw-r--r--gconf/gconf-dbus.c2
-rw-r--r--gconf/gconfd-dbus.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
index 63655e17..4b74bb8e 100644
--- a/gconf/gconf-dbus.c
+++ b/gconf/gconf-dbus.c
@@ -545,7 +545,7 @@ ensure_database (GConfEngine *conf,
dbus_message_get_args (reply,
NULL,
- DBUS_TYPE_STRING, &db,
+ DBUS_TYPE_OBJECT_PATH, &db,
DBUS_TYPE_INVALID);
if (db == NULL)
diff --git a/gconf/gconfd-dbus.c b/gconf/gconfd-dbus.c
index 45321add..6f42ef57 100644
--- a/gconf/gconfd-dbus.c
+++ b/gconf/gconfd-dbus.c
@@ -140,7 +140,7 @@ server_real_handle_get_db (DBusConnection *connection,
str = gconf_database_dbus_get_path (db);
dbus_message_append_args (reply,
- DBUS_TYPE_STRING, &str,
+ DBUS_TYPE_OBJECT_PATH, &str,
DBUS_TYPE_INVALID);
if (!dbus_connection_send (connection, reply, NULL))