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

Proposed by David Henningsson on 2014-11-12
Status: Merged
Approved by: Sebastien Bacher on 2014-11-12
Approved revision: 12796
Merged at revision: 12796
Proposed branch: lp:~diwic/unity-control-center/lp1376776
Merge into: lp:unity-control-center
Diff against target: 28 lines (+6/-3)
1 file modified
panels/sound/gvc-mixer-dialog.c (+6/-3)
To merge this branch: bzr merge lp:~diwic/unity-control-center/lp1376776
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-11-12
Sebastien Bacher 2014-11-12 Approve on 2014-11-12
Review via email: mp+241530@code.launchpad.net

Commit message

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)

Description of the change

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)

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks!

review: Approve
David Henningsson (diwic) wrote :

Ping?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1506{1506{
1507 GtkTreeModel *model;1507 GtkTreeModel *model;
1508 GtkTreeIter iter;1508 GtkTreeIter iter;
1509 gboolean toggled;1509 gboolean active;
1510 guint id;1510 guint id;
15111511
1512 if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {1512 if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE) {
@@ -1516,10 +1516,13 @@
15161516
1517 gtk_tree_model_get (model, &iter,1517 gtk_tree_model_get (model, &iter,
1518 ID_COLUMN, &id,1518 ID_COLUMN, &id,
1519 ACTIVE_COLUMN, &toggled,1519 ACTIVE_COLUMN, &active,
1520 -1);1520 -1);
15211521
1522 toggled ^= 1;1522 g_debug ("\n\n on_input_selection_changed - active %i \n\n", active);
1523 if (active)
1524 return;
1525
1523 GvcMixerUIDevice *input;1526 GvcMixerUIDevice *input;
1524 //g_debug ("on_input_selection_changed - try swap to input with id %u", id); 1527 //g_debug ("on_input_selection_changed - try swap to input with id %u", id);
1525 input = gvc_mixer_control_lookup_input_id (dialog->priv->mixer_control, id);1528 input = gvc_mixer_control_lookup_input_id (dialog->priv->mixer_control, id);

Subscribers

People subscribed via source and target branches