pidgin: ff904477: Rename the "Conversation Window Hiding" ...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: ff9044771e996cfc4b88e228d53ac790086251fc
Ancestor: 64f73fa6a519696a47ca2e91528930f0ecc4ff5c
Author: deryni at pidgin.im
Date: 2009-06-25T05:35:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ff9044771e996cfc4b88e228d53ac790086251fc

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

Rename the "Conversation Window Hiding" preferences section to "Conversation
Window" and move the Windows-only "Minimize new conversation windows"
preference there instead of the Conversations tab. Refs #7739

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	612df25a2573ccf5c5ca8d706b9aef4075d3adb8
+++ pidgin/gtkprefs.c	39b5b17f0767176dded3364a1701ce6d8c849d02
@@ -1231,9 +1231,9 @@ interface_page(void)
 					_("Never"), "never",
 					NULL);
 	gtk_size_group_add_widget(sg, label);
-        gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 
-	vbox = pidgin_make_frame(ret, _("Conversation Window Hiding"));
+	vbox = pidgin_make_frame(ret, _("Conversation Window"));
 	label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"),
 					PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
 					_("Never"), "never",
@@ -1241,8 +1241,11 @@ interface_page(void)
 					_("Always"), "always",
 					NULL);
 	gtk_size_group_add_widget(sg, label);
-        gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 
+#ifdef _WIN32
+	pidgin_prefs_checkbox(_("Minimi_ze new conversation windows"), PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", vbox);
+#endif
 
 	/* All the tab options! */
 	vbox = pidgin_make_frame(ret, _("Tabs"));
@@ -1353,8 +1356,6 @@ conv_page(void)
 
 #ifdef _WIN32
 	pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox);
-
-	pidgin_prefs_checkbox(_("Minimi_ze new conversation windows"), PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", vbox);
 #endif
 
 	pidgin_prefs_labeled_spin_button(vbox,
@@ -1362,7 +1363,6 @@ conv_page(void)
 		PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines",
 		1, 8, NULL);
 
-
 #if GTK_CHECK_VERSION(2,4,0)
 	vbox = pidgin_make_frame(ret, _("Font"));
 	if (purple_running_gnome())