# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1148197783 -7200
# Node ID 5ed97fc7afa01213fc8df8c3b24f2537edb6c014
# Parent  e1adea19ba140a5333fc2a687afc72fc0b407064
Strip trailing empty lines from error messages

diff -r e1adea19ba14 -r 5ed97fc7afa0 mcabber/src/jabglue.c
--- a/mcabber/src/jabglue.c	Sun May 21 09:49:04 2006 +0200
+++ b/mcabber/src/jabglue.c	Sun May 21 09:49:43 2006 +0200
@@ -856,6 +856,7 @@
 void display_server_error(xmlnode x)
 {
   const char *desc = NULL;
+  char *sdesc;
   int code = 0;
   char *s;
   const char *p;
@@ -885,7 +886,16 @@
   s = xmlnode_get_tag_data(x, "text");
   if (s && *s) desc = s;
 
-  scr_LogPrint(LPRINT_LOGNORM, "Error code from server: %d %s", code, desc);
+  // Strip trailing newlines
+  sdesc = g_strdup(desc);
+  for (s = sdesc; *s; s++) ;
+  if (s > sdesc)
+    s--;
+  while (s >= sdesc && (*s == '\n' || *s == '\r'))
+    *s-- = '\0';
+
+  scr_LogPrint(LPRINT_LOGNORM, "Error code from server: %d %s", code, sdesc);
+  g_free(sdesc);
 }
 
 static void statehandler(jconn conn, int state)