[Gaim-commits] CVS: gaim/src gtkconv.c,1.56,1.57

[Nathan W. <fac...@us...>]

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

Modified Files:
	gtkconv.c 
Log Message:
offline accounts are a pain


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- gtkconv.c	8 Mar 2003 06:51:40 -0000	1.56
+++ gtkconv.c	8 Mar 2003 07:21:09 -0000	1.57
@@ -1955,7 +1955,6 @@
 	struct gaim_account *account;
 	struct gaim_conversation *conv;
 	struct gaim_gtk_window *gtkwin;
-	const char *username;
 	GtkWidget *menu;
 	GList *child;
 
@@ -1973,8 +1972,6 @@
 	if (gtkwin->menu.send_as == NULL)
 		return;
 
-	username = (account->gc == NULL ? account->username : account->gc->username);
-
 	gtk_widget_show(gtkwin->menu.send_as);
 
 	menu = gtk_menu_item_get_submenu(
@@ -2188,6 +2185,7 @@
 			gtk_widget_show(box);
 
 			gtk_widget_set_sensitive(menuitem, FALSE);
+			g_object_set_data(G_OBJECT(menuitem), "gaim_account", account);
 
 			gtk_widget_show(menuitem);
 			gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -4879,6 +4877,7 @@
 		}
 	}
 	else {
+		gtk_widget_set_sensitive(gtkconv->send, TRUE);
 		if (win != NULL) {
 			gtk_widget_set_sensitive(gtkwin->menu.insert_link, TRUE);
 		}