Merge lp:~seb128/unity-control-center/rename-sound-key into lp:unity-control-center

[Sebastien Bacher]

Use new sound key, avoid depending on indicator-sound

Use new sound key, avoid depending on indicator-sound

[Lars Karlitski (larsu)]

Thanks a lot!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12728
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/47

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-02-21 18:46:14 +0000
+++ debian/control	2014-02-24 11:52:07 +0000
@@ -72,8 +72,7 @@
          gnome-menus (>= 2.12.0),
          gnome-settings-daemon (>= 3.8.4) | unity-settings-daemon,
          gsettings-desktop-schemas (>= 3.5.91),
-         gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219),
-         indicator-sound (>= 12.10.2+14.04.20140220),
+         gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224),
 Recommends: cups-pk-helper,
             gnome-session-bin,
             ubuntu-system-service,

=== modified file 'panels/sound/gvc-mixer-dialog.c'
--- panels/sound/gvc-mixer-dialog.c	2014-02-20 18:07:51 +0000
+++ panels/sound/gvc-mixer-dialog.c	2014-02-24 11:52:07 +0000
@@ -2180,7 +2180,7 @@
         dialog->priv = GVC_MIXER_DIALOG_GET_PRIVATE (dialog);
         dialog->priv->bars = g_hash_table_new (NULL, NULL);
         dialog->priv->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-        dialog->priv->indicator_settings = g_settings_new ("com.canonical.indicator.sound");
+        dialog->priv->indicator_settings = g_settings_new ("com.ubuntu.sound");
 }
 
 static void