changeset 8966:cd1c9bbab491

[gaim-migrate @ 9740] Bring back "raise window on events" for IMs and chats. We don't think these were supposed to be removed. My precious. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 18 May 2004 02:33:12 +0000
parents 0c435a36b5bf
children bcd29e03c921
files src/gtkprefs.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkprefs.c	Mon May 17 19:39:29 2004 +0000
+++ b/src/gtkprefs.c	Tue May 18 02:33:12 2004 +0000
@@ -966,8 +966,8 @@
 
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
+	vbox = gaim_gtk_make_frame (ret, _("Window"));
 #if 0 /* PREFSLASH04 */
-	vbox = gaim_gtk_make_frame (ret, _("Window"));
 	widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
 			"/gaim/gtk/conversations/im/button_type",
 			_("Pictures"), GAIM_BUTTON_IMAGE,
@@ -978,10 +978,10 @@
 
 	gtk_size_group_add_widget(sg, widge);
 	gtk_misc_set_alignment(GTK_MISC(widge), 0, 0);
+#endif /* PREFSLASH04 */
 	gaim_gtk_prefs_checkbox(_("_Raise window on events"),
 			"/gaim/gtk/conversations/im/raise_on_events", vbox);
 	gtk_widget_show (vbox);
-#endif /* PREFSLASH04 */
 	vbox = gaim_gtk_make_frame (ret, _("Buddy Icons"));
 	gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
 			"/gaim/gtk/conversations/im/show_buddy_icons", vbox);
@@ -1008,8 +1008,8 @@
 	gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
 
 	sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+	vbox = gaim_gtk_make_frame (ret, _("Window"));
 #if 0 /* PREFSLASH04 */
-	vbox = gaim_gtk_make_frame (ret, _("Window"));
 	dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
 			"/gaim/gtk/conversations/chat/button_type",
 			_("Pictures"), GAIM_BUTTON_IMAGE,
@@ -1020,9 +1020,9 @@
 
 	gtk_size_group_add_widget(sg, dd);
 	gtk_misc_set_alignment(GTK_MISC(dd), 0, 0);
+#endif /* PREFSLASH04 */
 	gaim_gtk_prefs_checkbox(_("_Raise window on events"),
 			"/gaim/gtk/conversations/chat/raise_on_events", vbox);
-#endif /* PREFSLASH04 */
 	vbox = gaim_gtk_make_frame (ret, _("Display"));
 #if 0 /* PREFSLASH04 */
 	  gaim_gtk_prefs_checkbox(_("_Show people joining in window"),