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

Send the list of button texts as a string array, rather than appending each one individually.

This commit is contained in:
Christian Hammond 2004-06-28 03:02:38 +00:00
parent 26727e0933
commit eb30d19b88
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libnotify/notify.c
View File

@ -365,6 +365,7 @@ _notify_send_request(NotifyUrgency urgency, const char *summary,
guint32 i; guint32 i;
char *text; char *text;
NotifyCallback cb; NotifyCallback cb;
char **array;
message = _notify_dbus_message_new("SendRequest", &iter); message = _notify_dbus_message_new("SendRequest", &iter);
@ -382,16 +383,22 @@ _notify_send_request(NotifyUrgency urgency, const char *summary,
dbus_message_iter_append_uint32(&iter, timeout); dbus_message_iter_append_uint32(&iter, timeout);
dbus_message_iter_append_uint32(&iter, default_button); dbus_message_iter_append_uint32(&iter, default_button);
dbus_message_iter_append_uint32(&iter, button_count);
array = g_new0(char *, button_count);
for (i = 0; i < button_count; i++) for (i = 0; i < button_count; i++)
{ {
text = va_arg(buttons, char *); text = va_arg(buttons, char *);
cb = va_arg(buttons, NotifyCallback); cb = va_arg(buttons, NotifyCallback);
dbus_message_iter_append_string(&iter, text); array[i] = text;
} }
dbus_message_iter_append_string_array(&iter, (const char **)array,
button_count);
g_free(array);
dbus_error_init(&error); dbus_error_init(&error);
reply = dbus_connection_send_with_reply_and_block(_dbus_conn, message, reply = dbus_connection_send_with_reply_and_block(_dbus_conn, message,