Mercurial > pidgin.yaz

changeset 7583:532635bc38c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 8201] I just have an affinity for deleting stuff. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 21 Nov 2003 05:19:54 +0000
parents 3e0404393761
children 9e93a4bf1934
files src/gtkconv.c src/server.c
diffstat 2 files changed, 3 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Fri Nov 21 04:13:29 2003 +0000
+++ b/src/gtkconv.c	Fri Nov 21 05:19:54 2003 +0000
@@ -4049,38 +4049,6 @@
 						 G_CALLBACK(conv_dnd_recv), conv);
 #endif
 
-		/*
-		 * Write the New Conversation log string.
-		 *
-		 * This should probably be elsewhere, but then, logging should
-		 * be moved out in some way, either via plugin or via a new API.
-		
-		if (gaim_conversation_is_logging(conv) &&
-			conv_type != GAIM_CONV_MISC) {
-
-			FILE *fd;
-			char filename[256];
-
-			g_snprintf(filename, sizeof(filename), "%s%s",
-					gaim_normalize(gaim_conversation_get_account(conv),name),
-					   (conv_type == GAIM_CONV_CHAT ? ".chat" : ""));
-
-			fd = open_log_file(filename, (conv_type == GAIM_CONV_CHAT));
-
-			if (fd) {
-				if (!gaim_prefs_get_bool("/gaim/gtk/logging/strip_html"))
-					fprintf(fd,
-							_("<HR><BR><H3 Align=Center> "
-							"---- New Conversation @ %s ----</H3><BR>\n"),
-							gaim_date_full());
-				else
-					fprintf(fd, _("---- New Conversation @ %s ----\n"),
-							gaim_date_full());
-
-				fclose(fd);
-			}
-		}
-*/
 		/* Setup the container for the tab. */
 		gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, 5);
 		gtk_container_set_border_width(GTK_CONTAINER(tab_cont), 5);
@@ -4545,18 +4513,9 @@
 
 		gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), buf2, 0, images);
 
-		if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) {
-			char *t1 = gaim_markup_strip_html(buf);
-
-			conv->history = g_string_append(conv->history, t1);
-			conv->history = g_string_append(conv->history, "\n");
-
-			g_free(t1);
-		}
-		else {
-			conv->history = g_string_append(conv->history, buf);
-			conv->history = g_string_append(conv->history, "<BR>\n");
-		}
+		/* Add the message to a conversations scrollback buffer */
+		conv->history = g_string_append(conv->history, buf);
+		conv->history = g_string_append(conv->history, "<BR>\n");
 
 	} else if (flags & GAIM_MESSAGE_NO_LOG) {
 		g_snprintf(buf, BUF_LONG,
--- a/src/server.c	Fri Nov 21 04:13:29 2003 +0000
+++ b/src/server.c	Fri Nov 21 05:19:54 2003 +0000
@@ -1359,34 +1359,6 @@
 
 	gaim_conv_chat_set_id(chat, id);
 
-	/* TODO Move this to UI logging code! LOG
-	if (gaim_prefs_get_bool("/gaim/gtk/logging/log_chats") ||
-		find_log_info(gaim_conversation_get_name(conv))) {
-
-		FILE *fd;
-		char *filename;
-
-		filename = (char *)malloc(100);
-		g_snprintf(filename, 100, "%s.chat",
-				gaim_normalize(gaim_conversation_get_account(conv),
-					gaim_conversation_get_name(conv)));
-
-		fd = open_log_file(filename, TRUE);
-
-		if (fd) {
-			if (!gaim_prefs_get_bool("/gaim/gtk/logging/strip_html"))
-				fprintf(fd,
-					_("<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"),
-					gaim_date_full());
-			else
-				fprintf(fd, _("---- New Conversation @ %s ----\n"), gaim_date_full());
-
-			fclose(fd);
-		}
-		free(filename);
-	}
-	*/
-
 	gaim_conv_window_show(gaim_conversation_get_window(conv));
 	gaim_conv_window_switch_conversation(gaim_conversation_get_window(conv),
 									gaim_conversation_get_index(conv));