Merge lp:~diwic/unity-control-center/lp1376776 into lp:unity-control-center

[David Henningsson]

When the treeview is programmatically updated, the treeview fires a signal that the active item has changed. To distinguish this from a user click, we check the active flag. This was done for output but not for input. (LP: #1376776)

When the treeview is programmatically updated, the treeview fires a signal that the active item has changed. To distinguish this from a user click, we check the active flag. This was done for output but not for input. (LP: #1376776)

[Sebastien Bacher (seb128)]

thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12796
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-vivid-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/117/rebuild

review: Approve (continuous-integration)

[David Henningsson (diwic)]

Ping?

=== modified file 'panels/sound/gvc-mixer-dialog.c'
--- panels/sound/gvc-mixer-dialog.c	2014-09-16 13:39:04 +0000
+++ panels/sound/gvc-mixer-dialog.c	2014-11-12 10:00:20 +0000
@@ -1506,7 +1506,7 @@
 {
         GtkTreeModel *model;
         GtkTreeIter   iter;
-        gboolean      toggled;
+        gboolean      active;
         guint         id;
 
         if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
@@ -1516,10 +1516,13 @@
 
         gtk_tree_model_get (model, &iter,
                             ID_COLUMN, &id,
-                            ACTIVE_COLUMN, &toggled,
+                            ACTIVE_COLUMN, &active,
                             -1);
 
-        toggled ^= 1;
+        g_debug ("\n\n on_input_selection_changed - active %i \n\n", active); 
+        if (active)
+                return;
+
         GvcMixerUIDevice *input;
         //g_debug ("on_input_selection_changed - try swap to input with id %u", id); 
         input = gvc_mixer_control_lookup_input_id (dialog->priv->mixer_control, id);