cpw.rekkanoryo.prefs_window: 16ab61e2: Collapse "Sound Method" and "Sound Optio...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 16ab61e2eb4e7c27e58c33cdaeb7dbb820a2e603
Ancestor: 0563c07d9dbe473bdfd245b78984b2ec40d3e837
Author: rekkanoryo at pidgin.im
Date: 2009-11-12T04:09:36
Branch: im.pidgin.cpw.rekkanoryo.prefs_window
URL: http://d.pidgin.im/viewmtn/revision/info/16ab61e2eb4e7c27e58c33cdaeb7dbb820a2e603

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

Collapse "Sound Method" and "Sound Options" sections on the Sounds tab into one
section.  This makes a bit more sense to me.

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	c832a053a2ef253b75044b80a6d9ca9d9f338759
+++ pidgin/gtkprefs.c	15d4a973eea93b8b5bf65fe7f5f8e2952d842994
@@ -2574,7 +2574,7 @@ sound_page(void)
 sound_page(void)
 {
 	GtkWidget *ret;
-	GtkWidget *vbox, *sw, *button;
+	GtkWidget *vbox, *vbox2, *sw, *button;
 	GtkSizeGroup *sg;
 	GtkTreeIter iter;
 	GtkWidget *event_view;
@@ -2598,9 +2598,10 @@ sound_page(void)
 
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
+	vbox2 = pidgin_make_frame(ret, _("Sound Options"));
+
 #ifndef _WIN32
-	vbox = pidgin_make_frame (ret, _("Sound Method"));
-	dd = pidgin_prefs_dropdown(vbox, _("_Method:"), PURPLE_PREF_STRING,
+	dd = pidgin_prefs_dropdown(vbox2, _("_Method:"), PURPLE_PREF_STRING,
 			PIDGIN_PREFS_ROOT "/sound/method",
 			_("Console beep"), "beep",
 #ifdef USE_GSTREAMER
@@ -2614,6 +2615,9 @@ sound_page(void)
 	gtk_size_group_add_widget(sg, dd);
 	gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5);
 
+	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	gtk_box_pack_start(GTK_BOX(vbox2), vbox, FALSE, FALSE, 0);
+
 	entry = gtk_entry_new();
 	gtk_editable_set_editable(GTK_EDITABLE(entry), TRUE);
 	cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command");
@@ -2630,8 +2634,6 @@ sound_page(void)
 					"custom"));
 #endif /* _WIN32 */
 
-	vbox = pidgin_make_frame (ret, _("Sound Options"));
-
 	button = pidgin_prefs_checkbox(_("M_ute sounds"), PIDGIN_PREFS_ROOT "/sound/mute", vbox);
 	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/mute", mute_changed_cb, button);