diff -u rhythmbox-0.12.6/debian/control.in rhythmbox-0.12.6/debian/control.in
--- rhythmbox-0.12.6/debian/control.in
+++ rhythmbox-0.12.6/debian/control.in
@@ -8,7 +8,7 @@
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools,
                intltool (>= 0.35.0),
-               libappindicator-dev (>= 0.0.4),
+               libappindicator-dev (>= 0.0.7),
                libdbus-glib-1-dev (>= 0.35),
                libgstreamer0.10-dev (>= 0.10.20),
                libgstreamer-plugins-base0.10-dev (>= 0.10.20),
diff -u rhythmbox-0.12.6/debian/control rhythmbox-0.12.6/debian/control
--- rhythmbox-0.12.6/debian/control
+++ rhythmbox-0.12.6/debian/control
@@ -13,7 +13,7 @@
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools,
                intltool (>= 0.35.0),
-               libappindicator-dev (>= 0.0.4),
+               libappindicator-dev (>= 0.0.7),
                libdbus-glib-1-dev (>= 0.35),
                libgstreamer0.10-dev (>= 0.10.20),
                libgstreamer-plugins-base0.10-dev (>= 0.10.20),
diff -u rhythmbox-0.12.6/debian/changelog rhythmbox-0.12.6/debian/changelog
--- rhythmbox-0.12.6/debian/changelog
+++ rhythmbox-0.12.6/debian/changelog
@@ -1,8 +1,18 @@
-rhythmbox (0.12.6-1ubuntu5+ppa1) karmic; urgency=low
+rhythmbox (0.12.6-1ubuntu6) karmic; urgency=low
 
-  * bump for karmic build 
+  * debian/patches/82_rhythmbox-indicators.patch:
+    - enabled notifications again
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 13 Jan 2010 11:37:12 -0500
+
+rhythmbox (0.12.6-1ubuntu5) lucid; urgency=low
+
+  * debian/patches/82_rhythmbox-indicators.patch:
+    - Updated patch fixing icon paths 
+  * debian/control.in
+    - bump build depends for libappindicator-dev to 0.0.7
 
- -- Ken VanDine <ken.vandine@canonical.com>  Thu, 07 Jan 2010 23:12:57 -0500
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 08 Jan 2010 22:54:59 -0500
 
 rhythmbox (0.12.6-1ubuntu4) lucid; urgency=low
 
diff -u rhythmbox-0.12.6/debian/patches/90_autoconf.patch rhythmbox-0.12.6/debian/patches/90_autoconf.patch
--- rhythmbox-0.12.6/debian/patches/90_autoconf.patch
+++ rhythmbox-0.12.6/debian/patches/90_autoconf.patch
@@ -1,6 +1,6 @@
 === modified file 'Makefile.in'
---- Makefile.in	2009-12-10 16:02:04 +0000
-+++ Makefile.in	2009-12-11 02:31:20 +0000
+--- Makefile.in	2010-01-13 15:30:05 +0000
++++ Makefile.in	2010-01-13 15:55:09 +0000
 @@ -40,14 +40,7 @@
  	THANKS config.guess config.sub depcomp install-sh ltmain.sh \
  	missing mkinstalldirs py-compile
@@ -28,9 +28,20 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'aclocal.m4'
---- aclocal.m4	2009-12-10 16:02:04 +0000
-+++ aclocal.m4	2009-12-11 02:31:10 +0000
-@@ -497,6 +497,8262 @@
+--- aclocal.m4	2010-01-13 15:30:05 +0000
++++ aclocal.m4	2010-01-13 15:55:00 +0000
+@@ -13,8 +13,8 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+-[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -497,6 +497,8263 @@
  fi])
  
  
@@ -2766,7 +2777,7 @@
 +  ;;
 +
 +# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
@@ -3405,7 +3416,7 @@
 +  ;;
 +
 +# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
@@ -4026,7 +4037,7 @@
 +	    ;;
 +	esac
 +	;;
-+      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +	case $cc_basename in
 +	  KCC*)
 +	    # KAI C++ Compiler
@@ -4310,7 +4321,7 @@
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +      ;;
 +
-+    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +      case $cc_basename in
 +      # old Intel for x86_64 which still supported -KPIC.
 +      ecc*)
@@ -4606,6 +4617,7 @@
 +    fi
 +    supports_anon_versioning=no
 +    case `$LD -v 2>&1` in
++      *GNU\ gold*) supports_anon_versioning=yes ;;
 +      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
 +      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
 +      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4697,7 +4709,7 @@
 +      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
 +
-+    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 +      tmp_diet=no
 +      if test "$host_os" = linux-dietlibc; then
 +	case $cc_basename in
@@ -6177,7 +6189,7 @@
 +        _LT_TAGVAR(inherit_rpath, $1)=yes
 +        ;;
 +
-+      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -8184,15 +8196,15 @@
 +
 +# Generated from ltversion.in.
 +
-+# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
 +# This file is part of GNU Libtool
 +
-+m4_define([LT_PACKAGE_VERSION], [2.2.6])
-+m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
 +
 +AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6'
-+macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 +_LT_DECL(, macro_revision, 0)
 +])
@@ -8293,7 +8305,7 @@
  # nls.m4 serial 3 (gettext-0.15)
  dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
-@@ -1902,11 +10158,3 @@
+@@ -1902,11 +10159,3 @@
  AC_SUBST([am__untar])
  ]) # _AM_PROG_TAR
  
@@ -8307,8 +8319,8 @@
 -m4_include([macros/lt~obsolete.m4])
 
 === modified file 'backends/Makefile.in'
---- backends/Makefile.in	2009-12-10 16:02:04 +0000
-+++ backends/Makefile.in	2009-12-11 02:31:13 +0000
+--- backends/Makefile.in	2010-01-13 15:30:05 +0000
++++ backends/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -37,14 +37,7 @@
  subdir = backends
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -8336,8 +8348,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'backends/gstreamer/Makefile.in'
---- backends/gstreamer/Makefile.in	2009-12-10 16:02:04 +0000
-+++ backends/gstreamer/Makefile.in	2009-12-11 02:31:13 +0000
+--- backends/gstreamer/Makefile.in	2010-01-13 15:30:05 +0000
++++ backends/gstreamer/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -37,14 +37,7 @@
  subdir = backends/gstreamer
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -8365,8 +8377,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'bindings/Makefile.in'
---- bindings/Makefile.in	2009-12-10 16:02:04 +0000
-+++ bindings/Makefile.in	2009-12-11 02:31:13 +0000
+--- bindings/Makefile.in	2010-01-13 15:30:05 +0000
++++ bindings/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -38,14 +38,7 @@
  subdir = bindings
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -8394,8 +8406,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'bindings/python/Makefile.in'
---- bindings/python/Makefile.in	2009-12-10 16:02:04 +0000
-+++ bindings/python/Makefile.in	2009-12-11 02:31:13 +0000
+--- bindings/python/Makefile.in	2010-01-13 15:30:05 +0000
++++ bindings/python/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -37,14 +37,7 @@
  subdir = bindings/python
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -8423,8 +8435,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'bindings/vala/Makefile.in'
---- bindings/vala/Makefile.in	2009-12-10 16:02:04 +0000
-+++ bindings/vala/Makefile.in	2009-12-11 02:31:13 +0000
+--- bindings/vala/Makefile.in	2010-01-13 15:30:05 +0000
++++ bindings/vala/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -38,14 +38,7 @@
  DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -8452,8 +8464,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'config.h.in'
---- config.h.in	2009-12-10 16:02:04 +0000
-+++ config.h.in	2009-12-11 02:31:12 +0000
+--- config.h.in	2010-01-13 15:30:05 +0000
++++ config.h.in	2010-01-13 15:55:02 +0000
 @@ -12,6 +12,9 @@
  /* Define to the Gettext package name */
  #undef GETTEXT_PACKAGE
@@ -8466,9 +8478,37 @@
  
 
 === modified file 'configure'
---- configure	2009-12-10 16:02:04 +0000
-+++ configure	2009-12-11 02:31:11 +0000
-@@ -896,6 +896,10 @@
+--- configure	2010-01-13 15:30:05 +0000
++++ configure	2010-01-13 15:55:01 +0000
+@@ -1,12 +1,14 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.64 for rhythmbox 0.12.6.
++# Generated by GNU Autoconf 2.65 for rhythmbox 0.12.6.
+ #
+ # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=rhythmbox>.
+ #
++#
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+-# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+ #
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+@@ -677,7 +679,8 @@
+ 
+ 
+ 
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -896,6 +899,10 @@
  RHYTHMBOX_CFLAGS
  USE_GTK_STATUS_ICON_FALSE
  USE_GTK_STATUS_ICON_TRUE
@@ -8479,7 +8519,7 @@
  RB_CLIENT_LIBS
  RB_CLIENT_CFLAGS
  PKG_CONFIG
-@@ -1100,6 +1104,8 @@
+@@ -1100,6 +1107,8 @@
  PKG_CONFIG
  RB_CLIENT_CFLAGS
  RB_CLIENT_LIBS
@@ -8488,7 +8528,25 @@
  RHYTHMBOX_CFLAGS
  RHYTHMBOX_LIBS
  TOTEM_PLPARSER_CFLAGS
-@@ -1839,6 +1845,10 @@
+@@ -1788,7 +1797,7 @@
+   --enable-uninstalled-build
+                           Search for files in build directory as well
+   --enable-more-warnings  Maximum compiler warnings
+-  --enable-gtk-doc        use gtk-doc to build documentation [default=no]
++  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
+   --disable-scrollkeeper  do not make updates to the scrollkeeper database
+   --enable-python         Enable python support
+   --enable-vala           Enable Vala plugin support
+@@ -1831,7 +1840,7 @@
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   LIBS        libraries to pass to the linker, e.g. -l<library>
+-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   PKG_CONFIG  path to pkg-config utility
+@@ -1839,6 +1848,10 @@
                C compiler flags for RB_CLIENT, overriding pkg-config
    RB_CLIENT_LIBS
                linker flags for RB_CLIENT, overriding pkg-config
@@ -8499,33 +8557,357 @@
    RHYTHMBOX_CFLAGS
                C compiler flags for RHYTHMBOX, overriding pkg-config
    RHYTHMBOX_LIBS
-@@ -6587,13 +6597,13 @@
+@@ -1975,7 +1988,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ rhythmbox configure 0.12.6
+-generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
+ 
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -2022,7 +2035,7 @@
+ 	ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_compile
+ 
+@@ -2068,7 +2081,7 @@
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_link
+ 
+@@ -2172,7 +2185,7 @@
+     ac_retval=1
+ fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_cpp
+ 
+@@ -2214,7 +2227,7 @@
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_run
+ 
+@@ -2423,7 +2436,7 @@
+ 
+   fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_compute_int
+ 
+@@ -2524,7 +2537,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by rhythmbox $as_me 0.12.6, which was
+-generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2777,7 +2790,7 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+   test "x$ac_site_file" = xNONE && continue
+-  if test -r "$ac_site_file"; then
++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+@@ -2786,9 +2799,9 @@
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
++  # Some versions of bash will fail to source /dev/null (special files
++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+@@ -3210,6 +3223,7 @@
+ 
+ fi
+ 
++  test -d ./--version && rmdir ./--version
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -3217,7 +3231,6 @@
+     # value for MKDIR_P within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the value is a relative name.
+-    test -d ./--version && rmdir ./--version
+     MKDIR_P="$ac_install_sh -d"
+   fi
+ fi
+@@ -3816,32 +3829,30 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
++  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <stdio.h>
++
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.out", "w");
+- return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ 
+ # The possible output files:
+@@ -3903,62 +3914,29 @@
+ else
+   ac_file=''
+ fi
++if test -z "$ac_file"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "C compiler cannot create executables
++See \`config.log' for more details." "$LINENO" 5; }; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+ $as_echo "$ac_file" >&6; }
+-if test -z "$ac_file"; then :
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
+-fi
+ ac_exeext=$ac_cv_exeext
+ 
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { { case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    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 "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
+-    fi
+-  fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+ if { { ac_try="$ac_link"
+@@ -3991,13 +3969,72 @@
+ as_fn_error "cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-rm -f conftest$ac_cv_exeext
++rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++  { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++  if { ac_try='./conftest$ac_cv_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    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 "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++    fi
++  fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+ if test "${ac_cv_objext+set}" = set; then :
+@@ -5312,8 +5349,8 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
++  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
+@@ -6045,8 +6082,8 @@
+ 
+ 
+ 
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+ 
+ 
+ 
+@@ -6587,13 +6624,13 @@
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
 -  (eval echo "\"\$as_me:6590: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6600: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6627: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:6593: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6603: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6630: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:6596: output\"" >&5)
-+  (eval echo "\"\$as_me:6606: output\"" >&5)
++  (eval echo "\"\$as_me:6633: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
-@@ -7798,7 +7808,7 @@
+@@ -7059,7 +7096,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -7798,7 +7835,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7801 "configure"' > conftest.$ac_ext
-+  echo '#line 7811 "configure"' > conftest.$ac_ext
++  echo '#line 7838 "configure"' > conftest.$ac_ext
    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -9049,10 +9059,6 @@
+@@ -9049,10 +9086,6 @@
  $RM -r conftest*
  
  
@@ -8536,89 +8918,133 @@
  if test -n "$compiler"; then
  
  lt_prog_compiler_no_builtin_flag=
-@@ -9078,11 +9084,11 @@
+@@ -9078,11 +9111,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9081: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9087: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9114: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9085: \$? = $ac_status" >&5
-+   echo "$as_me:9091: \$? = $ac_status" >&5
++   echo "$as_me:9118: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9417,11 +9423,11 @@
+@@ -9247,7 +9280,7 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -9417,11 +9450,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9420: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9426: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9453: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9424: \$? = $ac_status" >&5
-+   echo "$as_me:9430: \$? = $ac_status" >&5
++   echo "$as_me:9457: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9522,11 +9528,11 @@
+@@ -9522,11 +9555,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9525: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9531: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9558: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9529: \$? = $ac_status" >&5
-+   echo "$as_me:9535: \$? = $ac_status" >&5
++   echo "$as_me:9562: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -9577,11 +9583,11 @@
+@@ -9577,11 +9610,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9580: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9586: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9613: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9584: \$? = $ac_status" >&5
-+   echo "$as_me:9590: \$? = $ac_status" >&5
++   echo "$as_me:9617: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -11960,7 +11966,7 @@
+@@ -9720,6 +9753,7 @@
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 2>&1` in
++      *GNU\ gold*) supports_anon_versioning=yes ;;
+       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -9811,7 +9845,7 @@
+       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -11273,7 +11307,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -11960,7 +11994,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line 11963 "configure"
-+#line 11969 "configure"
++#line 11997 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12056,7 +12062,7 @@
+@@ -12056,7 +12090,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line 12059 "configure"
-+#line 12065 "configure"
++#line 12093 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -13918,6 +13924,7 @@
+@@ -12696,7 +12730,7 @@
+ 
+ lt_cl_version="\
+ rhythmbox config.lt 0.12.6
+-configured by $0, generated by GNU Autoconf 2.64.
++configured by $0, generated by GNU Autoconf 2.65.
+ 
+ Copyright (C) 2008 Free Software Foundation, Inc.
+ This config.lt script is free software; the Free Software Foundation
+@@ -13918,6 +13952,7 @@
  LIBSOUP_REQS=2.26.0
  GUDEV_REQS=143
  LIBMTP_REQS=0.3.0
-+APPINDICATOR_REQS=0.0.2
++APPINDICATOR_REQS=0.0.7
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU extension fwrite_unlocked" >&5
  $as_echo_n "checking for GNU extension fwrite_unlocked... " >&6; }
-@@ -14190,6 +14197,125 @@
+@@ -14190,6 +14225,125 @@
    LIBGNOME_REQS=libgnomeui-2.0
  fi
  
@@ -8744,7 +9170,7 @@
  # use gtk status icon with gtk >= 2.16
  if test -n "$PKG_CONFIG" && \
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16\""; } >&5
-@@ -14230,6 +14356,7 @@
+@@ -14230,6 +14384,7 @@
  		  gtk+-2.0 >= \$GTK_REQS			\\
  		  glib-2.0 >= \$GLIB_REQS		\\
  		  gio-2.0 >= \$GLIB_REQS			\\
@@ -8752,7 +9178,7 @@
  		  gio-unix-2.0 >= \$GLIB_REQS		\\
  		  gnome-media-profiles >= \$GNOME_MEDIA_PROFILES_REQS \\
  		  libsoup-2.4 >= \$LIBSOUP_REQS		\\
-@@ -14239,6 +14366,7 @@
+@@ -14239,6 +14394,7 @@
  		  gtk+-2.0 >= $GTK_REQS			\
  		  glib-2.0 >= $GLIB_REQS		\
  		  gio-2.0 >= $GLIB_REQS			\
@@ -8760,7 +9186,7 @@
  		  gio-unix-2.0 >= $GLIB_REQS		\
  		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
  		  libsoup-2.4 >= $LIBSOUP_REQS		\
-@@ -14251,6 +14379,7 @@
+@@ -14251,6 +14407,7 @@
  		  gtk+-2.0 >= $GTK_REQS			\
  		  glib-2.0 >= $GLIB_REQS		\
  		  gio-2.0 >= $GLIB_REQS			\
@@ -8768,7 +9194,7 @@
  		  gio-unix-2.0 >= $GLIB_REQS		\
  		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
  		  libsoup-2.4 >= $LIBSOUP_REQS		\
-@@ -14272,6 +14401,7 @@
+@@ -14272,6 +14429,7 @@
  		  gtk+-2.0 >= \$GTK_REQS			\\
  		  glib-2.0 >= \$GLIB_REQS		\\
  		  gio-2.0 >= \$GLIB_REQS			\\
@@ -8776,7 +9202,7 @@
  		  gio-unix-2.0 >= \$GLIB_REQS		\\
  		  gnome-media-profiles >= \$GNOME_MEDIA_PROFILES_REQS \\
  		  libsoup-2.4 >= \$LIBSOUP_REQS		\\
-@@ -14281,6 +14411,7 @@
+@@ -14281,6 +14439,7 @@
  		  gtk+-2.0 >= $GTK_REQS			\
  		  glib-2.0 >= $GLIB_REQS		\
  		  gio-2.0 >= $GLIB_REQS			\
@@ -8784,7 +9210,7 @@
  		  gio-unix-2.0 >= $GLIB_REQS		\
  		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
  		  libsoup-2.4 >= $LIBSOUP_REQS		\
-@@ -14293,6 +14424,7 @@
+@@ -14293,6 +14452,7 @@
  		  gtk+-2.0 >= $GTK_REQS			\
  		  glib-2.0 >= $GLIB_REQS		\
  		  gio-2.0 >= $GLIB_REQS			\
@@ -8792,7 +9218,7 @@
  		  gio-unix-2.0 >= $GLIB_REQS		\
  		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
  		  libsoup-2.4 >= $LIBSOUP_REQS		\
-@@ -14320,6 +14452,7 @@
+@@ -14320,6 +14480,7 @@
  		  gtk+-2.0 >= $GTK_REQS			\
  		  glib-2.0 >= $GLIB_REQS		\
  		  gio-2.0 >= $GLIB_REQS			\
@@ -8800,7 +9226,7 @@
  		  gio-unix-2.0 >= $GLIB_REQS		\
  		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
  		  libsoup-2.4 >= $LIBSOUP_REQS		\
-@@ -14330,6 +14463,7 @@
+@@ -14330,6 +14491,7 @@
  		  gtk+-2.0 >= $GTK_REQS			\
  		  glib-2.0 >= $GLIB_REQS		\
  		  gio-2.0 >= $GLIB_REQS			\
@@ -8808,7 +9234,7 @@
  		  gio-unix-2.0 >= $GLIB_REQS		\
  		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
  		  libsoup-2.4 >= $LIBSOUP_REQS		\
-@@ -14343,6 +14477,7 @@
+@@ -14343,6 +14505,7 @@
  		  gtk+-2.0 >= $GTK_REQS			\
  		  glib-2.0 >= $GLIB_REQS		\
  		  gio-2.0 >= $GLIB_REQS			\
@@ -8816,7 +9242,7 @@
  		  gio-unix-2.0 >= $GLIB_REQS		\
  		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
  		  libsoup-2.4 >= $LIBSOUP_REQS		\
-@@ -18498,10 +18633,9 @@
+@@ -18498,10 +18661,9 @@
  		PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
  	fi
  	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
@@ -8828,7 +9254,7 @@
  
  
  
-@@ -19044,6 +19178,10 @@
+@@ -19044,6 +19206,10 @@
    as_fn_error "conditional \"MKDTEMP_MISSING\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
@@ -8839,7 +9265,65 @@
  if test -z "${USE_GTK_STATUS_ICON_TRUE}" && test -z "${USE_GTK_STATUS_ICON_FALSE}"; then
    as_fn_error "conditional \"USE_GTK_STATUS_ICON\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -21599,5 +21737,13 @@
+@@ -19561,7 +19727,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by rhythmbox $as_me 0.12.6, which was
+-generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -19601,6 +19767,7 @@
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number and configuration settings, then exit
++      --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -19623,10 +19790,11 @@
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ rhythmbox config.status 0.12.6
+-configured by $0, generated by GNU Autoconf 2.64,
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
+ 
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+@@ -19664,6 +19832,8 @@
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
++  --config | --confi | --conf | --con | --co | --c )
++    $as_echo "$ac_cs_config"; exit ;;
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+@@ -20196,7 +20366,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -20210,7 +20380,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -21599,5 +21769,13 @@
  $as_echo "$as_me:    iTunes detection browser plugin (for podcasts) disabled" >&6;}
  fi
  
@@ -8855,8 +9339,8 @@
  $as_echo "$as_me: End options" >&6;}
 
 === modified file 'data/Makefile.in'
---- data/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/Makefile.in	2009-12-11 02:31:13 +0000
+--- data/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -38,14 +38,7 @@
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  	$(srcdir)/rhythmbox.desktop.in.in
@@ -8884,8 +9368,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/Makefile.in'
---- data/icons/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/Makefile.in	2009-12-11 02:31:13 +0000
+--- data/icons/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -36,14 +36,7 @@
  subdir = data/icons
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -8913,8 +9397,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/16x16/Makefile.in'
---- data/icons/hicolor/16x16/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/16x16/Makefile.in	2009-12-11 02:31:13 +0000
+--- data/icons/hicolor/16x16/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/16x16/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -36,14 +36,7 @@
  subdir = data/icons/hicolor/16x16
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -8942,8 +9426,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/16x16/actions/Makefile.in'
---- data/icons/hicolor/16x16/actions/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/16x16/actions/Makefile.in	2009-12-11 02:31:13 +0000
+--- data/icons/hicolor/16x16/actions/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/16x16/actions/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/16x16/actions
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -8971,8 +9455,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/16x16/apps/Makefile.in'
---- data/icons/hicolor/16x16/apps/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/16x16/apps/Makefile.in	2009-12-11 02:31:13 +0000
+--- data/icons/hicolor/16x16/apps/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/16x16/apps/Makefile.in	2010-01-13 15:55:03 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/16x16/apps
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9000,8 +9484,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/16x16/places/Makefile.in'
---- data/icons/hicolor/16x16/places/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/16x16/places/Makefile.in	2009-12-11 02:31:13 +0000
+--- data/icons/hicolor/16x16/places/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/16x16/places/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/16x16/places
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9029,8 +9513,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/16x16/status/Makefile.in'
---- data/icons/hicolor/16x16/status/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/16x16/status/Makefile.in	2009-12-11 02:31:13 +0000
+--- data/icons/hicolor/16x16/status/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/16x16/status/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/16x16/status
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9058,8 +9542,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/22x22/Makefile.in'
---- data/icons/hicolor/22x22/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/22x22/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/22x22/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/22x22/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -36,14 +36,7 @@
  subdir = data/icons/hicolor/22x22
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9087,8 +9571,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/22x22/actions/Makefile.in'
---- data/icons/hicolor/22x22/actions/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/22x22/actions/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/22x22/actions/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/22x22/actions/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/22x22/actions
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9116,8 +9600,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/22x22/apps/Makefile.in'
---- data/icons/hicolor/22x22/apps/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/22x22/apps/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/22x22/apps/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/22x22/apps/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/22x22/apps
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9145,8 +9629,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/22x22/places/Makefile.in'
---- data/icons/hicolor/22x22/places/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/22x22/places/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/22x22/places/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/22x22/places/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/22x22/places
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9174,8 +9658,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/22x22/status/Makefile.in'
---- data/icons/hicolor/22x22/status/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/22x22/status/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/22x22/status/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/22x22/status/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/22x22/status
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9203,8 +9687,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/24x24/Makefile.in'
---- data/icons/hicolor/24x24/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/24x24/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/24x24/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/24x24/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -36,14 +36,7 @@
  subdir = data/icons/hicolor/24x24
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9232,8 +9716,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/24x24/apps/Makefile.in'
---- data/icons/hicolor/24x24/apps/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/24x24/apps/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/24x24/apps/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/24x24/apps/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/24x24/apps
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9261,8 +9745,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/32x32/Makefile.in'
---- data/icons/hicolor/32x32/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/32x32/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/32x32/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/32x32/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -36,14 +36,7 @@
  subdir = data/icons/hicolor/32x32
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9290,8 +9774,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/32x32/actions/Makefile.in'
---- data/icons/hicolor/32x32/actions/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/32x32/actions/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/32x32/actions/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/32x32/actions/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/32x32/actions
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9319,8 +9803,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/32x32/apps/Makefile.in'
---- data/icons/hicolor/32x32/apps/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/32x32/apps/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/32x32/apps/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/32x32/apps/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/32x32/apps
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9348,8 +9832,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/32x32/places/Makefile.in'
---- data/icons/hicolor/32x32/places/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/32x32/places/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/32x32/places/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/32x32/places/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/32x32/places
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9377,8 +9861,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/32x32/status/Makefile.in'
---- data/icons/hicolor/32x32/status/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/32x32/status/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/32x32/status/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/32x32/status/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/32x32/status
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9406,8 +9890,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/48x48/Makefile.in'
---- data/icons/hicolor/48x48/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/48x48/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/48x48/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/48x48/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -36,14 +36,7 @@
  subdir = data/icons/hicolor/48x48
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9435,8 +9919,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/48x48/apps/Makefile.in'
---- data/icons/hicolor/48x48/apps/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/48x48/apps/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/48x48/apps/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/48x48/apps/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/48x48/apps
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9464,8 +9948,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/Makefile.in'
---- data/icons/hicolor/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/Makefile.in	2009-12-11 02:31:14 +0000
+--- data/icons/hicolor/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/Makefile.in	2010-01-13 15:55:04 +0000
 @@ -36,14 +36,7 @@
  subdir = data/icons/hicolor
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9493,8 +9977,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/scalable/Makefile.in'
---- data/icons/hicolor/scalable/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/scalable/Makefile.in	2009-12-11 02:31:15 +0000
+--- data/icons/hicolor/scalable/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/scalable/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -36,14 +36,7 @@
  subdir = data/icons/hicolor/scalable
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9522,8 +10006,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/scalable/actions/Makefile.in'
---- data/icons/hicolor/scalable/actions/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/scalable/actions/Makefile.in	2009-12-11 02:31:15 +0000
+--- data/icons/hicolor/scalable/actions/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/scalable/actions/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/scalable/actions
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9551,8 +10035,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/scalable/apps/Makefile.in'
---- data/icons/hicolor/scalable/apps/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/scalable/apps/Makefile.in	2009-12-11 02:31:15 +0000
+--- data/icons/hicolor/scalable/apps/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/scalable/apps/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/scalable/apps
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9580,8 +10064,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/scalable/places/Makefile.in'
---- data/icons/hicolor/scalable/places/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/scalable/places/Makefile.in	2009-12-11 02:31:15 +0000
+--- data/icons/hicolor/scalable/places/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/scalable/places/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/scalable/places
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9609,8 +10093,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/icons/hicolor/scalable/status/Makefile.in'
---- data/icons/hicolor/scalable/status/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/icons/hicolor/scalable/status/Makefile.in	2009-12-11 02:31:15 +0000
+--- data/icons/hicolor/scalable/status/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/icons/hicolor/scalable/status/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -37,14 +37,7 @@
  subdir = data/icons/hicolor/scalable/status
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9638,8 +10122,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'data/ui/Makefile.in'
---- data/ui/Makefile.in	2009-12-10 16:02:04 +0000
-+++ data/ui/Makefile.in	2009-12-11 02:31:15 +0000
+--- data/ui/Makefile.in	2010-01-13 15:30:05 +0000
++++ data/ui/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -37,14 +37,7 @@
  subdir = data/ui
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9667,8 +10151,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'doc/Makefile.in'
---- doc/Makefile.in	2009-12-10 16:02:04 +0000
-+++ doc/Makefile.in	2009-12-11 02:31:15 +0000
+--- doc/Makefile.in	2010-01-13 15:30:05 +0000
++++ doc/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -36,14 +36,7 @@
  subdir = doc
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9696,8 +10180,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'doc/reference/Makefile.in'
---- doc/reference/Makefile.in	2009-12-10 16:02:04 +0000
-+++ doc/reference/Makefile.in	2009-12-11 02:31:15 +0000
+--- doc/reference/Makefile.in	2010-01-13 15:30:05 +0000
++++ doc/reference/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -43,14 +43,7 @@
  	$(top_srcdir)/gtk-doc.make
  subdir = doc/reference
@@ -9725,8 +10209,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'help/Makefile.in'
---- help/Makefile.in	2009-12-10 16:02:04 +0000
-+++ help/Makefile.in	2009-12-11 02:31:15 +0000
+--- help/Makefile.in	2010-01-13 15:30:05 +0000
++++ help/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -61,14 +61,7 @@
  	$(top_srcdir)/gnome-doc-utils.make ChangeLog
  subdir = help
@@ -9754,8 +10238,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'lib/Makefile.in'
---- lib/Makefile.in	2009-12-10 16:02:04 +0000
-+++ lib/Makefile.in	2009-12-11 02:31:15 +0000
+--- lib/Makefile.in	2010-01-13 15:30:05 +0000
++++ lib/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -37,14 +37,7 @@
  subdir = lib
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9783,8 +10267,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'lib/libmediaplayerid/Makefile.in'
---- lib/libmediaplayerid/Makefile.in	2009-12-10 16:02:04 +0000
-+++ lib/libmediaplayerid/Makefile.in	2009-12-11 02:31:15 +0000
+--- lib/libmediaplayerid/Makefile.in	2010-01-13 15:30:05 +0000
++++ lib/libmediaplayerid/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -45,14 +45,7 @@
  subdir = lib/libmediaplayerid
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9811,9 +10295,42 @@
  AUTOCONF = @AUTOCONF@
  AUTOHEADER = @AUTOHEADER@
 
+=== modified file 'ltmain.sh'
+--- ltmain.sh	2010-01-13 15:30:05 +0000
++++ ltmain.sh	2010-01-13 15:54:59 +0000
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
+ 
+-# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+@@ -65,7 +65,7 @@
+ #       compiler:		$LTCC
+ #       compiler flags:		$LTCFLAGS
+ #       linker:		$LD (gnu? $with_gnu_ld)
+-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
++#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+ #       automake:		$automake_version
+ #       autoconf:		$autoconf_version
+ #
+@@ -73,9 +73,9 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="2.2.6 Debian-2.2.6a-4"
++VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+ TIMESTAMP=""
+-package_revision=1.3012
++package_revision=1.3017
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
 === modified file 'macros/Makefile.in'
---- macros/Makefile.in	2009-12-10 16:02:04 +0000
-+++ macros/Makefile.in	2009-12-11 02:31:15 +0000
+--- macros/Makefile.in	2010-01-13 15:30:05 +0000
++++ macros/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -36,14 +36,7 @@
  subdir = macros
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9840,9 +10357,100 @@
  AUTOCONF = @AUTOCONF@
  AUTOHEADER = @AUTOHEADER@
 
+=== modified file 'macros/libtool.m4'
+--- macros/libtool.m4	2010-01-13 15:30:05 +0000
++++ macros/libtool.m4	2010-01-13 15:54:59 +0000
+@@ -2445,7 +2445,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -3084,7 +3084,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -3705,7 +3705,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -3989,7 +3989,7 @@
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -4285,6 +4285,7 @@
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 2>&1` in
++      *GNU\ gold*) supports_anon_versioning=yes ;;
+       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -4376,7 +4377,7 @@
+       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -5860,7 +5861,7 @@
+         _LT_TAGVAR(inherit_rpath, $1)=yes
+         ;;
+ 
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+         case $cc_basename in
+           KCC*)
+ 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+=== modified file 'macros/ltversion.m4'
+--- macros/ltversion.m4	2010-01-13 15:30:05 +0000
++++ macros/ltversion.m4	2010-01-13 15:54:59 +0000
+@@ -9,15 +9,15 @@
+ 
+ # Generated from ltversion.in.
+ 
+-# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+ 
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+ 
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+
 === modified file 'metadata/Makefile.in'
---- metadata/Makefile.in	2009-12-10 16:02:04 +0000
-+++ metadata/Makefile.in	2009-12-11 02:31:15 +0000
+--- metadata/Makefile.in	2010-01-13 15:30:05 +0000
++++ metadata/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -40,14 +40,7 @@
  subdir = metadata
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9870,8 +10478,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/Makefile.in'
---- plugins/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/Makefile.in	2010-01-13 15:55:05 +0000
 @@ -58,14 +58,7 @@
  subdir = plugins
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9899,8 +10507,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/artdisplay/Makefile.in'
---- plugins/artdisplay/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/artdisplay/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/artdisplay/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/artdisplay/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -39,14 +39,7 @@
  subdir = plugins/artdisplay
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9928,8 +10536,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/artdisplay/artdisplay/Makefile.in'
---- plugins/artdisplay/artdisplay/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/artdisplay/artdisplay/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/artdisplay/artdisplay/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/artdisplay/artdisplay/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -39,14 +39,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -9957,8 +10565,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/audiocd/Makefile.in'
---- plugins/audiocd/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/audiocd/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/audiocd/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/audiocd/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -53,14 +53,7 @@
  subdir = plugins/audiocd
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -9986,8 +10594,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/audioscrobbler/Makefile.in'
---- plugins/audioscrobbler/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/audioscrobbler/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/audioscrobbler/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/audioscrobbler/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/audioscrobbler
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10015,8 +10623,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/brasero-disc-recorder/Makefile.in'
---- plugins/brasero-disc-recorder/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/brasero-disc-recorder/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/brasero-disc-recorder/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/brasero-disc-recorder/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/brasero-disc-recorder
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10044,8 +10652,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/cd-recorder/Makefile.in'
---- plugins/cd-recorder/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/cd-recorder/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/cd-recorder/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/cd-recorder/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/cd-recorder
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10073,8 +10681,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/coherence/Makefile.in'
---- plugins/coherence/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/coherence/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/coherence/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/coherence/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -39,14 +39,7 @@
  subdir = plugins/coherence
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10102,8 +10710,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/coherence/upnp_coherence/Makefile.in'
---- plugins/coherence/upnp_coherence/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/coherence/upnp_coherence/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/coherence/upnp_coherence/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/coherence/upnp_coherence/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -39,14 +39,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -10131,8 +10739,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/context/Makefile.in'
---- plugins/context/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/context/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/context/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/context/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -39,14 +39,7 @@
  subdir = plugins/context
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10160,8 +10768,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/context/context/Makefile.in'
---- plugins/context/context/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/context/context/Makefile.in	2009-12-11 02:31:16 +0000
+--- plugins/context/context/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/context/context/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -39,14 +39,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -10189,8 +10797,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/daap/Makefile.in'
---- plugins/daap/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/daap/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/daap/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/daap/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -40,14 +40,7 @@
  subdir = plugins/daap
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10218,8 +10826,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/fmradio/Makefile.in'
---- plugins/fmradio/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/fmradio/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/fmradio/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/fmradio/Makefile.in	2010-01-13 15:55:06 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/fmradio
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10247,8 +10855,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/generic-player/Makefile.in'
---- plugins/generic-player/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/generic-player/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/generic-player/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/generic-player/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/generic-player
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10276,8 +10884,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/im-status/Makefile.in'
---- plugins/im-status/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/im-status/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/im-status/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/im-status/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -40,14 +40,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -10305,8 +10913,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/ipod/Makefile.in'
---- plugins/ipod/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/ipod/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/ipod/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/ipod/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/ipod
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10334,8 +10942,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/iradio/Makefile.in'
---- plugins/iradio/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/iradio/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/iradio/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/iradio/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/iradio
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10363,8 +10971,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/jamendo/Makefile.in'
---- plugins/jamendo/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/jamendo/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/jamendo/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/jamendo/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -39,14 +39,7 @@
  subdir = plugins/jamendo
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10392,8 +11000,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/jamendo/jamendo/Makefile.in'
---- plugins/jamendo/jamendo/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/jamendo/jamendo/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/jamendo/jamendo/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/jamendo/jamendo/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -39,14 +39,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -10421,8 +11029,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/lirc/Makefile.in'
---- plugins/lirc/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/lirc/Makefile.in	2009-12-11 02:31:17 +0000
+--- plugins/lirc/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/lirc/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/lirc
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10450,8 +11058,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/lyrics/Makefile.in'
---- plugins/lyrics/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/lyrics/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/lyrics/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/lyrics/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -39,14 +39,7 @@
  subdir = plugins/lyrics
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10479,8 +11087,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/lyrics/lyrics/Makefile.in'
---- plugins/lyrics/lyrics/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/lyrics/lyrics/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/lyrics/lyrics/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/lyrics/lyrics/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -39,14 +39,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -10508,8 +11116,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/magnatune/Makefile.in'
---- plugins/magnatune/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/magnatune/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/magnatune/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/magnatune/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -39,14 +39,7 @@
  subdir = plugins/magnatune
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10537,8 +11145,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/magnatune/magnatune/Makefile.in'
---- plugins/magnatune/magnatune/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/magnatune/magnatune/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/magnatune/magnatune/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/magnatune/magnatune/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -39,14 +39,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -10566,8 +11174,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/mmkeys/Makefile.in'
---- plugins/mmkeys/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/mmkeys/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/mmkeys/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/mmkeys/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/mmkeys
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10595,8 +11203,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/mtpdevice/Makefile.in'
---- plugins/mtpdevice/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/mtpdevice/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/mtpdevice/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/mtpdevice/Makefile.in	2010-01-13 15:55:07 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/mtpdevice
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10624,8 +11232,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/power-manager/Makefile.in'
---- plugins/power-manager/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/power-manager/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/power-manager/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/power-manager/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/power-manager
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10653,8 +11261,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/pythonconsole/Makefile.in'
---- plugins/pythonconsole/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/pythonconsole/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/pythonconsole/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/pythonconsole/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -38,14 +38,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -10682,8 +11290,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/rb/Makefile.in'
---- plugins/rb/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/rb/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/rb/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/rb/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -37,14 +37,7 @@
  DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
@@ -10711,8 +11319,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/sample-python/Makefile.in'
---- plugins/sample-python/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/sample-python/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/sample-python/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/sample-python/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -36,14 +36,7 @@
  subdir = plugins/sample-python
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10740,8 +11348,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/sample-vala/Makefile.in'
---- plugins/sample-vala/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/sample-vala/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/sample-vala/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/sample-vala/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -38,14 +38,7 @@
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  	libsample_vala_la_vala.stamp rb-sample-vala-plugin.c
@@ -10769,8 +11377,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/sample/Makefile.in'
---- plugins/sample/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/sample/Makefile.in	2009-12-11 02:31:18 +0000
+--- plugins/sample/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/sample/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -37,14 +37,7 @@
  subdir = plugins/sample
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10798,8 +11406,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'plugins/status-icon/Makefile.in'
---- plugins/status-icon/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/status-icon/Makefile.in	2009-12-11 02:31:19 +0000
+--- plugins/status-icon/Makefile.in	2010-01-13 15:54:46 +0000
++++ plugins/status-icon/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/status-icon
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10816,111 +11424,10 @@
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -79,15 +72,17 @@
- am__DEPENDENCIES_1 =
- libstatus_icon_la_DEPENDENCIES =  \
- 	$(top_builddir)/shell/librhythmbox-core.la \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1)
- am__libstatus_icon_la_SOURCES_DIST = rb-status-icon-plugin.h \
- 	rb-status-icon-plugin.c eggtrayicon.c eggtrayicon.h \
- 	rb-tray-icon.c rb-tray-icon.h rb-tray-icon-gtk.h \
--	rb-tray-icon-gtk.c
--@USE_GTK_STATUS_ICON_FALSE@am__objects_1 =  \
--@USE_GTK_STATUS_ICON_FALSE@	libstatus_icon_la-eggtrayicon.lo \
--@USE_GTK_STATUS_ICON_FALSE@	libstatus_icon_la-rb-tray-icon.lo
--@USE_GTK_STATUS_ICON_TRUE@am__objects_1 = libstatus_icon_la-rb-tray-icon-gtk.lo
-+	rb-tray-icon-gtk.c rb-indicator.h rb-indicator.c
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@am__objects_1 = libstatus_icon_la-eggtrayicon.lo \
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	libstatus_icon_la-rb-tray-icon.lo
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_TRUE@am__objects_1 = libstatus_icon_la-rb-tray-icon-gtk.lo
-+@HAVE_APP_INDICATOR_TRUE@am__objects_1 =  \
-+@HAVE_APP_INDICATOR_TRUE@	libstatus_icon_la-rb-indicator.lo
- am__objects_2 =
- am_libstatus_icon_la_OBJECTS =  \
- 	libstatus_icon_la-rb-status-icon-plugin.lo $(am__objects_1) \
-@@ -137,6 +132,8 @@
- ALL_LINGUAS = @ALL_LINGUAS@
- AMTAR = @AMTAR@
- AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-+APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
-+APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
-@@ -361,15 +358,19 @@
- NULL = 
- plugindir = $(PLUGINDIR)/status-icon
- plugin_LTLIBRARIES = libstatus-icon.la
--@USE_GTK_STATUS_ICON_FALSE@ICON_IMPL_FILES = \
--@USE_GTK_STATUS_ICON_FALSE@	eggtrayicon.c \
--@USE_GTK_STATUS_ICON_FALSE@	eggtrayicon.h \
--@USE_GTK_STATUS_ICON_FALSE@	rb-tray-icon.c \
--@USE_GTK_STATUS_ICON_FALSE@	rb-tray-icon.h
--
--@USE_GTK_STATUS_ICON_TRUE@ICON_IMPL_FILES = \
--@USE_GTK_STATUS_ICON_TRUE@	rb-tray-icon-gtk.h 				\
--@USE_GTK_STATUS_ICON_TRUE@	rb-tray-icon-gtk.c
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@ICON_IMPL_FILES = \
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	eggtrayicon.c \
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	eggtrayicon.h \
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	rb-tray-icon.c \
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	rb-tray-icon.h
-+
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_TRUE@ICON_IMPL_FILES = \
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_TRUE@	rb-tray-icon-gtk.h 				\
-+@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_TRUE@	rb-tray-icon-gtk.c
-+
-+@HAVE_APP_INDICATOR_TRUE@ICON_IMPL_FILES = \
-+@HAVE_APP_INDICATOR_TRUE@	rb-indicator.h					\
-+@HAVE_APP_INDICATOR_TRUE@	rb-indicator.c
- 
- libstatus_icon_la_SOURCES = \
- 	rb-status-icon-plugin.h				\
-@@ -382,6 +383,7 @@
- libstatus_icon_la_LIBADD = \
- 	$(top_builddir)/shell/librhythmbox-core.la	\
- 	$(NOTIFY_LIBS)					\
-+	$(APP_INDICATOR_LIBS)				\
- 	$(NULL)
- 
- INCLUDES = \
-@@ -398,6 +400,7 @@
- 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
- 	-DDATADIR=\""$(datadir)"\"			\
- 	$(RHYTHMBOX_CFLAGS)				\
-+	$(APP_INDICATOR_CFLAGS)				\
- 	-D_XOPEN_SOURCE -D_BSD_SOURCE
- 
- uixmldir = $(plugindir)
-@@ -505,6 +508,7 @@
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-eggtrayicon.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-rb-indicator.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-rb-status-icon-plugin.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-rb-tray-icon-gtk.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-rb-tray-icon.Plo@am__quote@
-@@ -565,6 +569,14 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(libstatus_icon_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatus_icon_la-rb-tray-icon-gtk.lo `test -f 'rb-tray-icon-gtk.c' || echo '$(srcdir)/'`rb-tray-icon-gtk.c
- 
-+libstatus_icon_la-rb-indicator.lo: rb-indicator.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libstatus_icon_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatus_icon_la-rb-indicator.lo -MD -MP -MF $(DEPDIR)/libstatus_icon_la-rb-indicator.Tpo -c -o libstatus_icon_la-rb-indicator.lo `test -f 'rb-indicator.c' || echo '$(srcdir)/'`rb-indicator.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libstatus_icon_la-rb-indicator.Tpo $(DEPDIR)/libstatus_icon_la-rb-indicator.Plo
-+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rb-indicator.c' object='libstatus_icon_la-rb-indicator.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(libstatus_icon_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatus_icon_la-rb-indicator.lo `test -f 'rb-indicator.c' || echo '$(srcdir)/'`rb-indicator.c
-+
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
 
 === modified file 'plugins/visualizer/Makefile.in'
---- plugins/visualizer/Makefile.in	2009-12-10 16:02:04 +0000
-+++ plugins/visualizer/Makefile.in	2009-12-11 02:31:19 +0000
+--- plugins/visualizer/Makefile.in	2010-01-13 15:30:05 +0000
++++ plugins/visualizer/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -38,14 +38,7 @@
  subdir = plugins/visualizer
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10948,8 +11455,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'podcast/Makefile.in'
---- podcast/Makefile.in	2009-12-10 16:02:04 +0000
-+++ podcast/Makefile.in	2009-12-11 02:31:19 +0000
+--- podcast/Makefile.in	2010-01-13 15:30:05 +0000
++++ podcast/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -39,14 +39,7 @@
  subdir = podcast
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -10977,8 +11484,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'remote/Makefile.in'
---- remote/Makefile.in	2009-12-10 16:02:04 +0000
-+++ remote/Makefile.in	2009-12-11 02:31:19 +0000
+--- remote/Makefile.in	2010-01-13 15:30:05 +0000
++++ remote/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -36,14 +36,7 @@
  subdir = remote
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -11006,8 +11513,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'remote/dbus/Makefile.in'
---- remote/dbus/Makefile.in	2009-12-10 16:02:04 +0000
-+++ remote/dbus/Makefile.in	2009-12-11 02:31:19 +0000
+--- remote/dbus/Makefile.in	2010-01-13 15:30:05 +0000
++++ remote/dbus/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -38,14 +38,7 @@
  subdir = remote/dbus
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -11035,8 +11542,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'rhythmdb/Makefile.in'
---- rhythmdb/Makefile.in	2009-12-10 16:02:04 +0000
-+++ rhythmdb/Makefile.in	2009-12-11 02:31:19 +0000
+--- rhythmdb/Makefile.in	2010-01-13 15:30:05 +0000
++++ rhythmdb/Makefile.in	2010-01-13 15:55:08 +0000
 @@ -38,14 +38,7 @@
  subdir = rhythmdb
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -11064,8 +11571,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'shell/Makefile.in'
---- shell/Makefile.in	2009-12-10 16:02:04 +0000
-+++ shell/Makefile.in	2009-12-11 02:31:19 +0000
+--- shell/Makefile.in	2010-01-13 15:30:05 +0000
++++ shell/Makefile.in	2010-01-13 15:55:09 +0000
 @@ -48,14 +48,7 @@
  subdir = shell
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -11093,8 +11600,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'sources/Makefile.in'
---- sources/Makefile.in	2009-12-10 16:02:04 +0000
-+++ sources/Makefile.in	2009-12-11 02:31:19 +0000
+--- sources/Makefile.in	2010-01-13 15:30:05 +0000
++++ sources/Makefile.in	2010-01-13 15:55:09 +0000
 @@ -37,14 +37,7 @@
  subdir = sources
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -11122,8 +11629,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'tests/Makefile.in'
---- tests/Makefile.in	2009-12-10 16:02:04 +0000
-+++ tests/Makefile.in	2009-12-11 02:31:20 +0000
+--- tests/Makefile.in	2010-01-13 15:30:05 +0000
++++ tests/Makefile.in	2010-01-13 15:55:09 +0000
 @@ -48,14 +48,7 @@
  subdir = tests
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -11151,8 +11658,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'widgets/Makefile.in'
---- widgets/Makefile.in	2009-12-10 16:02:04 +0000
-+++ widgets/Makefile.in	2009-12-11 02:31:20 +0000
+--- widgets/Makefile.in	2010-01-13 15:30:05 +0000
++++ widgets/Makefile.in	2010-01-13 15:55:09 +0000
 @@ -38,14 +38,7 @@
  subdir = widgets
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -11180,8 +11687,8 @@
  AUTOHEADER = @AUTOHEADER@
 
 === modified file 'widgets/libsexy/Makefile.in'
---- widgets/libsexy/Makefile.in	2009-12-10 16:02:04 +0000
-+++ widgets/libsexy/Makefile.in	2009-12-11 02:31:20 +0000
+--- widgets/libsexy/Makefile.in	2010-01-13 15:30:05 +0000
++++ widgets/libsexy/Makefile.in	2010-01-13 15:55:09 +0000
 @@ -38,14 +38,7 @@
  subdir = widgets/libsexy
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
diff -u rhythmbox-0.12.6/debian/patches/82_rhythmbox-indicators.patch rhythmbox-0.12.6/debian/patches/82_rhythmbox-indicators.patch
--- rhythmbox-0.12.6/debian/patches/82_rhythmbox-indicators.patch
+++ rhythmbox-0.12.6/debian/patches/82_rhythmbox-indicators.patch
@@ -1,11 +1,11 @@
 === modified file 'configure.ac'
---- configure.ac	2009-12-15 20:03:38 +0000
-+++ configure.ac	2009-12-15 20:04:00 +0000
+--- configure.ac	2010-01-13 16:20:08 +0000
++++ configure.ac	2010-01-13 16:20:52 +0000
 @@ -46,6 +46,7 @@
  LIBSOUP_REQS=2.26.0
  GUDEV_REQS=143
  LIBMTP_REQS=0.3.0
-+APPINDICATOR_REQS=0.0.2
++APPINDICATOR_REQS=0.0.7
  
  AC_MSG_CHECKING([for GNU extension fwrite_unlocked])
  AC_LINK_IFELSE(
@@ -42,8 +42,8 @@
  AC_MSG_NOTICE([End options])
 
 === modified file 'plugins/status-icon/Makefile.am'
---- plugins/status-icon/Makefile.am	2009-12-15 20:03:38 +0000
-+++ plugins/status-icon/Makefile.am	2009-12-15 20:04:00 +0000
+--- plugins/status-icon/Makefile.am	2010-01-13 16:18:37 +0000
++++ plugins/status-icon/Makefile.am	2010-01-13 16:20:52 +0000
 @@ -3,6 +3,11 @@
  plugindir = $(PLUGINDIR)/status-icon
  plugin_LTLIBRARIES = libstatus-icon.la
@@ -81,10 +81,115 @@
  
  uixmldir = $(plugindir)
 
+=== modified file 'plugins/status-icon/Makefile.in'
+--- plugins/status-icon/Makefile.in	2010-01-13 16:18:37 +0000
++++ plugins/status-icon/Makefile.in	2010-01-13 16:32:26 +0000
+@@ -79,15 +79,17 @@
+ am__DEPENDENCIES_1 =
+ libstatus_icon_la_DEPENDENCIES =  \
+ 	$(top_builddir)/shell/librhythmbox-core.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
+ am__libstatus_icon_la_SOURCES_DIST = rb-status-icon-plugin.h \
+ 	rb-status-icon-plugin.c eggtrayicon.c eggtrayicon.h \
+ 	rb-tray-icon.c rb-tray-icon.h rb-tray-icon-gtk.h \
+-	rb-tray-icon-gtk.c
+-@USE_GTK_STATUS_ICON_FALSE@am__objects_1 =  \
+-@USE_GTK_STATUS_ICON_FALSE@	libstatus_icon_la-eggtrayicon.lo \
+-@USE_GTK_STATUS_ICON_FALSE@	libstatus_icon_la-rb-tray-icon.lo
+-@USE_GTK_STATUS_ICON_TRUE@am__objects_1 = libstatus_icon_la-rb-tray-icon-gtk.lo
++	rb-tray-icon-gtk.c rb-indicator.h rb-indicator.c
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@am__objects_1 = libstatus_icon_la-eggtrayicon.lo \
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	libstatus_icon_la-rb-tray-icon.lo
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_TRUE@am__objects_1 = libstatus_icon_la-rb-tray-icon-gtk.lo
++@HAVE_APP_INDICATOR_TRUE@am__objects_1 =  \
++@HAVE_APP_INDICATOR_TRUE@	libstatus_icon_la-rb-indicator.lo
+ am__objects_2 =
+ am_libstatus_icon_la_OBJECTS =  \
+ 	libstatus_icon_la-rb-status-icon-plugin.lo $(am__objects_1) \
+@@ -137,6 +139,8 @@
+ ALL_LINGUAS = @ALL_LINGUAS@
+ AMTAR = @AMTAR@
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@
++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+@@ -361,15 +365,19 @@
+ NULL = 
+ plugindir = $(PLUGINDIR)/status-icon
+ plugin_LTLIBRARIES = libstatus-icon.la
+-@USE_GTK_STATUS_ICON_FALSE@ICON_IMPL_FILES = \
+-@USE_GTK_STATUS_ICON_FALSE@	eggtrayicon.c \
+-@USE_GTK_STATUS_ICON_FALSE@	eggtrayicon.h \
+-@USE_GTK_STATUS_ICON_FALSE@	rb-tray-icon.c \
+-@USE_GTK_STATUS_ICON_FALSE@	rb-tray-icon.h
+-
+-@USE_GTK_STATUS_ICON_TRUE@ICON_IMPL_FILES = \
+-@USE_GTK_STATUS_ICON_TRUE@	rb-tray-icon-gtk.h 				\
+-@USE_GTK_STATUS_ICON_TRUE@	rb-tray-icon-gtk.c
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@ICON_IMPL_FILES = \
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	eggtrayicon.c \
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	eggtrayicon.h \
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	rb-tray-icon.c \
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_FALSE@	rb-tray-icon.h
++
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_TRUE@ICON_IMPL_FILES = \
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_TRUE@	rb-tray-icon-gtk.h 				\
++@HAVE_APP_INDICATOR_FALSE@@USE_GTK_STATUS_ICON_TRUE@	rb-tray-icon-gtk.c
++
++@HAVE_APP_INDICATOR_TRUE@ICON_IMPL_FILES = \
++@HAVE_APP_INDICATOR_TRUE@	rb-indicator.h					\
++@HAVE_APP_INDICATOR_TRUE@	rb-indicator.c
+ 
+ libstatus_icon_la_SOURCES = \
+ 	rb-status-icon-plugin.h				\
+@@ -382,6 +390,7 @@
+ libstatus_icon_la_LIBADD = \
+ 	$(top_builddir)/shell/librhythmbox-core.la	\
+ 	$(NOTIFY_LIBS)					\
++	$(APP_INDICATOR_LIBS)				\
+ 	$(NULL)
+ 
+ INCLUDES = \
+@@ -398,6 +407,7 @@
+ 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
+ 	-DDATADIR=\""$(datadir)"\"			\
+ 	$(RHYTHMBOX_CFLAGS)				\
++	$(APP_INDICATOR_CFLAGS)				\
+ 	-D_XOPEN_SOURCE -D_BSD_SOURCE
+ 
+ uixmldir = $(plugindir)
+@@ -505,6 +515,7 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-eggtrayicon.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-rb-indicator.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-rb-status-icon-plugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-rb-tray-icon-gtk.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libstatus_icon_la-rb-tray-icon.Plo@am__quote@
+@@ -565,6 +576,14 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(libstatus_icon_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatus_icon_la-rb-tray-icon-gtk.lo `test -f 'rb-tray-icon-gtk.c' || echo '$(srcdir)/'`rb-tray-icon-gtk.c
+ 
++libstatus_icon_la-rb-indicator.lo: rb-indicator.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libstatus_icon_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libstatus_icon_la-rb-indicator.lo -MD -MP -MF $(DEPDIR)/libstatus_icon_la-rb-indicator.Tpo -c -o libstatus_icon_la-rb-indicator.lo `test -f 'rb-indicator.c' || echo '$(srcdir)/'`rb-indicator.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libstatus_icon_la-rb-indicator.Tpo $(DEPDIR)/libstatus_icon_la-rb-indicator.Plo
++@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rb-indicator.c' object='libstatus_icon_la-rb-indicator.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(libstatus_icon_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libstatus_icon_la-rb-indicator.lo `test -f 'rb-indicator.c' || echo '$(srcdir)/'`rb-indicator.c
++
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 
+
 === added file 'plugins/status-icon/rb-indicator.c'
 --- plugins/status-icon/rb-indicator.c	1970-01-01 00:00:00 +0000
-+++ plugins/status-icon/rb-indicator.c	2009-12-15 20:04:00 +0000
-@@ -0,0 +1,269 @@
++++ plugins/status-icon/rb-indicator.c	2010-01-13 16:20:52 +0000
+@@ -0,0 +1,270 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
 + *  Copyright (C) 2003,2004 Colin Walters <walters@redhat.com>
@@ -201,9 +306,10 @@
 +{
 +	indicator->priv = G_TYPE_INSTANCE_GET_PRIVATE ((indicator), RB_TYPE_INDICATOR, RBIndicatorPrivate);
 +
-+	indicator->priv->indicator = app_indicator_new ("rhythmbox",
++	indicator->priv->indicator = app_indicator_new_with_path ("rhythmbox",
 +							RB_APP_ICON,
-+							APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
++							APP_INDICATOR_CATEGORY_APPLICATION_STATUS,
++							SHARE_DIR G_DIR_SEPARATOR_S "icons");
 +	app_indicator_set_status (indicator->priv->indicator,
 +				  APP_INDICATOR_STATUS_PASSIVE);
 +}
@@ -357,7 +463,7 @@
 
 === added file 'plugins/status-icon/rb-indicator.h'
 --- plugins/status-icon/rb-indicator.h	1970-01-01 00:00:00 +0000
-+++ plugins/status-icon/rb-indicator.h	2009-12-15 20:04:00 +0000
++++ plugins/status-icon/rb-indicator.h	2010-01-13 16:20:52 +0000
 @@ -0,0 +1,73 @@
 +/*
 + *  Copyright (C) 2003 Colin Walters <walters@verbum.org>
@@ -434,18 +540,39 @@
 +#endif /* __RB_INDICATOR_H */
 
 === modified file 'plugins/status-icon/rb-status-icon-plugin.c'
---- plugins/status-icon/rb-status-icon-plugin.c	2009-12-15 20:03:38 +0000
-+++ plugins/status-icon/rb-status-icon-plugin.c	2009-12-15 20:04:00 +0000
+--- plugins/status-icon/rb-status-icon-plugin.c	2010-01-13 16:18:37 +0000
++++ plugins/status-icon/rb-status-icon-plugin.c	2010-01-13 16:32:26 +0000
 @@ -118,7 +118,7 @@
  
  	/* notification data */
  	GdkPixbuf *notify_pixbuf;
 -#ifdef HAVE_NOTIFY
-+#if defined(HAVE_NOTIFY) && !defined(HAVE_APP_INDICATOR)
++#if defined(HAVE_NOTIFY)
  	NotifyNotification *notification;
  	gboolean notify_supports_actions;
  #endif
-@@ -284,6 +284,19 @@
+@@ -141,14 +141,19 @@
+ {
+ 	{ "MusicClose", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
+ 	  N_("Hide the music player window"),
+-	  G_CALLBACK (toggle_window_cmd) }
++	  G_CALLBACK (toggle_window_cmd) },
++        { "TrayShowWindow", NULL, N_("_Show Rhythmbox"), NULL,
++          N_("Show the music player window"),
++          G_CALLBACK (toggle_window_cmd) }
+ };
+ 
+ static GtkToggleActionEntry rb_status_icon_plugin_toggle_entries [] =
+ {
++#if 0
+ 	{ "TrayShowWindow", NULL, N_("_Show Music Player"), NULL,
+ 	  N_("Choose music to play"),
+ 	  G_CALLBACK (show_window_cmd) },
++#endif
+ 	{ "TrayShowNotifications", NULL, N_("Show N_otifications"), NULL,
+ 	  N_("Show notifications of song changes and other events"),
+ 	  G_CALLBACK (show_notifications_cmd) },
+@@ -284,6 +289,19 @@
  	}
  }
  
@@ -465,28 +592,59 @@
  static void
  sync_actions (RBStatusIconPlugin *plugin)
  {
-@@ -299,7 +312,7 @@
+@@ -295,11 +313,10 @@
+ 	action = gtk_action_group_get_action (plugin->priv->action_group,
+ 					      "TrayShowWindow");
+ 	g_object_get (plugin->priv->shell, "visibility", &visible, NULL);
+-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
  
  	action = gtk_action_group_get_action (plugin->priv->action_group,
  					      "TrayShowNotifications");
 -#ifdef HAVE_NOTIFY
-+#if defined(HAVE_NOTIFY) && !defined(HAVE_APP_INDICATOR)
++#if defined(HAVE_NOTIFY)
  	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
  				      plugin->priv->notify_mode != NOTIFY_NEVER);
  #else
-@@ -324,7 +337,7 @@
+@@ -324,7 +341,7 @@
  
  /* notification popups */
  
 -#ifdef HAVE_NOTIFY
-+#if defined(HAVE_NOTIFY) && !defined(HAVE_APP_INDICATOR)
++#if defined(HAVE_NOTIFY)
  static void
  notification_closed_cb (NotifyNotification *notification,
  			RBStatusIconPlugin *plugin)
+@@ -455,10 +472,12 @@
+ 
+ 	case ICON_ALWAYS:
+ 	case ICON_OWNS_WINDOW:
++#ifndef HAVE_APP_INDICATOR
+ 		if (rb_tray_icon_is_embedded (plugin->priv->tray_icon) == FALSE) {
+ 			rb_debug ("status icon is not embedded, not notifying");
+ 			return FALSE;
+ 		}
++#endif
+ 		break;
+ 
+ 	default:
+@@ -488,6 +507,13 @@
+ 	return TRUE;
+ }
+ 
++#if defined(HAVE_NOTIFY)
++void
++rb_tray_icon_attach_notification (RBTrayIcon *icon, NotifyNotification *notification)
++{
++}
++#endif
++
+ static void
+ notify_playing_entry (RBStatusIconPlugin *plugin, gboolean requested)
+ {
 
 === modified file 'plugins/status-icon/rb-status-icon-plugin.h'
---- plugins/status-icon/rb-status-icon-plugin.h	2009-12-15 20:03:38 +0000
-+++ plugins/status-icon/rb-status-icon-plugin.h	2009-12-15 20:04:00 +0000
+--- plugins/status-icon/rb-status-icon-plugin.h	2010-01-13 16:18:37 +0000
++++ plugins/status-icon/rb-status-icon-plugin.h	2010-01-13 16:20:52 +0000
 @@ -72,6 +72,8 @@
  							 GtkTooltip *tooltip,
  							 RBStatusIconPlugin *plugin);
@@ -498,8 +656,8 @@
  #endif /* __RB_STATUS_ICON_PLUGIN_H */
 
 === modified file 'plugins/status-icon/status-icon-ui.xml'
---- plugins/status-icon/status-icon-ui.xml	2009-12-15 20:03:38 +0000
-+++ plugins/status-icon/status-icon-ui.xml	2009-12-15 20:06:39 +0000
+--- plugins/status-icon/status-icon-ui.xml	2010-01-13 16:18:37 +0000
++++ plugins/status-icon/status-icon-ui.xml	2010-01-13 16:20:52 +0000
 @@ -22,5 +22,16 @@
        <separator/>
        <menuitem name="QuitTray" action="MusicQuit"/>