[Gaim-commits] CVS: gaim/src gtklog.c,1.22.2.3,1.22.2.4 log.c,1.103.2.7,1.103.2.8

[Richard L. <rl...@us...>]

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

Modified Files:
      Tag: oldstatus
	gtklog.c log.c 
Log Message:
Backporting the log smiley fix from HEAD.

Index: gtklog.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtklog.c,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -d -p -r1.22.2.3 -r1.22.2.4
--- gtklog.c	12 Jun 2005 05:59:36 -0000	1.22.2.3
+++ gtklog.c	16 Aug 2005 17:53:37 -0000	1.22.2.4
@@ -198,6 +198,8 @@ static void log_select_cb(GtkTreeSelecti
 	title = title_utf8;
 	gtk_window_set_title(GTK_WINDOW(viewer->window), title);
 	gtk_imhtml_clear(GTK_IMHTML(viewer->imhtml));
+	gtk_imhtml_set_protocol_name(GTK_IMHTML(viewer->imhtml),
+				     gaim_account_get_protocol_name(log->account));
 	gtk_imhtml_append_text(GTK_IMHTML(viewer->imhtml), read,
 			       GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_TITLE | GTK_IMHTML_NO_SCROLL |
 			       ((flags & GAIM_LOG_READ_NO_NEWLINE) ? GTK_IMHTML_NO_NEWLINE : 0));

Index: log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.103.2.7
retrieving revision 1.103.2.8
diff -u -d -p -r1.103.2.7 -r1.103.2.8
--- log.c	12 Jul 2005 04:27:41 -0000	1.103.2.7
+++ log.c	16 Aug 2005 17:53:37 -0000	1.103.2.8
@@ -562,7 +562,6 @@ static void html_logger_write(GaimLog *l
 	char *msg_fixed;
 	char date[64];
 	GaimPlugin *plugin = gaim_find_prpl(gaim_account_get_protocol_id(log->account));
-	const char *prpl_name = plugin->info->name;
 	struct generic_logger_data *data = log->logger_data;
 
 	if(!data) {
@@ -612,18 +611,18 @@ static void html_logger_write(GaimLog *l
 				fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
 		} else if (type & GAIM_MESSAGE_RECV) {
 			if(gaim_message_meify(msg_fixed, -1))
-				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 			else
-				fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 		} else if (type & GAIM_MESSAGE_SEND) {
 			if(gaim_message_meify(msg_fixed, -1))
-				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 			else
-				fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 		}
 	}