From: Enlightenment S. <no-...@en...> - 2011-11-30 21:51:59
|
Log: fixed enotify bug!!!! Author: discomfitor Date: 2011-11-30 13:51:41 -0800 (Wed, 30 Nov 2011) New Revision: 65729 Trac: http://trac.enlightenment.org/e/changeset/65729 Modified: trunk/e_dbus/src/lib/notification/marshal.c Modified: trunk/e_dbus/src/lib/notification/marshal.c =================================================================== --- trunk/e_dbus/src/lib/notification/marshal.c 2011-11-30 18:34:41 UTC (rev 65728) +++ trunk/e_dbus/src/lib/notification/marshal.c 2011-11-30 21:51:41 UTC (rev 65729) @@ -8,27 +8,12 @@ #include "e_notify_private.h" void -e_notify_marshal_dict_struct(DBusMessageIter *iter, const char *key, char *type_str, E_DBus_Variant_Marshaller func, void *data) -{ - DBusMessageIter entry, variant; - - dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, "sv", &entry); - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); - func(&entry, data); - dbus_message_iter_open_container(&entry, DBUS_TYPE_STRUCT, type_str, &variant); - func(&variant, data); - dbus_message_iter_close_container(&entry, &variant); - dbus_message_iter_close_container(iter, &entry); -} - -void e_notify_marshal_dict_variant(DBusMessageIter *iter, const char *key, char *type_str, E_DBus_Variant_Marshaller func, void *data) { DBusMessageIter entry, variant; dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, "sv", &entry); dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); - func(&entry, data); dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, type_str, &variant); func(&variant, data); dbus_message_iter_close_container(&entry, &variant); @@ -369,7 +354,7 @@ if (n->hints.desktop) e_notify_marshal_dict_string(&sub, "desktop_entry", n->hints.desktop); if (n->hints.image_data) - e_notify_marshal_dict_struct(&sub, "image-data", "(iiibiiay)", E_DBUS_VARIANT_MARSHALLER(e_notify_marshal_hint_image), n->hints.image_data); + e_notify_marshal_dict_variant(&sub, "image-data", "(iiibiiay)", E_DBUS_VARIANT_MARSHALLER(e_notify_marshal_hint_image), n->hints.image_data); if (n->hints.sound_file) e_notify_marshal_dict_string(&sub, "sound-file", n->hints.sound_file); if (n->hints.suppress_sound) /* we only need to send this if its true */ |
From: Enlightenment S. <no-...@en...> - 2011-12-03 04:15:57
|
Log: fix incorrect usage of dbus_message_iter_open_container Author: discomfitor Date: 2011-12-02 20:15:50 -0800 (Fri, 02 Dec 2011) New Revision: 65836 Trac: http://trac.enlightenment.org/e/changeset/65836 Modified: trunk/e_dbus/src/lib/notification/marshal.c Modified: trunk/e_dbus/src/lib/notification/marshal.c =================================================================== --- trunk/e_dbus/src/lib/notification/marshal.c 2011-12-03 03:50:20 UTC (rev 65835) +++ trunk/e_dbus/src/lib/notification/marshal.c 2011-12-03 04:15:50 UTC (rev 65836) @@ -12,7 +12,7 @@ { DBusMessageIter entry, variant; - if (dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, "sv", &entry)) + if (dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, NULL, &entry)) { dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); if (dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, type_str, &variant)) @@ -37,7 +37,7 @@ { DBusMessageIter entry, variant; - if (dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, "sv", &entry)) + if (dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, NULL, &entry)) { dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); if (dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, "s", &variant)) @@ -91,7 +91,7 @@ if (!key || !value) return; - if (dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, "sv", &entry)) + if (dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, NULL, &entry)) { dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); if (dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, "i", &variant)) |