Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv13274/src
Modified Files:
conversation.c
Log Message:
2.4.17-pre5 is better than 2.4.17-rc1, i think.
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -d -r1.317 -r1.318
--- conversation.c 2001/12/11 16:57:29 1.317
+++ conversation.c 2001/12/16 10:11:55 1.318
@@ -453,12 +453,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 || chats->next)) {
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);
|
