# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1044344965 0
# Node ID 9b9737a00a962887b5c696adff7481c2c4bb12f6
# Parent  7521e29658bce453604746127983c8302858397a
[gaim-migrate @ 4793]
The "Hide Icon" on a buddy icon right-click shouldn't crash gaim anymore.

committer: Tailor Script <tailor@pidgin.im>

diff -r 7521e29658bc -r 9b9737a00a96 src/gtkconv.c
--- a/src/gtkconv.c	Tue Feb 04 06:57:35 2003 +0000
+++ b/src/gtkconv.c	Tue Feb 04 07:49:25 2003 +0000
@@ -3723,14 +3723,6 @@
 		}
 
 		if (!(flags & WFLAG_NOLOG) && gaim_conversation_is_logging(conv)) {
-/*
-     XXX
-			((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
-			  (logging_options & OPT_LOG_CHATS)) ||
-			 (gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
-			  (logging_options & OPT_LOG_CONVOS)) ||
-			 find_log_info(gaim_conversation_get_name(conv)))) {
-*/
 
 			char *t1;
 			char nm[256];
@@ -3887,15 +3879,6 @@
 
 		/* XXX This needs to be updated for the new length argument. */
 		if (gaim_conversation_is_logging(conv)) {
-/*
-   XXX
-		if ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT &&
-			 (logging_options & OPT_LOG_CHATS)) ||
-			(gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
-			 (logging_options & OPT_LOG_CONVOS)) ||
-			find_log_info(gaim_conversation_get_name(conv))) {
-*/
-
 			char *t1, *t2;
 			char nm[256];
 
@@ -4444,7 +4427,7 @@
 
 	button = gtk_menu_item_new_with_label(_("Hide Icon"));
 	g_signal_connect_swapped(GTK_OBJECT(button), "activate",
-							 G_CALLBACK(remove_icon), conv);
+							 G_CALLBACK(remove_icon), gtkconv);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
 	gtk_widget_show(button);