From ad7840772103abefc7ecfda0fd8bbf20d621bf8e Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Tue, 1 Apr 2008 18:41:51 +0000 Subject: [PATCH] sort mixer devices alphabetically (bug #525530) 2008-04-01 Jens Granseuer * mixer-support.c: (create_mixer_device_tree_model): sort mixer devices alphabetically (bug #525530) svn path=/trunk/; revision=8623 --- capplets/sound/ChangeLog | 5 +++++ capplets/sound/mixer-support.c | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog index 0762fbe57..ee97a8d35 100644 --- a/capplets/sound/ChangeLog +++ b/capplets/sound/ChangeLog @@ -1,3 +1,8 @@ +2008-04-01 Jens Granseuer + + * mixer-support.c: (create_mixer_device_tree_model): sort mixer devices + alphabetically (bug #525530) + 2008-04-01 Jens Granseuer * sound-properties-capplet.c: (device_added_callback): don't show diff --git a/capplets/sound/mixer-support.c b/capplets/sound/mixer-support.c index 96f200e30..949275166 100644 --- a/capplets/sound/mixer-support.c +++ b/capplets/sound/mixer-support.c @@ -64,7 +64,7 @@ create_mixer_device_tree_model (void) factory = gst_element_get_factory (mixer); longname = gst_element_factory_get_longname (factory); - factory_name = gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)); + factory_name = gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)); /* gst_element_set_state (mixer, GST_STATE_NULL); */ @@ -88,10 +88,10 @@ create_mixer_device_tree_model (void) g_free (device); device = tmp; } else { - device = g_strdup (factory_name); + device = g_strdup (factory_name); } - gtk_list_store_insert_with_values (device_store, &tree_iter, -1, + gtk_list_store_insert_with_values (device_store, &tree_iter, -1, MIXER_DEVICE_MODEL_NAME_COLUMN, name, MIXER_DEVICE_MODEL_DEVICE_COLUMN, device, MIXER_DEVICE_MODEL_MIXER_COLUMN, mixer, @@ -106,6 +106,10 @@ create_mixer_device_tree_model (void) g_list_free (mixer_list); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (device_store), + MIXER_DEVICE_MODEL_NAME_COLUMN, + GTK_SORT_ASCENDING); + return GTK_TREE_MODEL (device_store); }