[Gaim-commits] SF.net SVN: gaim: [16041] trunk

[<ma...@us...>]

Revision: 16041
Author:   marv_sf
Date:     2006-04-16 11:28:53 -0700 (Sun, 16 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16041&view=rev

Log Message:
-----------
Ike Ginerich fixed gaim_markup_slice().
Looks like the way we were using it just happened to work, which explains how
I was sure I tested this and it worked and yet it was broken. Go figure.

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/src/util.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-04-16 15:35:09 UTC (rev 16040)
+++ trunk/COPYRIGHT	2006-04-16 18:28:53 UTC (rev 16041)
@@ -104,6 +104,7 @@
 François Gagné
 Evgueni V. Gavrilov
 Ignacy Gawedzki
+Ike Gingerich
 Gustavo Giráldez
 Richard Gobeille
 Michael Golden

Modified: trunk/src/util.c
===================================================================
--- trunk/src/util.c	2006-04-16 15:35:09 UTC (rev 16040)
+++ trunk/src/util.c	2006-04-16 18:28:53 UTC (rev 16041)
@@ -2121,16 +2121,7 @@
 				/* z += 0; */
 			}
 
-			if (z == x && !appended) {
-				GList *l = q->tail;
-
-				while (l) {
-					tag = l->data;
-					g_string_append(ret, tag);
-					l = l->prev;
-				}
-				appended = TRUE;
-			} else if (z >= x) {
+			if (z >= x) {
 				g_string_append_len(ret, str, end - str + 1);
 			}
 
@@ -2152,6 +2143,17 @@
 			z++;
 			str = end;
 		} else {
+			if (z == x && z > 0 && !appended) {
+				GList *l = q->tail;
+
+				while (l) {
+					tag = l->data;
+					g_string_append(ret, tag);
+					l = l->prev;
+				}
+				appended = TRUE;
+			}
+
 			if (z >= x)
 				g_string_append_unichar(ret, c);
 			z++;
@@ -2184,7 +2186,7 @@
 		if (tag[i] == '>' || tag[i] == ' ' || tag[i] == '/')
 			break;
 
-	return g_strndup(tag, i);
+	return g_strndup(tag+1, i-1);
 }
 
 /**************************************************************************


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.