Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv2399
Modified Files:
conversation.c
Log Message:
huh
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- conversation.c 2001/12/04 07:53:55 1.312
+++ conversation.c 2001/12/08 08:46:00 1.313
@@ -451,12 +451,14 @@
}
} else {
if (chat_options & OPT_CHAT_ONE_WINDOW) {
- if ((g_list_length(chats) > 1) ||
- ((convo_options & OPT_CONVO_COMBINE) &&
- (im_options & OPT_IM_ONE_WINDOW) && conversations)) {
+ if ((convo_options & OPT_CONVO_COMBINE) &&
+ (im_options & OPT_IM_ONE_WINDOW) && conversations) {
gtk_notebook_remove_page(GTK_NOTEBOOK(chat_notebook),
g_list_index(chats, c) +
g_list_length(conversations));
+ } else if (g_list_length(chats) > 1) {
+ gtk_notebook_remove_page(GTK_NOTEBOOK(chat_notebook),
+ g_list_index(chats, c));
} else {
if (c->window)
gtk_widget_destroy(c->window);
@@ -1453,7 +1455,7 @@
char buf2[BUF_LONG];
char mdate[64];
- if (c->is_chat && (!c->gc || !g_slist_find(c->gc->buddy_chats, c)))
+ if (c->is_chat && !g_list_find(chats, c))
return;
if (!c->is_chat && !g_list_find(conversations, c))
|
