From: Nathan W. <fac...@us...> - 2003-03-15 07:48:31
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv25915/src Modified Files: buddy.c gtkconv.c Log Message: fix a stupid bug, and let the buddy list get skinny if it can. Index: buddy.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/buddy.c,v retrieving revision 1.441 retrieving revision 1.442 diff -u -d -r1.441 -r1.442 --- buddy.c 15 Mar 2003 03:23:28 -0000 1.441 +++ buddy.c 15 Mar 2003 07:48:26 -0000 1.442 @@ -1248,6 +1248,7 @@ afsad = afsad->next; } } + gtk_tree_view_columns_autosize(GTK_TREE_VIEW(gtkblist->treeview)); } static void gaim_gtk_blist_destroy(struct gaim_buddy_list *list) Index: gtkconv.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- gtkconv.c 15 Mar 2003 03:23:29 -0000 1.69 +++ gtkconv.c 15 Mar 2003 07:48:27 -0000 1.70 @@ -1963,6 +1963,7 @@ conv = gaim_window_get_active_conversation(win); + if (conv == NULL) return FALSE; @@ -2108,7 +2109,7 @@ g_object_set_data(G_OBJECT(menuitem), "user_data", win); g_object_set_data(G_OBJECT(menuitem), "gaim_account", gc->account); - g_signal_connect_after(G_OBJECT(menuitem), "activate", + g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(menu_conv_sel_send_cb), NULL); gtk_widget_show(menuitem); @@ -2137,6 +2138,7 @@ account = gaim_conversation_get_account(conv); + if (account->gc == NULL) { if (first_offline && found_online) { menuitem = gtk_separator_menu_item_new(); @@ -2186,7 +2188,11 @@ gtk_widget_show(box); gtk_widget_set_sensitive(menuitem, FALSE); + g_object_set_data(G_OBJECT(menuitem), "user_data", win); g_object_set_data(G_OBJECT(menuitem), "gaim_account", account); + + g_signal_connect(G_OBJECT(menuitem), "activate", + G_CALLBACK(menu_conv_sel_send_cb), NULL); gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); |