Mercurial > ~mikael > mcabber > hg

diff mcabber/mcabber/xmpp_iqrequest.c @ 1800:d2747442918a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When displaying a server error, show the sender JID
author Mikael Berthe <mikael@lilotux.net>
date Sat, 20 Mar 2010 15:27:26 +0100
parents e6e89b1d7831
children e6d355e50d7a
line wrap: on
line diff
--- a/mcabber/mcabber/xmpp_iqrequest.c	Sat Mar 20 15:11:13 2010 +0100
+++ b/mcabber/mcabber/xmpp_iqrequest.c	Sat Mar 20 15:27:26 2010 +0100
@@ -112,7 +112,8 @@
         break;
 
     case LM_MESSAGE_SUB_TYPE_ERROR:
-        display_server_error(lm_message_node_get_child(m->node, "error"));
+        display_server_error(lm_message_node_get_child(m->node, "error"),
+                             fjid);
         mesg = g_strdup_printf("Ping to <%s> failed.  "
                                "Response time: %d second%s %d ms.",
                                fjid, (int)dsec, dsec > 1 ? "s" : "",
@@ -217,7 +218,7 @@
   // Check for error message
   if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
     scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid);
-    display_server_error(lm_message_node_get_child(m->node, "error"));
+    display_server_error(lm_message_node_get_child(m->node, "error"), NULL);
     return LM_HANDLER_RESULT_REMOVE_MESSAGE;
   }
 
@@ -282,7 +283,7 @@
   // Check for error message
   if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
     scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid);
-    display_server_error(lm_message_node_get_child(m->node, "error"));
+    display_server_error(lm_message_node_get_child(m->node, "error"), NULL);
     return LM_HANDLER_RESULT_REMOVE_MESSAGE;
   }
 
@@ -347,7 +348,7 @@
   // Check for error message
   if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
     scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid);
-    display_server_error(lm_message_node_get_child(m->node, "error"));
+    display_server_error(lm_message_node_get_child(m->node, "error"), NULL);
     return LM_HANDLER_RESULT_REMOVE_MESSAGE;
   }
 
@@ -530,7 +531,7 @@
   // Check for error message
   if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
     scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid);
-    display_server_error(lm_message_node_get_child(m->node, "error"));
+    display_server_error(lm_message_node_get_child(m->node, "error"), NULL);
     return LM_HANDLER_RESULT_REMOVE_MESSAGE;
   }