Import upstream version 0.7.9

3 files changed, 24 insertions, 12 deletions

diff --git a/configure b/configure
index 4585d87..e554fd3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-sound 0.7.8.0.
+# Generated by GNU Autoconf 2.68 for indicator-sound 0.7.9.0.
 #
 # Report bugs to <conor.curran@canonical.com>.
 #
@@ -630,8 +630,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-sound'
 PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='0.7.8.0'
-PACKAGE_STRING='indicator-sound 0.7.8.0'
+PACKAGE_VERSION='0.7.9.0'
+PACKAGE_STRING='indicator-sound 0.7.9.0'
 PACKAGE_BUGREPORT='conor.curran@canonical.com'
 PACKAGE_URL=''
 
@@ -1438,7 +1438,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-sound 0.7.8.0 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.7.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1508,7 +1508,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-sound 0.7.8.0:";;
+     short | recursive ) echo "Configuration of indicator-sound 0.7.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1645,7 +1645,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-sound configure 0.7.8.0
+indicator-sound configure 0.7.9.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2014,7 +2014,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-sound $as_me 0.7.8.0, which was
+It was created by indicator-sound $as_me 0.7.9.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2834,7 +2834,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-sound
- VERSION=0.7.8.0
+ VERSION=0.7.9.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15499,7 +15499,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-sound $as_me 0.7.8.0, which was
+This file was extended by indicator-sound $as_me 0.7.9.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15565,7 +15565,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-sound config.status 0.7.8.0
+indicator-sound config.status 0.7.9.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 38965bf..a93a3bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 
-AC_INIT(indicator-sound, 0.7.8.0, conor.curran@canonical.com)
+AC_INIT(indicator-sound, 0.7.9.0, conor.curran@canonical.com)
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-sound, 0.7.8.0)
+AM_INIT_AUTOMAKE(indicator-sound, 0.7.9.0)
 
 AM_MAINTAINER_MODE
 
diff --git a/src/pulseaudio-mgr.c b/src/pulseaudio-mgr.c
index a31084a..1da8ce1 100644
--- a/src/pulseaudio-mgr.c
+++ b/src/pulseaudio-mgr.c
@@ -174,6 +174,10 @@ reconnect_to_pulse (gpointer user_data)
 void
 pm_update_volume (gint sink_index, pa_cvolume new_volume)
 {
+  // LP: #850662 
+  if (sink_index < 0){
+    return;
+  }
   pa_operation_unref (pa_context_set_sink_volume_by_index (pulse_context,
                                                            sink_index,
                                                            &new_volume,
@@ -192,6 +196,10 @@ pm_update_mute (gboolean update)
 void
 pm_update_mic_gain (gint source_index, pa_cvolume new_gain)
 {
+  // LP: #850662
+  if (source_index < 0){
+    return;
+  }
   pa_operation_unref (pa_context_set_source_volume_by_index (pulse_context,
                                                              source_index,
                                                              &new_gain,
@@ -202,6 +210,10 @@ pm_update_mic_gain (gint source_index, pa_cvolume new_gain)
 void
 pm_update_mic_mute (gint source_index, gint mute_update)
 {
+    // LP: #850662
+    if (source_index < 0){
+      return;
+    }
     pa_operation_unref (pa_context_set_source_mute_by_index (pulse_context,
                                                              source_index,
                                                              mute_update,