← Back to branch summary

~bbboson/ubuntu/precise/gnome-control-center/fix-for-1236612

« back to all changes in this revision

Viewing changes to debian/patches/git_unmute_sound_event.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-11-19 11:46:46 UTC
  • Revision ID: package-import@ubuntu.com-20121119114646-d11poz8xzx9ldjl3
Tags: 1:3.4.2-0ubuntu0.7
https://launchpad.net/bugs/986692
* debian/patches/git_unmute_sound_event.patch:
  - use the patch for sound-nua and Unity sessions as well (lp: #986692)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_unmute_sound_event.patch
9
9
 
10
10
https://bugzilla.gnome.org/show_bug.cgi?id=677478
11
11
---
12
 
diff --git a/panels/sound/gvc-mixer-event-role.c b/panels/sound/gvc-mixer-event-role.c
13
 
index 5a28767..3646df2 100644
14
 
--- a/panels/sound/gvc-mixer-event-role.c
15
 
+++ b/panels/sound/gvc-mixer-event-role.c
16
 
@@ -103,6 +103,10 @@ static gboolean
17
 
 gvc_mixer_event_role_change_is_muted (GvcMixerStream *stream,
18
 
                                       gboolean        is_muted)
19
 
 {
20
 
+        /* Apply change straight away so that we don't get a race with
21
 
+         * gvc_mixer_event_role_push_volume().
22
 
+         * See https://bugs.freedesktop.org/show_bug.cgi?id=51413 */
23
 
+        gvc_mixer_stream_set_is_muted (stream, is_muted);
24
 
         return update_settings (GVC_MIXER_EVENT_ROLE (stream),
25
 
                                 is_muted, NULL);
26
 
 }
27
 
--
28
 
cgit v0.9.0.2
29
 
 
 
12
Index: gnome-control-center-3.4.2/panels/sound/gvc-mixer-event-role.c
 
13
===================================================================
 
14
--- gnome-control-center-3.4.2.orig/panels/sound/gvc-mixer-event-role.c 2011-08-26 20:43:10.000000000 +0200
 
15
+++ gnome-control-center-3.4.2/panels/sound/gvc-mixer-event-role.c      2012-11-19 11:43:54.866205657 +0100
 
16
@@ -103,6 +103,10 @@
 
17
 gvc_mixer_event_role_change_is_muted (GvcMixerStream *stream,
 
18
                                       gboolean        is_muted)
 
19
 {
 
20
+        /* Apply change straight away so that we don't get a race with
 
21
+         * gvc_mixer_event_role_push_volume().
 
22
+         * See https://bugs.freedesktop.org/show_bug.cgi?id=51413 */
 
23
+        gvc_mixer_stream_set_is_muted (stream, is_muted);
 
24
         return update_settings (GVC_MIXER_EVENT_ROLE (stream),
 
25
                                 is_muted, NULL);
 
26
 }
 
27
Index: gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.c
 
28
===================================================================
 
29
--- gnome-control-center-3.4.2.orig/panels/sound-nua/gvc-mixer-event-role.c     2012-11-19 11:43:54.110205619 +0100
 
30
+++ gnome-control-center-3.4.2/panels/sound-nua/gvc-mixer-event-role.c  2012-11-19 11:43:54.866205657 +0100
 
31
@@ -103,6 +103,10 @@
 
32
 gvc_mixer_event_role_change_is_muted (GvcMixerStream *stream,
 
33
                                       gboolean        is_muted)
 
34
 {
 
35
+        /* Apply change straight away so that we don't get a race with
 
36
+         * gvc_mixer_event_role_push_volume().
 
37
+         * See https://bugs.freedesktop.org/show_bug.cgi?id=51413 */
 
38
+        gvc_mixer_stream_set_is_muted (stream, is_muted);
 
39
         return update_settings (GVC_MIXER_EVENT_ROLE (stream),
 
40
                                 is_muted, NULL);
 
41
 }