# HG changeset patch
# User Tim Ringenbach <marv@pidgin.im>
# Date 1089176561 0
# Node ID 0e11618b37d7b9d24d81765c4ed7de64901d9c42
# Parent  51235d29c5838537cc25be2a3a30769808a758e3
[gaim-migrate @ 10295]
Eric Blade fixed a comment that was backwards, and add two comments,
which were also backwards but I fixed them. He tried to make the
"Insert Link" menu item insensitive in a dead convo, but I undid that
because it didn't match the toolbar.

committer: Tailor Script <tailor@pidgin.im>

diff -r 51235d29c583 -r 0e11618b37d7 COPYRIGHT
--- a/COPYRIGHT	Wed Jul 07 03:28:00 2004 +0000
+++ b/COPYRIGHT	Wed Jul 07 05:02:41 2004 +0000
@@ -11,6 +11,7 @@
 Curtis Beattie
 Brian Bernas
 Jonas Birmé
+Eric Blade
 Ethan Blanton
 Joshua Blanton
 Herman Bloggs
diff -r 51235d29c583 -r 0e11618b37d7 src/gtkconv.c
--- a/src/gtkconv.c	Wed Jul 07 03:28:00 2004 +0000
+++ b/src/gtkconv.c	Wed Jul 07 05:02:41 2004 +0000
@@ -2623,7 +2623,7 @@
 		gtk_widget_show(gtkwin->menu.insert_link);
 		gtk_widget_show(gtkwin->menu.insert_image);
 	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
-		/* Show stuff that applies to IMs, hide stuff that applies to chats */
+		/* Show stuff that applies to Chats, hide stuff that applies to IMs */
 
 		/* Deal with buttons */
 		gtk_widget_show(gtkconv->info);
@@ -2642,11 +2642,13 @@
 
 		if (gaim_blist_find_chat(gaim_conversation_get_account(conv),
 								 gaim_conversation_get_name(conv)) == NULL) {
+		/* If the chat is NOT in the buddy list */
 			gtk_widget_show(gtkwin->menu.add);
 			gtk_widget_hide(gtkwin->menu.remove);
 			gtk_widget_show(gtkconv->add);
 			gtk_widget_hide(gtkconv->remove);
 		} else {
+		/* If the chat IS in the buddy list */
 			gtk_widget_show(gtkwin->menu.remove);
 			gtk_widget_hide(gtkwin->menu.add);
 			gtk_widget_hide(gtkconv->add);
@@ -2722,7 +2724,7 @@
 
 		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
 			gtk_widget_set_sensitive(gtkwin->menu.send_file,
-					(gc && prpl_info->send_file != NULL 
+					(gc && prpl_info->send_file != NULL
 					 && (!prpl_info->can_receive_file 
 						 || prpl_info->can_receive_file(gc, gaim_conversation_get_name(conv)))));
 			if (gaim_find_buddy(gaim_conversation_get_account(conv),