Import upstream version 12.10.1

13 files changed, 129 insertions, 451 deletions

diff --git a/Makefile.in b/Makefile.in
index c28439d..4b4758c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -642,7 +642,7 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
diff --git a/NEWS b/NEWS
index 84971fb..dc7ca65 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
-12.10.0
+12.10.1
+ - Don't include <glib/gi18n.h> in library code
+ - Remove GTK+ 2 build rules from configure.ac
 
+12.10.0
  - Allow setting preferred media players through a settings key. (LP #1014955)
  - Fix sound indicator not working after Amarok close. (LP #992262) 
  - Explicit handling of Ardour
diff --git a/aclocal.m4 b/aclocal.m4
index b9c37c2..4eb5e32 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -752,7 +752,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.5], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -768,7 +768,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.5])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/configure b/configure
index e50b150..35959e1 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.69 for indicator-sound 12.10.0.
+# Generated by GNU Autoconf 2.69 for indicator-sound 12.10.1.
 #
 # Report bugs to <conor.curran@canonical.com>.
 #
@@ -650,8 +650,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-sound'
 PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='12.10.0'
-PACKAGE_STRING='indicator-sound 12.10.0'
+PACKAGE_VERSION='12.10.1'
+PACKAGE_STRING='indicator-sound 12.10.1'
 PACKAGE_BUGREPORT='conor.curran@canonical.com'
 PACKAGE_URL=''
 
@@ -904,7 +904,6 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_silent_rules
-with_gtk
 enable_gcov
 enable_localinstall
 enable_schemas_compile
@@ -1467,7 +1466,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 12.10.0 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 12.10.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1537,7 +1536,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-sound 12.10.0:";;
+     short | recursive ) echo "Configuration of indicator-sound 12.10.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1571,8 +1570,6 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
-  --with-gtk              Which version of gtk to use for the indicator
-                          [default=3]
 
 Some influential environment variables:
   CC          C compiler command
@@ -1666,7 +1663,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-sound configure 12.10.0
+indicator-sound configure 12.10.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2035,7 +2032,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 12.10.0, which was
+It was created by indicator-sound $as_me 12.10.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2855,7 +2852,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-sound
- VERSION=12.10.0
+ VERSION=12.10.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13084,24 +13081,10 @@ fi
 
 
 ###########################
-# GTK+ version option
-###########################
-
-
-# Check whether --with-gtk was given.
-if test "${with_gtk+set}" = set; then :
-  withval=$with_gtk;
-else
-  with_gtk=3
-fi
-
-
-###########################
 # Dependencies
 ###########################
 
-GTK_REQUIRED_VERSION=2.22
-GTK3_REQUIRED_VERSION=3.0
+GTK_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.19
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
 POLKIT_REQUIRED_VERSION=0.92
@@ -13334,7 +13317,6 @@ fi
 
 
 
-if test "x$with_gtk" = x3; then :
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5
@@ -13344,24 +13326,24 @@ if test -n "$APPLET_CFLAGS"; then
     pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13373,24 +13355,24 @@ if test -n "$APPLET_LIBS"; then
     pkg_cv_APPLET_LIBS="$APPLET_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= \$INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
+  pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13411,26 +13393,26 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
+	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
         else
-	        APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
+	        APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$APPLET_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION) were not met:
+	as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= $LIBNOTIFY_REQUIRED_VERSION) were not met:
 
 $APPLET_PKG_ERRORS
 
@@ -13473,23 +13455,23 @@ if test -n "$SOUNDSERVICE_CFLAGS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0\""; } >&5
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0") 2>&5
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SOUNDSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0" 2>/dev/null`
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13502,23 +13484,23 @@ if test -n "$SOUNDSERVICE_LIBS"; then
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0\""; } >&5
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0") 2>&5
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SOUNDSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0" 2>/dev/null`
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13540,25 +13522,25 @@ else
 fi
         if test $_pkg_short_errors_supported = yes; then
 	        SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0" 2>&1`
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0" 2>&1`
         else
 	        SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0" 2>&1`
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUNDSERVICE_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0) were not met:
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0) were not met:
 
 $SOUNDSERVICE_PKG_ERRORS
 
@@ -13591,270 +13573,6 @@ $as_echo "yes" >&6; }
 
 fi
 
-elif test "x$with_gtk" = x2; then :
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPLET" >&5
-$as_echo_n "checking for APPLET... " >&6; }
-
-if test -n "$APPLET_CFLAGS"; then
-    pkg_cv_APPLET_CFLAGS="$APPLET_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-                               indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                               indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                               indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$APPLET_LIBS"; then
-    pkg_cv_APPLET_LIBS="$APPLET_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
-                               indicator-0.4 >= \$INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= \$INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= \$LIBNOTIFY_REQUIRED_VERSION\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                               indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                               indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                               indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
-        else
-	        APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                               indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$APPLET_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                               indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION) were not met:
-
-$APPLET_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables APPLET_CFLAGS
-and APPLET_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables APPLET_CFLAGS
-and APPLET_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS
-	APPLET_LIBS=$pkg_cv_APPLET_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUNDSERVICE" >&5
-$as_echo_n "checking for SOUNDSERVICE... " >&6; }
-
-if test -n "$SOUNDSERVICE_CFLAGS"; then
-    pkg_cv_SOUNDSERVICE_CFLAGS="$SOUNDSERVICE_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SOUNDSERVICE_CFLAGS=`$PKG_CONFIG --cflags "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SOUNDSERVICE_LIBS"; then
-    pkg_cv_SOUNDSERVICE_LIBS="$SOUNDSERVICE_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbusmenu-glib-0.4 >= \$DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SOUNDSERVICE_LIBS=`$PKG_CONFIG --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0" 2>&1`
-        else
-	        SOUNDSERVICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SOUNDSERVICE_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0) were not met:
-
-$SOUNDSERVICE_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SOUNDSERVICE_CFLAGS
-and SOUNDSERVICE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SOUNDSERVICE_CFLAGS
-and SOUNDSERVICE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	SOUNDSERVICE_CFLAGS=$pkg_cv_SOUNDSERVICE_CFLAGS
-	SOUNDSERVICE_LIBS=$pkg_cv_SOUNDSERVICE_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Value for --with-gtk was neither 2 nor 3
-See \`config.log' for more details" "$LINENO" 5; }
-
-fi
 
 
 
@@ -14158,18 +13876,11 @@ if test "x$with_localinstall" = "xyes"; then :
 	INDICATORICONSDIR="${datadir}/indicator-sound/icons/"
 
 else
-  if test "x$with_gtk" = "x2"; then :
-
-		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
-		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
-
-else
 
-		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
+	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
 
 fi
-fi
 
 
 
@@ -15714,7 +15425,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 12.10.0, which was
+This file was extended by indicator-sound $as_me 12.10.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15780,7 +15491,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 12.10.0
+indicator-sound config.status 12.10.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17592,7 +17303,6 @@ fi
 SUS Indicator Configuration:
 
 	Prefix:        $prefix
-	GTK+:          $with_gtk
 	gcov:          $use_gcov
 " >&5
 $as_echo "$as_me:
@@ -17600,6 +17310,5 @@ $as_echo "$as_me:
 SUS Indicator Configuration:
 
 	Prefix:        $prefix
-	GTK+:          $with_gtk
 	gcov:          $use_gcov
 " >&6;}
diff --git a/configure.ac b/configure.ac
index 80636a1..bfd12d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 
-AC_INIT(indicator-sound, 12.10.0, conor.curran@canonical.com)
+AC_INIT(indicator-sound, 12.10.1, conor.curran@canonical.com)
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-sound, 12.10.0)
+AM_INIT_AUTOMAKE(indicator-sound, 12.10.1)
 
 AM_MAINTAINER_MODE
 
@@ -26,21 +26,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 
 ###########################
-# GTK+ version option
-###########################
-
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk],
-    [Which version of gtk to use for the indicator @<:@default=3@:>@])],
-  [],
-  [with_gtk=3])
-
-###########################
 # Dependencies 
 ###########################  
 
-GTK_REQUIRED_VERSION=2.22
-GTK3_REQUIRED_VERSION=3.0
+GTK_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.19
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
 POLKIT_REQUIRED_VERSION=0.92
@@ -55,34 +44,18 @@ PKG_CHECK_MODULES(PULSEAUDIO, libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VE
 AC_SUBST(PULSEAUDIO_CFLAGS)
 AC_SUBST(PULSEAUDIO_LIBS)
 
-AS_IF([test "x$with_gtk" = x3],
-    [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                               indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
-
-     PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator3-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0)
-        ],
-      [test "x$with_gtk" = x2],
-    [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                               indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                               dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
-
-     PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                     indicator-0.4
-                                     gee-1.0
-                                     gio-unix-2.0
-                                     libxml-2.0)
-        ],
-    [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
-)
+PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                          indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                          dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                          libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+                          libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
+
+PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
+                                indicator3-0.4
+                                gee-1.0
+                                gio-unix-2.0
+                                libxml-2.0)
+
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 
@@ -118,15 +91,10 @@ AS_IF([test "x$with_localinstall" = "xyes"],
 	INDICATORDIR="${libdir}/indicators/2/"
 	INDICATORICONSDIR="${datadir}/indicator-sound/icons/"
 	],
-	[AS_IF([test "x$with_gtk" = "x2"],
-		[
-		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
-		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
-		],
-		[
-		INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-		INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
-		])])
+	[
+	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
+	])
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
 
@@ -200,6 +168,5 @@ AC_MSG_NOTICE([
 SUS Indicator Configuration:
 
 	Prefix:        $prefix
-	GTK+:          $with_gtk
 	gcov:          $use_gcov
 ])
diff --git a/data/Makefile.in b/data/Makefile.in
index bd3ffc8..c3e4962 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in
index c020d52..11514de 100644
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/16x16/status/Makefile.in b/data/icons/16x16/status/Makefile.in
index e00c573..25d886c 100644
--- a/data/icons/16x16/status/Makefile.in
+++ b/data/icons/16x16/status/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index d876ec3..9ea523c 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/scalable/Makefile.in b/data/icons/scalable/Makefile.in
index 6f482e7..ba16f1e 100644
--- a/data/icons/scalable/Makefile.in
+++ b/data/icons/scalable/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/data/icons/scalable/status/Makefile.in b/data/icons/scalable/status/Makefile.in
index 045777e..b50b553 100644
--- a/data/icons/scalable/status/Makefile.in
+++ b/data/icons/scalable/status/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/Makefile.in b/src/Makefile.in
index 29fd250..7f28dba 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/mute-widget.c b/src/mute-widget.c
index ea03000..500f575 100644
--- a/src/mute-widget.c
+++ b/src/mute-widget.c
@@ -21,7 +21,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #endif
 
-#include <glib/gi18n.h>
 #include <glib.h>
 #include "mute-widget.h"
 #include "common-defs.h"