Mercurial > pidgin.yaz
changeset 27418:48b59f34b0f8
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
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Thu, 25 Jun 2009 05:35:02 +0000 |
| parents | e0c0b4eb36ed |
| children | 552b5292f36f |
| files | pidgin/gtkprefs.c |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Thu Jun 25 05:12:25 2009 +0000 +++ b/pidgin/gtkprefs.c Thu Jun 25 05:35:02 2009 +0000 @@ -1231,9 +1231,9 @@ _("Never"), "never", NULL); gtk_size_group_add_widget(sg, label); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - - vbox = pidgin_make_frame(ret, _("Conversation Window Hiding")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + + 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 @@ _("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 @@ #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 @@ 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())