Merge lp:~cjcurran/indicator-sound/fix-collision-detection into lp:indicator-sound/fourth

Proposed by Conor Curran
Status: Merged
Merged at revision: 282
Proposed branch: lp:~cjcurran/indicator-sound/fix-collision-detection
Merge into: lp:indicator-sound/fourth
Diff against target: 22 lines (+3/-3)
1 file modified
src/transport-widget.c (+3/-3)
To merge this branch: bzr merge lp:~cjcurran/indicator-sound/fix-collision-detection
Reviewer Review Type Date Requested Status
Conor Curran Pending
Review via email: mp+82439@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/transport-widget.c'
--- src/transport-widget.c 2011-09-09 12:57:51 +0000
+++ src/transport-widget.c 2011-11-16 18:34:46 +0000
@@ -561,15 +561,15 @@
561{561{
562 TransportAction event = TRANSPORT_ACTION_NO_ACTION;562 TransportAction event = TRANSPORT_ACTION_NO_ACTION;
563 563
564 if (x > 67 && x < 112564 if (x > 57 && x < 102
565 && y > 12 && y < 40){565 && y > 12 && y < 40){
566 event = TRANSPORT_ACTION_PREVIOUS;566 event = TRANSPORT_ACTION_PREVIOUS;
567 }567 }
568 else if (x > 111 && x < 153568 else if (x > 101 && x < 143
569 && y > 5 && y < 47){569 && y > 5 && y < 47){
570 event = TRANSPORT_ACTION_PLAY_PAUSE;570 event = TRANSPORT_ACTION_PLAY_PAUSE;
571 }571 }
572 else if (x > 152 && x < 197572 else if (x > 142 && x < 187
573 && y > 12 && y < 40){573 && y > 12 && y < 40){
574 event = TRANSPORT_ACTION_NEXT;574 event = TRANSPORT_ACTION_NEXT;
575 } 575 }

Subscribers

People subscribed via source and target branches