pidgin: ff30fd40: jabber: Print an error message to the cu...
malu at pidgin.im
malu at pidgin.im
Sun Feb 28 14:41:23 EST 2010
-----------------------------------------------------------------
Revision: ff30fd408e0034cdac85b51ff70e7980bd37ee61
Ancestor: 33b5d6231802a257e3f964e433022b7bac4c1d21
Author: malu at pidgin.im
Date: 2010-02-28T19:34:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ff30fd408e0034cdac85b51ff70e7980bd37ee61
Modified files:
libpurple/protocols/jabber/jabber.c
ChangeLog:
jabber: Print an error message to the current conversation when failing to
send an attention using UI
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c a05f6c1749aea060c23989e18eb8a8202c832f17
+++ libpurple/protocols/jabber/jabber.c d4bb24d65359ecebcba97019904431fb4ab83d3b
@@ -2957,7 +2957,16 @@ gboolean jabber_send_attention(PurpleCon
gchar *error = NULL;
if (!_jabber_send_buzz(js, username, &error)) {
+ PurpleAccount *account = purple_connection_get_account(gc);
+ PurpleConversation *conv =
+ purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, username, account);
purple_debug_error("jabber", "jabber_send_attention: jabber_cmd_buzz failed with error: %s\n", error ? error : "(NULL)");
+
+ if (conv) {
+ purple_conversation_write(conv, username, error, PURPLE_MESSAGE_ERROR,
+ time(NULL));
+ }
+
g_free(error);
return FALSE;
}
More information about the Commits
mailing list