[Gaim-commits] CVS: gaim/src gtkconv.c,1.34,1.35

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14552

Modified Files:
	gtkconv.c 
Log Message:
The "Hide Icon" on a buddy icon right-click shouldn't crash gaim anymore.


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gtkconv.c	4 Feb 2003 05:25:46 -0000	1.34
+++ gtkconv.c	4 Feb 2003 07:49:25 -0000	1.35
@@ -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);