[Gaim-commits] CVS: gaim/src gtkconv.c,1.471.2.17,1.471.2.18

[Daniel A. <dat...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6729

Modified Files:
      Tag: oldstatus
	gtkconv.c 
Log Message:
No need to crash just because we're disconnected.

Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.471.2.17
retrieving revision 1.471.2.18
diff -u -d -p -r1.471.2.17 -r1.471.2.18
--- gtkconv.c	5 Apr 2005 06:08:47 -0000	1.471.2.17
+++ gtkconv.c	20 Apr 2005 01:14:26 -0000	1.471.2.18
@@ -5170,7 +5170,7 @@ gaim_gtkconv_write_conv(GaimConversation
 
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>",
-			   sml_attrib, mdate, message);
+			   sml_attrib ? sml_attrib : "", mdate, message);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 
@@ -5187,7 +5187,7 @@ gaim_gtkconv_write_conv(GaimConversation
 
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT></FONT>",
-			   sml_attrib, mdate, message);
+			   sml_attrib ? sml_attrib : "", mdate, message);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 
@@ -5197,7 +5197,7 @@ gaim_gtkconv_write_conv(GaimConversation
 	} else if (flags & GAIM_MESSAGE_NO_LOG) {
 		g_snprintf(buf, BUF_LONG,
 			   "<B><FONT %s COLOR=\"#777777\">%s</FONT></B>",
-			   sml_attrib, message);
+			   sml_attrib ? sml_attrib : "", message);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf, 0);
 	}