im.pidgin.pidgin: 28c88b669dfc47aca88a5e7923fc4746047d8f48

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 28c88b669dfc47aca88a5e7923fc4746047d8f48
Ancestor: 809c8120ab77e68276baba04b130d65aa1cae31a
Author: nosnilmot at pidgin.im
Date: 2008-02-26T14:11:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/28c88b669dfc47aca88a5e7923fc4746047d8f48

Modified files:
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc10/util.c

ChangeLog: 

chomp chomp chomp chomp chomp chomp chomp chomp chomp chomp 

-------------- next part --------------
============================================================
--- libpurple/protocols/silc/util.c	723fdec49aadd6d17746a0e9dcc7c366adce0051
+++ libpurple/protocols/silc/util.c	39d4c4b22ea5b41e7a18205370089578a759bb16
@@ -442,6 +442,7 @@ void silcpurple_get_umode_string(SilcUIn
 		strcat(buf, "[rejects watching] ");
 	if (mode & SILC_UMODE_BLOCK_INVITE)
 		strcat(buf, "[blocks invites] ");
+	g_strchomp(buf);
 }
 
 void silcpurple_get_chmode_string(SilcUInt32 mode, char *buf,
@@ -470,6 +471,7 @@ void silcpurple_get_chmode_string(SilcUI
 		strcat(buf, "[users silenced] ");
 	if (mode & SILC_CHANNEL_MODE_SILENCE_OPERS)
 		strcat(buf, "[operators silenced] ");
+	g_strchomp(buf);
 }
 
 void silcpurple_get_chumode_string(SilcUInt32 mode, char *buf,
@@ -488,6 +490,7 @@ void silcpurple_get_chumode_string(SilcU
 		strcat(buf, "[blocks robot messages] ");
 	if (mode & SILC_CHANNEL_UMODE_QUIET)
 		strcat(buf, "[quieted] ");
+	g_strchomp(buf);
 }
 
 void
@@ -544,6 +547,7 @@ silcpurple_parse_attrs(SilcDList attrs, 
 	if (strlen(s->str)) {
 		*moodstr = s->str;
 		g_string_free(s, FALSE);
+		g_strchomp(*moodstr);
 	} else
 		g_string_free(s, TRUE);
 
@@ -573,6 +577,7 @@ silcpurple_parse_attrs(SilcDList attrs, 
 	if (strlen(s->str)) {
 		*contactstr = s->str;
 		g_string_free(s, FALSE);
+		g_strchomp(*contactstr);
 	} else
 		g_string_free(s, TRUE);
 
============================================================
--- libpurple/protocols/silc10/util.c	0157a4cdad2d9eb20951943d79d6abf9c1353b70
+++ libpurple/protocols/silc10/util.c	8900079b4371f25fd62216e63a1504588bbc155e
@@ -432,6 +432,7 @@ void silcpurple_get_umode_string(SilcUIn
 		strcat(buf, "[rejects watching] ");
 	if (mode & SILC_UMODE_BLOCK_INVITE)
 		strcat(buf, "[blocks invites] ");
+	g_strchomp(buf);
 }
 
 void silcpurple_get_chmode_string(SilcUInt32 mode, char *buf,
@@ -460,6 +461,7 @@ void silcpurple_get_chmode_string(SilcUI
 		strcat(buf, "[users silenced] ");
 	if (mode & SILC_CHANNEL_MODE_SILENCE_OPERS)
 		strcat(buf, "[operators silenced] ");
+	g_strchomp(buf);
 }
 
 void silcpurple_get_chumode_string(SilcUInt32 mode, char *buf,
@@ -478,6 +480,7 @@ void silcpurple_get_chumode_string(SilcU
 		strcat(buf, "[blocks robot messages] ");
 	if (mode & SILC_CHANNEL_UMODE_QUIET)
 		strcat(buf, "[quieted] ");
+	g_strchomp(buf);
 }
 
 void
@@ -534,6 +537,7 @@ silcpurple_parse_attrs(SilcDList attrs, 
 	if (strlen(s->str)) {
 		*moodstr = s->str;
 		g_string_free(s, FALSE);
+		g_strchomp(*moodstr);
 	} else
 		g_string_free(s, TRUE);
 
@@ -563,6 +567,7 @@ silcpurple_parse_attrs(SilcDList attrs, 
 	if (strlen(s->str)) {
 		*contactstr = s->str;
 		g_string_free(s, FALSE);
+		g_strchomp(*contactstr);
 	} else
 		g_string_free(s, TRUE);