diff src/gtkconv.c @ 10884:5cda52915a1f

[gaim-migrate @ 12582] Rename create_prpl_icon to gaim_gtk_create_prpl_icon, remove some dead code from gtkconv, and use G_MODULE_BIND_LOCAL - this breaks perl plugins, and should be added to the list of things that need fixing to save perl. Semi-fix the raw plugin too, but only if your filesystem is being friendly in where it puts stuff. committer: Tailor Script <[e-mail]>

--- a/src/gtkconv.c	Thu Apr 28 00:55:33 2005 +0000
+++ b/src/gtkconv.c	Thu Apr 28 01:06:31 2005 +0000
@@ -2321,7 +2321,7 @@
 
 	if (!status) {
 		GdkPixbuf *pixbuf;
-		pixbuf = create_prpl_icon(account);
+		pixbuf = gaim_gtk_create_prpl_icon(account);
 
 		if (small_icon && pixbuf != NULL)
 		{
@@ -3080,7 +3080,7 @@
 		gc = (GaimConnection *)gcs->data;
 
 		/* Create a pixmap for the protocol icon. */
-		pixbuf = create_prpl_icon(gc->account);
+		pixbuf = gaim_gtk_create_prpl_icon(gc->account);
 		scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
 
 		/* Now convert it to GtkImage */
@@ -3162,7 +3162,7 @@
 			}
 
 			/* Create a pixmap for the protocol icon. */
-			pixbuf = create_prpl_icon(account);
+			pixbuf = gaim_gtk_create_prpl_icon(account);
 			scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16,
 											GDK_INTERP_BILINEAR);
 
@@ -4763,7 +4763,6 @@
 	GaimConvWindow *win;
 	GaimConnection *gc;
 	int gtk_font_options = 0;
-	char buf[BUF_LONG];
 	char buf2[BUF_LONG];
 	char mdate[64];
 	char color[10];
@@ -4803,9 +4802,6 @@
 
 	/* TODO: These colors should not be hardcoded so log.c can use them */
 	if (flags & GAIM_MESSAGE_SYSTEM) {
-		g_snprintf(buf, BUF_LONG, "<FONT SIZE=\"2\">(%s)</FONT> <B>%s</B>",
-				   mdate, message);
-
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>",
 			   sml_attrib ? sml_attrib : "", mdate, message);
@@ -4813,9 +4809,6 @@
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 
 	} else if (flags & GAIM_MESSAGE_ERROR) {
-		g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"#ff0000\"><FONT SIZE=\"2\">(%s)</FONT> <B>%s</B></FONT>",
-				   mdate, message);
-
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT></FONT>",
 			   sml_attrib ? sml_attrib : "", mdate, message);
@@ -4823,11 +4816,11 @@
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 
 	} else if (flags & GAIM_MESSAGE_NO_LOG) {
-		g_snprintf(buf, BUF_LONG,
+		g_snprintf(buf2, BUF_LONG,
 			   "<B><FONT %s COLOR=\"#777777\">%s</FONT></B>",
 			   sml_attrib ? sml_attrib : "", message);
 
-		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf, 0);
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 	} else if (flags & GAIM_MESSAGE_RAW) {
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), message, 0);
 	} else {
@@ -4893,11 +4886,6 @@
 			if(who_escaped)
 				g_free(who_escaped);
 		}
-		g_snprintf(buf, BUF_LONG,
-				   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\">(%s)</FONT> "
-				   "<B>%s</B></FONT> ", color,
-				   sml_attrib ? sml_attrib : "", mdate, str);
-
 		g_snprintf(buf2, BUF_LONG,
 			   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--(%s) --></FONT>"
 			   "<B>%s</B></FONT> ",
@@ -4905,8 +4893,7 @@
 
 		g_free(str);
 
-		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml),
-										   buf2, 0);
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
 
 		if(gc){
 			char *pre = g_strdup_printf("<font %s>", sml_attrib ? sml_attrib : "");
@@ -4933,7 +4920,6 @@
 		g_free(new_message);
 	}
 
-
 	if(sml_attrib)
 		g_free(sml_attrib);
 }