From 098e58a712a3073d13c6f9a94e917a483987c769 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 18 Aug 2011 10:19:06 -0400 Subject: Import upstream version 0.7.6 --- configure | 20 ++++++++++---------- configure.ac | 4 ++-- src/metadata-widget.c | 2 +- src/mute-widget.c | 6 ------ 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 8272963..1f491bf 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.5. +# Generated by GNU Autoconf 2.68 for indicator-sound 0.7.6. # # Report bugs to . # @@ -630,8 +630,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='indicator-sound' PACKAGE_TARNAME='indicator-sound' -PACKAGE_VERSION='0.7.5' -PACKAGE_STRING='indicator-sound 0.7.5' +PACKAGE_VERSION='0.7.6' +PACKAGE_STRING='indicator-sound 0.7.6' 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.5 to adapt to many kinds of systems. +\`configure' configures indicator-sound 0.7.6 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.5:";; + short | recursive ) echo "Configuration of indicator-sound 0.7.6:";; 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.5 +indicator-sound configure 0.7.6 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.5, which was +It was created by indicator-sound $as_me 0.7.6, 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.5 + VERSION=0.7.6 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.5, which was +This file was extended by indicator-sound $as_me 0.7.6, 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.5 +indicator-sound config.status 0.7.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index adb9564..f1a9b63 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(indicator-sound, 0.7.5, conor.curran@canonical.com) +AC_INIT(indicator-sound, 0.7.6, conor.curran@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-sound, 0.7.5) +AM_INIT_AUTOMAKE(indicator-sound, 0.7.6) AM_MAINTAINER_MODE diff --git a/src/metadata-widget.c b/src/metadata-widget.c index ee9957f..d21c10d 100644 --- a/src/metadata-widget.c +++ b/src/metadata-widget.c @@ -665,7 +665,7 @@ metadata_widget_button_release_event (GtkWidget *menuitem, gtk_clipboard_store (board); g_free(contents); } - return TRUE; + return FALSE; } static void diff --git a/src/mute-widget.c b/src/mute-widget.c index 97c87ff..ea03000 100644 --- a/src/mute-widget.c +++ b/src/mute-widget.c @@ -131,11 +131,5 @@ mute_widget_new (DbusmenuMenuitem *item) if (g_variant_is_of_type(label, G_VARIANT_TYPE_STRING)) gtk_menu_item_set_label(priv->gitem, g_variant_get_string(label, NULL)); - if (label) - { - g_debug("Added a new Mute Widget %s", g_variant_print(label, FALSE)); - g_variant_unref(label); - } - return widget; } -- cgit v1.2.3