[Gaim-commits] CVS: gaim/src buddy_chat.c,1.155,1.156

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv24702/src

Modified Files:
	buddy_chat.c 
Log Message:
Mark did this.


Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- buddy_chat.c	25 Aug 2002 10:51:23 -0000	1.155
+++ buddy_chat.c	27 Aug 2002 17:58:14 -0000	1.156
@@ -841,6 +841,21 @@
 	}
 }
 
+/* Added by Jonas <jo...@bi...> */
+static void chat_press_add(GtkObject *obj, struct conversation *c)
+{
+	char *name = gtk_object_get_user_data(obj);
+	struct buddy *b = find_buddy(c->gc, name);
+
+	if (b) {
+		show_confirm_del(c->gc, name);
+	} else if (c->gc)
+		show_add_buddy(c->gc, name, NULL, NULL);
+	
+	gtk_widget_grab_focus(c->entry);	
+}
+/* End Jonas */
+
 static gint right_click_chat(GtkObject *obj, GdkEventButton *event, struct conversation *b)
 {
 	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
@@ -894,6 +909,21 @@
 			gtk_widget_show(button);
 		}
 
+		/* Added by Jonas <jo...@bi...> */
+		if (b->gc) {
+			if (find_buddy(b->gc, gtk_object_get_user_data(obj)))
+				button = gtk_menu_item_new_with_label(_("Remove"));
+			else
+				button = gtk_menu_item_new_with_label(_("Add"));
+			gtk_signal_connect(GTK_OBJECT(button), "activate",
+					   GTK_SIGNAL_FUNC(chat_press_add), b);
+			gtk_object_set_user_data(GTK_OBJECT(button), 
+						 gtk_object_get_user_data(obj));
+			gtk_menu_append(GTK_MENU(menu), button);
+			gtk_widget_show(button);
+		}
+		/* End Jonas */
+		
 		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
 		return TRUE;
 	}