[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.93,1.94

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv29648/src

Modified Files:
	gtkimhtml.c 
Log Message:
Bye bye bug.

There you go, Sean.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- gtkimhtml.c	16 Dec 2001 22:54:04 -0000	1.93
+++ gtkimhtml.c	10 Feb 2002 22:36:18 -0000	1.94
@@ -2345,9 +2345,10 @@
 	g_return_if_fail (GTK_IS_IMHTML (imhtml));
 	g_return_if_fail (bit != NULL);
 
-	if ( (bit->type == TYPE_TEXT) ||
+	if ( ((bit->type == TYPE_TEXT) ||
 	    ((bit->type == TYPE_SMILEY) && !imhtml->smileys) ||
-	    ((bit->type == TYPE_COMMENT) && imhtml->comments)) {
+	    ((bit->type == TYPE_COMMENT) && imhtml->comments)) &&
+	     bit->text) {
 		gchar *copy = g_strdup (bit->text);
 		gint pos = 0;
 		gboolean seenspace = FALSE;
@@ -2764,7 +2765,7 @@
 	VALID_OPT_TAG ("H3");
 
 	if (!g_strncasecmp(string, "!--", strlen ("!--"))) {
-		gchar *e = strstr (string, "-->");
+		gchar *e = strstr (string + strlen("!--"), "-->");
 		if (e) {
 			*len = e - string + strlen ("-->");
 			*tag = g_strndup (string + strlen ("!--"), *len - strlen ("!---->"));