summaryrefslogtreecommitdiff
path: root/capplets/sound
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2008-04-01 18:41:51 +0000
committerJens Granseuer <jensg@src.gnome.org>2008-04-01 18:41:51 +0000
commitad7840772103abefc7ecfda0fd8bbf20d621bf8e (patch)
tree66cfb31249651ea1b72f4097c62d08d069dc10fa /capplets/sound
parentde1e37ceae5055ffad943b2be60379a81cfe1439 (diff)
downloadgnome-control-center-ad7840772103abefc7ecfda0fd8bbf20d621bf8e.tar.gz
sort mixer devices alphabetically (bug #525530)
2008-04-01 Jens Granseuer <jensgr@gmx.net> * mixer-support.c: (create_mixer_device_tree_model): sort mixer devices alphabetically (bug #525530) svn path=/trunk/; revision=8623
Diffstat (limited to 'capplets/sound')
-rw-r--r--capplets/sound/ChangeLog5
-rw-r--r--capplets/sound/mixer-support.c10
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,5 +1,10 @@
2008-04-01 Jens Granseuer <jensgr@gmx.net>
+ * mixer-support.c: (create_mixer_device_tree_model): sort mixer devices
+ alphabetically (bug #525530)
+
+2008-04-01 Jens Granseuer <jensgr@gmx.net>
+
* sound-properties-capplet.c: (device_added_callback): don't show
modems and other unwanted devices (bug #523888)
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);
}