Merge lp:~om26er/ubuntu/oneiric/indicator-sound/fix-864405 into lp:ubuntu/oneiric-proposed/indicator-sound

Proposed by Omer Akram
Status: Merged
Merged at revision: 101
Proposed branch: lp:~om26er/ubuntu/oneiric/indicator-sound/fix-864405
Merge into: lp:ubuntu/oneiric-proposed/indicator-sound
Diff against target: 50 lines (+31/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/fix-864405.patch (+22/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~om26er/ubuntu/oneiric/indicator-sound/fix-864405
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+83589@code.launchpad.net

Description of the change

backport fix for linked bug

To post a comment you must log in.
Revision history for this message
Stéphane Graber (stgraber) wrote :

Looks good, only doing queue cleanup today so will let someone else do the actual upload.
One small detail, as it's an SRU, you should be using -0ubuntu2.1 as the version number instead of -0ubuntu3

Thanks for your work!

103. By Omer Akram

fix version number for SRU

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-10-28 10:12:36 +0000
3+++ debian/changelog 2011-11-28 17:56:24 +0000
4@@ -1,3 +1,11 @@
5+indicator-sound (0.7.9-0ubuntu2.1) oneiric-proposed; urgency=low
6+
7+ * debian/patches/fix-864405.patch:
8+ - Clicking on left 25% of "Pause/Play" circle clicks "Previous".
9+ (LP: #864405)
10+
11+ -- Omer Akram <om26er@ubuntu.com> Mon, 28 Nov 2011 22:51:15 +0500
12+
13 indicator-sound (0.7.9-0ubuntu2) oneiric-proposed; urgency=low
14
15 * src/pulseaudio-mgr.c
16
17=== added file 'debian/patches/fix-864405.patch'
18--- debian/patches/fix-864405.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/fix-864405.patch 2011-11-28 17:56:24 +0000
20@@ -0,0 +1,22 @@
21+--- a/src/transport-widget.c 2011-09-09 12:57:51 +0000
22++++ b/src/transport-widget.c 2011-11-16 18:34:46 +0000
23+@@ -561,15 +561,15 @@
24+ {
25+ TransportAction event = TRANSPORT_ACTION_NO_ACTION;
26+
27+- if (x > 67 && x < 112
28++ if (x > 57 && x < 102
29+ && y > 12 && y < 40){
30+ event = TRANSPORT_ACTION_PREVIOUS;
31+ }
32+- else if (x > 111 && x < 153
33++ else if (x > 101 && x < 143
34+ && y > 5 && y < 47){
35+ event = TRANSPORT_ACTION_PLAY_PAUSE;
36+ }
37+- else if (x > 152 && x < 197
38++ else if (x > 142 && x < 187
39+ && y > 12 && y < 40){
40+ event = TRANSPORT_ACTION_NEXT;
41+ }
42+
43
44=== modified file 'debian/patches/series'
45--- debian/patches/series 2011-10-28 10:12:36 +0000
46+++ debian/patches/series 2011-11-28 17:56:24 +0000
47@@ -1,2 +1,3 @@
48 lp_840986.patch
49 lp_864732.patch
50+fix-864405.patch

Subscribers

People subscribed via source and target branches

to all changes: