changeset 6799:fac483a95584

[gaim-migrate @ 7339] I need to write some sort of script that checks for this sort of stuff. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Tue, 09 Sep 2003 16:55:10 +0000
parents 17a446f5e99b
children 8f228a7d5076
files src/gaimrc.c src/gtkprefs.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/gaimrc.c	Tue Sep 09 15:22:10 2003 +0000
+++ b/src/gaimrc.c	Tue Sep 09 16:55:10 2003 +0000
@@ -1055,6 +1055,8 @@
 					im_options & OPT_IM_ALIAS_TAB);
 			gaim_prefs_set_bool("/gaim/gtk/conversations/im/hide_on_send",
 								(im_options & OPT_IM_POPDOWN));
+			gaim_prefs_set_bool("/gaim/gtk/conversations/tabs",
+					im_options & OPT_IM_ONE_WINDOW);
 
 		} else if (!strcmp(p->option, "conv_placement")) {
 			switch(atoi(p->value[0])) {
--- a/src/gtkprefs.c	Tue Sep 09 15:22:10 2003 +0000
+++ b/src/gtkprefs.c	Tue Sep 09 16:55:10 2003 +0000
@@ -926,6 +926,10 @@
 	button = prefs_checkbox(_("Show IMs and chats in _tabbed windows"),
 							"/gaim/gtk/conversations/tabs", vbox);
 
+	/* XXX: grey this out when the above is unchecked */
+	button = prefs_checkbox(_("Show IMs and chats in _same tabbed window"),
+							"/core/conversations/combine_chat_im", vbox);
+
 	close_checkbox = prefs_checkbox(_("Show _close button on tabs"),
 									"/gaim/gtk/conversations/close_on_tabs",
 									vbox);