diff options
| author | Christian Hammond <chipx86@chipx86.com> | 2005-07-28 18:22:09 +0000 |
|---|---|---|
| committer | Christian Hammond <chipx86@chipx86.com> | 2005-07-28 18:22:09 +0000 |
| commit | e09f9293735bd9548eedc9619c7b48922ba6b6a2 (patch) | |
| tree | 0252807fe8b95d9af5ad915bf64b473a8a0ab33f | |
| parent | bf6d0d7d0b8da88771bca0fb3a3ac251f8020a29 (diff) | |
| download | libnotify-e09f9293735bd9548eedc9619c7b48922ba6b6a2.tar.gz | |
Use a variant type for the hint dictionary values. This let's us actually use various data types in D-BUS 0.3x.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnotify/notify.c | 31 | ||||
| -rw-r--r-- | tests/test-xy.c | 2 |
3 files changed, 31 insertions, 9 deletions
@@ -1,3 +1,10 @@ +Mon Jul 25 22:47:02 PDT 2005 Christian Hammond <chipx86@gnupdate.org> + + * libnotify/notify.c: + * tests/test-xy.c: + - Use a variant type for the hint dictionary values. This let's us + actually use various data types in D-BUS 0.3x. + Thu Jul 28 01:54:27 PDT 2005 Christian Hammond <chipx86@chipx86.com> * docs/notification-spec.xml: diff --git a/libnotify/notify.c b/libnotify/notify.c index 55998c1..cbd85f1 100644 --- a/libnotify/notify.c +++ b/libnotify/notify.c @@ -815,7 +815,7 @@ hint_foreach_func(const gchar *key, NotifyHintData *hint, DBusMessageIter *iter) { #if NOTIFY_CHECK_DBUS_VERSION(0, 30) - DBusMessageIter entry_iter; + DBusMessageIter entry_iter, value_iter; dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter); @@ -824,26 +824,42 @@ hint_foreach_func(const gchar *key, NotifyHintData *hint, switch (hint->type) { case HINT_TYPE_STRING: - dbus_message_iter_append_basic(&entry_iter, DBUS_TYPE_STRING, + dbus_message_iter_open_container(&entry_iter, DBUS_TYPE_VARIANT, + DBUS_TYPE_STRING_AS_STRING, + &value_iter); + dbus_message_iter_append_basic(&value_iter, DBUS_TYPE_STRING, &hint->u.string); + dbus_message_iter_close_container(&entry_iter, &value_iter); break; case HINT_TYPE_INT: - dbus_message_iter_append_basic(&entry_iter, DBUS_TYPE_INT32, + dbus_message_iter_open_container(&entry_iter, DBUS_TYPE_VARIANT, + DBUS_TYPE_INT32_AS_STRING, + &value_iter); + dbus_message_iter_append_basic(&value_iter, DBUS_TYPE_INT32, &hint->u.integer); + dbus_message_iter_close_container(&entry_iter, &value_iter); break; case HINT_TYPE_BOOL: - dbus_message_iter_append_basic(&entry_iter, DBUS_TYPE_BOOLEAN, + dbus_message_iter_open_container(&entry_iter, DBUS_TYPE_VARIANT, + DBUS_TYPE_BOOLEAN_AS_STRING, + &value_iter); + dbus_message_iter_append_basic(&value_iter, DBUS_TYPE_BOOLEAN, &hint->u.boolean); + dbus_message_iter_close_container(&entry_iter, &value_iter); break; default: { /* Better than nothing... */ char *empty = ""; - dbus_message_iter_append_basic(&entry_iter, DBUS_TYPE_STRING, + dbus_message_iter_open_container(&entry_iter, DBUS_TYPE_VARIANT, + DBUS_TYPE_STRING_AS_STRING, + &value_iter); + dbus_message_iter_append_basic(&value_iter, DBUS_TYPE_STRING, &empty); + dbus_message_iter_close_container(&entry_iter, &value_iter); break; } } @@ -916,9 +932,8 @@ notify_send_notification_varg(NotifyHandle *replaces, const char *type, } else if (icon->raw_data) { - int i; - #if !NOTIFY_CHECK_DBUS_VERSION(0, 30) + int i; dbus_message_iter_append_array(&iter, &array_iter, DBUS_TYPE_ARRAY); for (i = 0; i < icon->frames; i++) @@ -1009,7 +1024,7 @@ notify_send_notification_varg(NotifyHandle *replaces, const char *type, dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_STRING_AS_STRING - DBUS_TYPE_STRING_AS_STRING + DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict_iter); #else diff --git a/tests/test-xy.c b/tests/test-xy.c index 30e670b..ce36aa8 100644 --- a/tests/test-xy.c +++ b/tests/test-xy.c @@ -24,7 +24,7 @@ #include <unistd.h> int main() { - GHashTable *hints; + NotifyHints *hints; notify_init("XY"); |