Mercurial > ~mikael > mcabber > hg

comparison 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
comparison
equal deleted inserted replaced
1799:e73cd9377a4e 1800:d2747442918a
110 (int)dsec, dsec > 1 ? "s" : "", 110 (int)dsec, dsec > 1 ? "s" : "",
111 (int)(dusec/1000L)); 111 (int)(dusec/1000L));
112 break; 112 break;
113 113
114 case LM_MESSAGE_SUB_TYPE_ERROR: 114 case LM_MESSAGE_SUB_TYPE_ERROR:
115 display_server_error(lm_message_node_get_child(m->node, "error")); 115 display_server_error(lm_message_node_get_child(m->node, "error"),
116 fjid);
116 mesg = g_strdup_printf("Ping to <%s> failed. " 117 mesg = g_strdup_printf("Ping to <%s> failed. "
117 "Response time: %d second%s %d ms.", 118 "Response time: %d second%s %d ms.",
118 fjid, (int)dsec, dsec > 1 ? "s" : "", 119 fjid, (int)dsec, dsec > 1 ? "s" : "",
119 (int)(dusec/1000L)); 120 (int)(dusec/1000L));
120 break; 121 break;
215 } 216 }
216 217
217 // Check for error message 218 // Check for error message
218 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { 219 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
219 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid); 220 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid);
220 display_server_error(lm_message_node_get_child(m->node, "error")); 221 display_server_error(lm_message_node_get_child(m->node, "error"), NULL);
221 return LM_HANDLER_RESULT_REMOVE_MESSAGE; 222 return LM_HANDLER_RESULT_REMOVE_MESSAGE;
222 } 223 }
223 224
224 // Check message contents 225 // Check message contents
225 ansqry = lm_message_node_get_child(m->node, "query"); 226 ansqry = lm_message_node_get_child(m->node, "query");
280 } 281 }
281 282
282 // Check for error message 283 // Check for error message
283 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { 284 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
284 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid); 285 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid);
285 display_server_error(lm_message_node_get_child(m->node, "error")); 286 display_server_error(lm_message_node_get_child(m->node, "error"), NULL);
286 return LM_HANDLER_RESULT_REMOVE_MESSAGE; 287 return LM_HANDLER_RESULT_REMOVE_MESSAGE;
287 } 288 }
288 289
289 // Check message contents 290 // Check message contents
290 ansqry = lm_message_node_get_child(m->node, "query"); 291 ansqry = lm_message_node_get_child(m->node, "query");
345 } 346 }
346 347
347 // Check for error message 348 // Check for error message
348 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { 349 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
349 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid); 350 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid);
350 display_server_error(lm_message_node_get_child(m->node, "error")); 351 display_server_error(lm_message_node_get_child(m->node, "error"), NULL);
351 return LM_HANDLER_RESULT_REMOVE_MESSAGE; 352 return LM_HANDLER_RESULT_REMOVE_MESSAGE;
352 } 353 }
353 354
354 // Check message contents 355 // Check message contents
355 ansqry = lm_message_node_get_child(m->node, "query"); 356 ansqry = lm_message_node_get_child(m->node, "query");
528 } 529 }
529 530
530 // Check for error message 531 // Check for error message
531 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { 532 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
532 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid); 533 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid);
533 display_server_error(lm_message_node_get_child(m->node, "error")); 534 display_server_error(lm_message_node_get_child(m->node, "error"), NULL);
534 return LM_HANDLER_RESULT_REMOVE_MESSAGE; 535 return LM_HANDLER_RESULT_REMOVE_MESSAGE;
535 } 536 }
536 537
537 buf = g_strdup_printf("Received IQ:vCard result from <%s>", bjid); 538 buf = g_strdup_printf("Received IQ:vCard result from <%s>", bjid);
538 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); 539 scr_LogPrint(LPRINT_LOGNORM, "%s", buf);