pidgin: 46a55cc9: Fix merge.

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 46a55cc96572a5407be3c98301b03f9466a7cb40
Ancestor: 13fcee3e431cd9e683fc75f1770f2a65f253a7d1
Author: sadrul at pidgin.im
Date: 2010-02-01T22:00:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/46a55cc96572a5407be3c98301b03f9466a7cb40

Modified files:
        pidgin/gtkthemes.c

ChangeLog: 

Fix merge.

-------------- next part --------------
============================================================
--- pidgin/gtkthemes.c	b68b6c555d9d95472d3027f232c74569807bfe1a
+++ pidgin/gtkthemes.c	ffa9442384081a7ef5f81ebbbb6898c64ce44c46
@@ -263,7 +263,14 @@ void pidgin_themes_load_smiley_theme(con
 
 		if (buf[0] == '#' || buf[0] == '\0')
 			continue;
-
+		else {
+			int len = strlen(buf);
+			while (len && (buf[len - 1] == '\r' || buf[len - 1] == '\n'))
+				buf[--len] = '\0';
+			if (len == 0)
+				continue;
+		}
+		
 		i = buf;
 		while (isspace(*i))
 			i++;
@@ -280,25 +287,17 @@ void pidgin_themes_load_smiley_theme(con
 				list->smileys = g_slist_reverse(list->smileys);
 			list = child;
 		} else if (!g_ascii_strncasecmp(i, "Name=", strlen("Name="))) {
-			int len;
 			g_free(theme->name);
 			theme->name = g_strdup(i + strlen("Name="));
-			len = strlen(theme->name);
-			theme->name[len-1] = 0;
-			if(len > 2 && theme->name[len-2] == '\r')
-				theme->name[len-2] = 0;
 		} else if (!g_ascii_strncasecmp(i, "Description=", strlen("Description="))) {
 			g_free(theme->desc);
 			theme->desc = g_strdup(i + strlen("Description="));
-			theme->desc[strlen(theme->desc)-1] = 0;
 		} else if (!g_ascii_strncasecmp(i, "Icon=", strlen("Icon="))) {
 			g_free(theme->icon);
 			theme->icon = g_build_filename(dirname, i + strlen("Icon="), NULL);
-			theme->icon[strlen(theme->icon)-1] = 0;
 		} else if (!g_ascii_strncasecmp(i, "Author=", strlen("Author="))) {
 			g_free(theme->author);
 			theme->author = g_strdup(i + strlen("Author="));
-			theme->author[strlen(theme->author)-1] = 0;
 		} else if (load && list) {
 			gboolean hidden = FALSE;
 			char *sfile = NULL;
@@ -311,7 +310,7 @@ void pidgin_themes_load_smiley_theme(con
 				char l[64];
 				int li = 0;
 				while (*i && !isspace(*i) && li < sizeof(l) - 1) {
-					if (*i == '\\' && *(i+1) != '\0' && *(i+1) != '\n' && *(i+1) != '\r')
+					if (*i == '\\' && *(i+1) != '\0')
 						i++;
 					l[li++] = *(i++);
 				}