diff src/conversation.c @ 9155:e0c50af60837

[gaim-migrate @ 9939] Change the conversation tab preferences a bit. If tabs are disabled then Gaim will always put new convs in a new window, regardless of what your placement option is. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 01 Jun 2004 01:39:18 +0000
parents 05532ad61ed5
children 1e51236d825e
line wrap: on
line diff
--- a/src/conversation.c	Mon May 31 21:55:21 2004 +0000
+++ b/src/conversation.c	Tue Jun 01 01:39:18 2004 +0000
@@ -847,10 +847,12 @@
 	gaim_conversation_autoset_title(conv);
 
 	/*
-	 * Create a window if one does not exist. If it does, use the last
-	 * created window.
+	 * Place the conversation somewhere.  If there are no conversation
+	 * windows open, or if tabbed conversations are not enabled, then
+	 * place the conversation in a new window by itself.  Otherwise use
+	 * the chosen conversation placement function.
 	 */
-	if (windows == NULL)
+	if ((windows == NULL) || (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs")))
 	{
 		GaimConvWindow *win;
 
@@ -2408,7 +2410,7 @@
 	conv_placement_new_window(conv);
 }
 
-#if 0 /* I don't like this */
+#if 0 /* PREFSLASH04 */
 
 static void
 conv_placement_by_number(GaimConversation *conv)