summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/dbus.c
diff options
context:
space:
mode:
authorracarr <racarr@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-26 13:04:08 +0000
committerracarr <racarr@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2007-01-26 13:04:08 +0000
commitb7f62a852173a7834ae9cc02259f34431b2d5085 (patch)
tree367367292799d5d49c475134cdce2af852edbbcb /beryl-plugins/src/dbus.c
parent0433269983081e1a7a4483b70e7a32cd0714bc40 (diff)
downloadmarex-dev-b7f62a852173a7834ae9cc02259f34431b2d5085.tar.gz
marex-dev-b7f62a852173a7834ae9cc02259f34431b2d5085.tar.bz2
More upstream love for dbus
git-svn-id: file:///beryl/trunk@3173 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/dbus.c')
-rw-r--r--beryl-plugins/src/dbus.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/beryl-plugins/src/dbus.c b/beryl-plugins/src/dbus.c
index d927c3c..97efd66 100644
--- a/beryl-plugins/src/dbus.c
+++ b/beryl-plugins/src/dbus.c
@@ -829,6 +829,19 @@ dbusHandleGetMetadataMessage(DBusConnection * connection,
DBUS_TYPE_INVALID);
} break;
case CompOptionTypeString:
+ {
+
+
+ DBusMessageIter iter;
+ DBusMessageIter listIter;
+ char sig[2];
+
+ sig[0] = DBUS_TYPE_STRING;
+ sig[1] = '\0';
+
+ dbus_message_iter_init_append (reply, &iter);
+ dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
+ sig, &listIter);
if (option->rest.s.nString)
{
char *possible;
@@ -838,17 +851,19 @@ dbusHandleGetMetadataMessage(DBusConnection * connection,
{
possible = option->rest.s.string[i];
- dbus_message_append_args(reply,
- DBUS_TYPE_STRING,
- &possible,
- DBUS_TYPE_INVALID);
+ dbus_message_iter_append_basic(&listIter,DBUS_TYPE_STRING,&possible);
}
+
}
+ dbus_message_iter_close_container(&iter,&listIter);
+ }
default:
break;
}
+
break;
- }
+
+ }
option++;
}