jcarr
/
libnotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable animation support on D-BUS 0.3x, since arrays of arrays of a type seems broken.

This commit is contained in:
Christian Hammond 2005-07-28 05:57:47 +00:00
parent ca4d385fa6
commit f40ef57aae
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Jul 25 18:03:12 PDT 2005 Christian Hammond <chipx86@gnupdate.org>
* libnotify/notify.c:
- Disable animation support on D-BUS 0.3x, since arrays of arrays
of a type seems broken.
Mon Jul 25 18:00:12 PDT 2005 Christian Hammond <chipx86@gnupdate.org> Mon Jul 25 18:00:12 PDT 2005 Christian Hammond <chipx86@gnupdate.org>
* libnotify/notify.c: * libnotify/notify.c:

16
libnotify/notify.c
View File

@ -794,13 +794,8 @@ notify_send_notification_varg(NotifyHandle *replaces, const char *type,
{ {
int i; int i;
#if NOTIFY_CHECK_DBUS_VERSION(0, 30) #if !NOTIFY_CHECK_DBUS_VERSION(0, 30)
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
DBUS_TYPE_ARRAY_AS_STRING,
&array_iter);
#else
dbus_message_iter_append_array(&iter, &array_iter, DBUS_TYPE_ARRAY); dbus_message_iter_append_array(&iter, &array_iter, DBUS_TYPE_ARRAY);
#endif
for (i = 0; i < icon->frames; i++) for (i = 0; i < icon->frames; i++)
{ {
@ -808,8 +803,13 @@ notify_send_notification_varg(NotifyHandle *replaces, const char *type,
icon->raw_data[i], icon->raw_data[i],
icon->raw_len[i]); icon->raw_len[i]);
} }
#else
dbus_message_iter_close_container(&iter, &array_iter); /*
* I can't figure this out for D-BUS 0.3x, so we just won't
* support it
*/
_notify_dbus_message_iter_append_string_or_empty(&iter, NULL);
#endif
} }
else else
{ {