Mercurial > pidgin3 / changeset

--- a/libpurple/plugins/log_reader.c	Mon Jun 25 00:47:02 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Tue Jun 26 09:50:40 2007 +0000
@@ -1841,9 +1841,10 @@
 			c++;
 
 			/* Find the last '(' character. */
-			if ((tmp = strstr(c, "\n")) != NULL)
-				c = g_strrstr(tmp, "(");
-			else {
+			if ((tmp = strstr(c, "\n")) != NULL) {
+				while (*tmp && *tmp != '(') --tmp;
+				c = tmp;
+			} else {
 				while (*c)
 					c++;
 				c--;
@@ -1901,11 +1902,10 @@
 							start_log = new_line;
 						}
 					}
-
-					/* find EOF */
-					c = strstr(c, "\n");
-					c++;
 				}
+				/* find EOF */
+				c = strstr(c, "\n");
+				c++;
 			}
 		} else {
 			c = strstr(c, "\n");
@@ -1996,9 +1996,10 @@
 			buddy_name = ++c;
 
 			/* Find the last '(' character. */
-			if ((tmp = strstr(c, "\n")) != NULL)
-				c = g_strrstr(tmp, "(");
-			else {
+			if ((tmp = strstr(c, "\n")) != NULL) {
+				while (*tmp && *tmp != '(') --tmp;
+				c = tmp;
+			} else {
 				while (*c)
 					c++;
 				c--;