releasing version 0.4.0-0ubuntu1

author: Sebastien Bacher <seb128@ubuntu.com> 2010-08-26 11:27:27 +0200
committer: Sebastien Bacher <seb128@ubuntu.com> 2010-08-26 11:27:27 +0200
commit: 4bad61faf27bf1e5b5c967d641d1d36b1260d8e1 (patch)
tree: 9cb69ca30ed4469e543b92c01eac2b6fa4af3838
parent: 022c9bd2558d5881523d68d217c398e475a9da6e (diff)
parent: b4d305f16bae6804dcf2acf8b9ecc4629807c150 (diff)
download: ayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.tar.gz
ayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.tar.bz2
ayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.zip
55 files changed, 7295 insertions, 1277 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 65d7abc..aaaa093 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 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'.])])
@@ -346,7 +346,7 @@ msgstr ""
 
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
+    dnl in configure.ac.
     for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
       POFILES="$POFILES $lang.po"
@@ -475,7 +475,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir",
 dnl
 dnl Now the definitions that aclocal will find
 dnl
-ifdef(glib_configure_in,[],[
+ifdef(glib_configure_ac,[],[
 AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl
@@ -8657,8 +8657,9 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -8676,17 +8677,17 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
 
 AC_DEFUN([AM_NLS],
 [
   AC_MSG_CHECKING([whether NLS is requested])
   dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
+  AC_ARG_ENABLE([nls],
     [  --disable-nls           do not use Native Language Support],
     USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
 ])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
diff --git a/configure b/configure
index 2e523ea..bc32d57 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for indicator-sound 0.3.9.
+# Generated by GNU Autoconf 2.67 for indicator-sound 0.4.0.
 #
 # Report bugs to <conor.curran@canonical.com>.
 #
 #
 # 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, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -359,19 +359,19 @@ else
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -742,7 +742,7 @@ 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,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -761,8 +761,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-sound'
 PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='0.3.9'
-PACKAGE_STRING='indicator-sound 0.3.9'
+PACKAGE_VERSION='0.4.0'
+PACKAGE_STRING='indicator-sound 0.4.0'
 PACKAGE_BUGREPORT='conor.curran@canonical.com'
 PACKAGE_URL=''
 
@@ -1080,8 +1080,9 @@ do
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1126,7 +1127,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1152,7 +1153,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1356,7 +1357,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1372,7 +1373,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1402,8 +1403,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1411,7 +1412,7 @@ Try \`$0 --help' for more information."
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1429,13 +1430,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1458,7 +1459,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1472,8 +1473,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1488,9 +1489,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1529,11 +1530,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1559,7 +1560,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-sound 0.3.9 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1573,7 +1574,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1629,7 +1630,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-sound 0.3.9:";;
+     short | recursive ) echo "Configuration of indicator-sound 0.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1760,10 +1761,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-sound configure 0.3.9
-generated by GNU Autoconf 2.65
+indicator-sound configure 0.4.0
+generated by GNU Autoconf 2.67
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1866,7 +1867,7 @@ ac_fn_c_check_func ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1946,7 +1947,7 @@ $as_echo "$ac_try_echo"; } >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -2013,7 +2014,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2043,10 +2044,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2082,7 +2083,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2105,17 +2106,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ----------------------------------------- ##
+( $as_echo "## ----------------------------------------- ##
 ## Report this to conor.curran@canonical.com ##
-## ----------------------------------------- ##
-_ASBOX
+## ----------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2131,8 +2130,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-sound $as_me 0.3.9, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by indicator-sound $as_me 0.4.0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -2242,11 +2241,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2280,11 +2277,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2297,11 +2292,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2315,11 +2308,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2374,7 +2365,12 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2389,7 +2385,11 @@ do
     { $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
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
@@ -2465,7 +2465,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2487,16 +2487,22 @@ am__api_version='1.11'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2612,11 +2618,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2638,7 +2644,7 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2648,7 +2654,7 @@ then
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2886,7 +2892,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2894,7 +2900,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2928,7 +2934,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2944,7 +2950,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-sound
- VERSION=0.3.9
+ VERSION=0.4.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3385,8 +3391,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3500,9 +3506,8 @@ 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; }; }
+as_fn_error 77 "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; }
@@ -3544,8 +3549,8 @@ done
 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 compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3602,9 +3607,9 @@ $as_echo "$ac_try_echo"; } >&5
     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.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
     fi
   fi
 fi
@@ -3655,8 +3660,8 @@ 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_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4008,7 +4013,7 @@ fi
 
 case "$am__api_version" in
     1.01234)
-	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
     ;;
     *)
     ;;
@@ -4025,7 +4030,7 @@ $as_echo_n "checking for intltool >= 0.35.0... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	as_fn_error "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5
+	as_fn_error $? "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
@@ -4149,7 +4154,7 @@ fi
 
 
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -4431,13 +4436,13 @@ fi
 
 
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
@@ -4481,13 +4486,13 @@ fi
 
 
 if test -z "$INTLTOOL_PERL"; then
-   as_fn_error "perl not found" "$LINENO" 5
+   as_fn_error $? "perl not found" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
 $as_echo_n "checking for perl >= 5.8.1... " >&6; }
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
-   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
@@ -4500,7 +4505,7 @@ $as_echo_n "checking for XML::Parser... " >&6; }
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
    else
-       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
    fi
 fi
 
@@ -4609,7 +4614,7 @@ $as_echo "yes" >&6; } ;; #(
   2) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-          as_fn_error "Vala 0.7.8 not found." "$LINENO" 5 ;; #(
+          as_fn_error $? "Vala 0.7.8 not found." "$LINENO" 5  ;; #(
   *) :
      ;;
 esac
@@ -4617,7 +4622,7 @@ fi
 fi
 
 if test -z "$VALAC"; then :
-  as_fn_error "\"No valac compiler found.\"" "$LINENO" 5
+  as_fn_error $? "\"No valac compiler found.\"" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
@@ -4976,8 +4981,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -5352,7 +5357,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
 set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5511,7 +5516,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5527,11 +5532,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -5570,7 +5575,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5586,18 +5591,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 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 "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -5658,7 +5663,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -5724,7 +5729,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -5876,7 +5881,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -5887,16 +5892,16 @@ else
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5921,7 +5926,7 @@ else
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -5929,7 +5934,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -6002,7 +6007,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -6081,7 +6086,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -6197,7 +6202,7 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -6399,13 +6404,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6402: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6407: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6405: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6410: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6408: output\"" >&5)
+  (eval echo "\"\$as_me:6413: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7610,7 +7615,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7613 "configure"' > conftest.$ac_ext
+  echo '#line 7618 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8364,8 +8369,7 @@ do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8886,11 +8890,11 @@ else
    -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:8889: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8893: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8893: \$? = $ac_status" >&5
+   echo "$as_me:8897: \$? = $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.
@@ -9225,11 +9229,11 @@ else
    -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:9228: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9232: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9232: \$? = $ac_status" >&5
+   echo "$as_me:9236: \$? = $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.
@@ -9330,11 +9334,11 @@ else
    -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:9333: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9337: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9337: \$? = $ac_status" >&5
+   echo "$as_me:9341: \$? = $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
@@ -9385,11 +9389,11 @@ else
    -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:9388: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9392: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9392: \$? = $ac_status" >&5
+   echo "$as_me:9396: \$? = $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
@@ -11769,7 +11773,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11772 "configure"
+#line 11776 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11865,7 +11869,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11868 "configure"
+#line 11872 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12118,9 +12122,10 @@ INDICATOR_REQUIRED_VERSION=0.3.6
 DBUSMENUGTK_REQUIRED_VERSION=0.2.2
 POLKIT_REQUIRED_VERSION=0.92
 PULSE_AUDIO_REQUIRED_VERSION=0.9.19
-INDICATOR_DISPLAY_OBJECTS=0.1.10
+INDICATOR_DISPLAY_OBJECTS=0.1.11
 INDICATE_REQUIRED_VERSION=0.4.1
 DBUSMENUGLIB_REQUIRED_VERSION=0.3.1
+GIO_2_0_REQUIRED_VERSION=2.25.13
 
 
 
@@ -12322,7 +12327,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$APPLET_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
+	as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
 			              			dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
                           libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS) were not met:
@@ -12340,7 +12345,7 @@ elif test $pkg_failed = untried; then
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -12349,7 +12354,7 @@ and APPLET_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	APPLET_CFLAGS=$pkg_cv_APPLET_CFLAGS
 	APPLET_LIBS=$pkg_cv_APPLET_LIBS
@@ -12419,7 +12424,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PULSEAUDIO_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION) were not met:
+	as_fn_error $? "Package requirements (libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION) were not met:
 
 $PULSEAUDIO_PKG_ERRORS
 
@@ -12434,7 +12439,7 @@ elif test $pkg_failed = untried; then
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -12443,7 +12448,7 @@ and PULSEAUDIO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS
 	PULSEAUDIO_LIBS=$pkg_cv_PULSEAUDIO_LIBS
@@ -12535,7 +12540,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SOUNDSERVICE_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+	as_fn_error $? "Package requirements (dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
 																indicate >= $INDICATE_REQUIRED_VERSION
 																gee-1.0) were not met:
@@ -12553,7 +12558,7 @@ elif test $pkg_failed = untried; then
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -12562,7 +12567,7 @@ and SOUNDSERVICE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	SOUNDSERVICE_CFLAGS=$pkg_cv_SOUNDSERVICE_CFLAGS
 	SOUNDSERVICE_LIBS=$pkg_cv_SOUNDSERVICE_LIBS
@@ -12652,7 +12657,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&
 if test "${enable_schemas_install+set}" = set; then :
   enableval=$enable_schemas_install; case ${enableval} in
        yes|no) ;;
-       *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5  ;;
       esac
 fi
 
@@ -12723,7 +12728,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GCONF_PKG_ERRORS" >&5
 
-	as_fn_error "Package requirements (gconf-2.0 >= 2.0) were not met:
+	as_fn_error $? "Package requirements (gconf-2.0 >= 2.0) were not met:
 
 $GCONF_PKG_ERRORS
 
@@ -12738,7 +12743,7 @@ elif test $pkg_failed = untried; then
 $as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -12747,7 +12752,7 @@ and GCONF_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
 	GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
 	GCONF_LIBS=$pkg_cv_GCONF_LIBS
@@ -13621,6 +13626,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -13644,15 +13650,15 @@ else
 fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -13660,11 +13666,11 @@ fi
 
 
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -13814,19 +13820,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -14022,7 +14028,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -14075,8 +14081,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-sound $as_me 0.3.9, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by indicator-sound $as_me 0.4.0, which was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -14141,11 +14147,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="\\
-indicator-sound config.status 0.3.9
-configured by $0, generated by GNU Autoconf 2.65,
+indicator-sound config.status 0.4.0
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -14163,11 +14169,16 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -14189,6 +14200,7 @@ do
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -14201,7 +14213,7 @@ do
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -14210,7 +14222,7 @@ Try \`$0 --help' for more information.";;
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -14531,7 +14543,7 @@ do
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -14569,7 +14581,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -14586,7 +14598,7 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -14600,18 +14612,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -14700,20 +14712,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -14741,7 +14761,7 @@ for ac_last_try in false false :; do
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -14826,7 +14846,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -14839,7 +14859,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -14867,7 +14887,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -14894,7 +14914,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -15031,22 +15051,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -15057,19 +15077,19 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -15849,7 +15869,7 @@ _LT_EOF
       esac ;;
     "po/stamp-it":C)
     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
     fi
     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
     >"po/stamp-it.tmp"
@@ -15877,7 +15897,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -15898,7 +15918,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/configure.ac b/configure.ac
index 75ebf6b..0951160 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 
-AC_INIT(indicator-sound, 0.3.9, conor.curran@canonical.com)
+AC_INIT(indicator-sound, 0.4.0, conor.curran@canonical.com)
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-sound, 0.3.9)
+AM_INIT_AUTOMAKE(indicator-sound, 0.4.0)
 
 AM_MAINTAINER_MODE
 
@@ -32,11 +32,12 @@ INDICATOR_REQUIRED_VERSION=0.3.6
 DBUSMENUGTK_REQUIRED_VERSION=0.2.2
 POLKIT_REQUIRED_VERSION=0.92
 PULSE_AUDIO_REQUIRED_VERSION=0.9.19
-INDICATOR_DISPLAY_OBJECTS=0.1.10
+INDICATOR_DISPLAY_OBJECTS=0.1.11
 INDICATE_REQUIRED_VERSION=0.4.1
 DBUSMENUGLIB_REQUIRED_VERSION=0.3.1
+GIO_2_0_REQUIRED_VERSION=2.25.13
 
-PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+PKG_CHECK_MODULES(APPLET,gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
 			              			dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
                           libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
diff --git a/debian/changelog b/debian/changelog
index 4612ce9..aaf3daa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-sound (0.4.0-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 18 Aug 2010 15:51:03 +0200
+
 indicator-sound (0.3.9-0ubuntu2) maverick; urgency=low
 
   * Backport upstream commit to fix the indicator crashing when rhythmbox starts
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 423ff8e..6224272 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
 [encoding: UTF-8]
 data/indicator-sound.schemas.in
 src/dbus-menu-manager.c
+src/
diff --git a/src/Makefile.am b/src/Makefile.am
index ed3e394..74e0297 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,8 @@ libsoundmenu_la_SOURCES = \
 	title-widget.h \
 	scrub-widget.c \
 	scrub-widget.h \
+	volume-widget.c \
+	volume-widget.h \
 	dbus-shared-names.h \
   sound-service-client.h 
 
@@ -63,13 +65,15 @@ music_bridge_VALASOURCES = \
 	scrub-menu-item.vala \
 	title-menu-item.vala \
 	player-controller.vala \
-	mpris-controller-v2.vala \
+	mpris-bridge.vala \
 	mpris-controller.vala \
+	mpris2-controller.vala \
 	player-item.vala \
 	familiar-players-db.vala
 
 music_bridge_VALAFLAGS = \
   --ccode \
+  --disable-dbus-transformation \
   -H music-player-bridge.h -d . \
   --vapidir=$(top_srcdir)/vapi/ \
   --vapidir=./ \
@@ -79,7 +83,8 @@ music_bridge_VALAFLAGS = \
   --pkg Dbusmenu-Glib-0.2 \
   --pkg common-defs \
 	--pkg dbus-glib-1 \
-	--pkg gio-unix-2.0 
+	--pkg gio-unix-2.0
+	 
  $(MAINTAINER_VALAFLAGS)
 
 music_bridge_APIFILES = \
diff --git a/src/Makefile.in b/src/Makefile.in
index 164eee4..534aa81 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -77,7 +77,8 @@ am_libsoundmenu_la_OBJECTS = libsoundmenu_la-transport-widget.lo \
 	libsoundmenu_la-play-button.lo \
 	libsoundmenu_la-indicator-sound.lo \
 	libsoundmenu_la-title-widget.lo \
-	libsoundmenu_la-scrub-widget.lo
+	libsoundmenu_la-scrub-widget.lo \
+	libsoundmenu_la-volume-widget.lo
 libsoundmenu_la_OBJECTS = $(am_libsoundmenu_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -93,8 +94,9 @@ am__objects_1 = indicator_sound_service-music-player-bridge.$(OBJEXT) \
 	indicator_sound_service-scrub-menu-item.$(OBJEXT) \
 	indicator_sound_service-title-menu-item.$(OBJEXT) \
 	indicator_sound_service-player-controller.$(OBJEXT) \
-	indicator_sound_service-mpris-controller-v2.$(OBJEXT) \
+	indicator_sound_service-mpris-bridge.$(OBJEXT) \
 	indicator_sound_service-mpris-controller.$(OBJEXT) \
+	indicator_sound_service-mpris2-controller.$(OBJEXT) \
 	indicator_sound_service-player-item.$(OBJEXT) \
 	indicator_sound_service-familiar-players-db.$(OBJEXT)
 am_indicator_sound_service_OBJECTS =  \
@@ -321,6 +323,8 @@ libsoundmenu_la_SOURCES = \
 	title-widget.h \
 	scrub-widget.c \
 	scrub-widget.h \
+	volume-widget.c \
+	volume-widget.h \
 	dbus-shared-names.h \
   sound-service-client.h 
 
@@ -338,13 +342,15 @@ music_bridge_VALASOURCES = \
 	scrub-menu-item.vala \
 	title-menu-item.vala \
 	player-controller.vala \
-	mpris-controller-v2.vala \
+	mpris-bridge.vala \
 	mpris-controller.vala \
+	mpris2-controller.vala \
 	player-item.vala \
 	familiar-players-db.vala
 
 music_bridge_VALAFLAGS = \
   --ccode \
+  --disable-dbus-transformation \
   -H music-player-bridge.h -d . \
   --vapidir=$(top_srcdir)/vapi/ \
   --vapidir=./ \
@@ -354,7 +360,7 @@ music_bridge_VALAFLAGS = \
   --pkg Dbusmenu-Glib-0.2 \
   --pkg common-defs \
 	--pkg dbus-glib-1 \
-	--pkg gio-unix-2.0 
+	--pkg gio-unix-2.0
 
 music_bridge_APIFILES = \
   music-player-bridge.h 
@@ -528,8 +534,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-dbus-menu-manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-familiar-players-db.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-metadata-menu-item.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-mpris-controller-v2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-mpris-bridge.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-mpris-controller.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-mpris2-controller.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-music-player-bridge.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-player-controller.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_sound_service-player-item.Po@am__quote@
@@ -546,6 +553,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoundmenu_la-scrub-widget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoundmenu_la-title-widget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoundmenu_la-transport-widget.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoundmenu_la-volume-widget.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -619,6 +627,14 @@ libsoundmenu_la-scrub-widget.lo: scrub-widget.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoundmenu_la_CFLAGS) $(CFLAGS) -c -o libsoundmenu_la-scrub-widget.lo `test -f 'scrub-widget.c' || echo '$(srcdir)/'`scrub-widget.c
 
+libsoundmenu_la-volume-widget.lo: volume-widget.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoundmenu_la_CFLAGS) $(CFLAGS) -MT libsoundmenu_la-volume-widget.lo -MD -MP -MF $(DEPDIR)/libsoundmenu_la-volume-widget.Tpo -c -o libsoundmenu_la-volume-widget.lo `test -f 'volume-widget.c' || echo '$(srcdir)/'`volume-widget.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libsoundmenu_la-volume-widget.Tpo $(DEPDIR)/libsoundmenu_la-volume-widget.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='volume-widget.c' object='libsoundmenu_la-volume-widget.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoundmenu_la_CFLAGS) $(CFLAGS) -c -o libsoundmenu_la-volume-widget.lo `test -f 'volume-widget.c' || echo '$(srcdir)/'`volume-widget.c
+
 indicator_sound_service-sound-service.o: sound-service.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-sound-service.o -MD -MP -MF $(DEPDIR)/indicator_sound_service-sound-service.Tpo -c -o indicator_sound_service-sound-service.o `test -f 'sound-service.c' || echo '$(srcdir)/'`sound-service.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-sound-service.Tpo $(DEPDIR)/indicator_sound_service-sound-service.Po
@@ -795,21 +811,21 @@ indicator_sound_service-player-controller.obj: player-controller.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-player-controller.obj `if test -f 'player-controller.c'; then $(CYGPATH_W) 'player-controller.c'; else $(CYGPATH_W) '$(srcdir)/player-controller.c'; fi`
 
-indicator_sound_service-mpris-controller-v2.o: mpris-controller-v2.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-mpris-controller-v2.o -MD -MP -MF $(DEPDIR)/indicator_sound_service-mpris-controller-v2.Tpo -c -o indicator_sound_service-mpris-controller-v2.o `test -f 'mpris-controller-v2.c' || echo '$(srcdir)/'`mpris-controller-v2.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-mpris-controller-v2.Tpo $(DEPDIR)/indicator_sound_service-mpris-controller-v2.Po
+indicator_sound_service-mpris-bridge.o: mpris-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-mpris-bridge.o -MD -MP -MF $(DEPDIR)/indicator_sound_service-mpris-bridge.Tpo -c -o indicator_sound_service-mpris-bridge.o `test -f 'mpris-bridge.c' || echo '$(srcdir)/'`mpris-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-mpris-bridge.Tpo $(DEPDIR)/indicator_sound_service-mpris-bridge.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpris-controller-v2.c' object='indicator_sound_service-mpris-controller-v2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpris-bridge.c' object='indicator_sound_service-mpris-bridge.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-mpris-controller-v2.o `test -f 'mpris-controller-v2.c' || echo '$(srcdir)/'`mpris-controller-v2.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-mpris-bridge.o `test -f 'mpris-bridge.c' || echo '$(srcdir)/'`mpris-bridge.c
 
-indicator_sound_service-mpris-controller-v2.obj: mpris-controller-v2.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-mpris-controller-v2.obj -MD -MP -MF $(DEPDIR)/indicator_sound_service-mpris-controller-v2.Tpo -c -o indicator_sound_service-mpris-controller-v2.obj `if test -f 'mpris-controller-v2.c'; then $(CYGPATH_W) 'mpris-controller-v2.c'; else $(CYGPATH_W) '$(srcdir)/mpris-controller-v2.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-mpris-controller-v2.Tpo $(DEPDIR)/indicator_sound_service-mpris-controller-v2.Po
+indicator_sound_service-mpris-bridge.obj: mpris-bridge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-mpris-bridge.obj -MD -MP -MF $(DEPDIR)/indicator_sound_service-mpris-bridge.Tpo -c -o indicator_sound_service-mpris-bridge.obj `if test -f 'mpris-bridge.c'; then $(CYGPATH_W) 'mpris-bridge.c'; else $(CYGPATH_W) '$(srcdir)/mpris-bridge.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-mpris-bridge.Tpo $(DEPDIR)/indicator_sound_service-mpris-bridge.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpris-controller-v2.c' object='indicator_sound_service-mpris-controller-v2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpris-bridge.c' object='indicator_sound_service-mpris-bridge.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-mpris-controller-v2.obj `if test -f 'mpris-controller-v2.c'; then $(CYGPATH_W) 'mpris-controller-v2.c'; else $(CYGPATH_W) '$(srcdir)/mpris-controller-v2.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-mpris-bridge.obj `if test -f 'mpris-bridge.c'; then $(CYGPATH_W) 'mpris-bridge.c'; else $(CYGPATH_W) '$(srcdir)/mpris-bridge.c'; fi`
 
 indicator_sound_service-mpris-controller.o: mpris-controller.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-mpris-controller.o -MD -MP -MF $(DEPDIR)/indicator_sound_service-mpris-controller.Tpo -c -o indicator_sound_service-mpris-controller.o `test -f 'mpris-controller.c' || echo '$(srcdir)/'`mpris-controller.c
@@ -827,6 +843,22 @@ indicator_sound_service-mpris-controller.obj: mpris-controller.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-mpris-controller.obj `if test -f 'mpris-controller.c'; then $(CYGPATH_W) 'mpris-controller.c'; else $(CYGPATH_W) '$(srcdir)/mpris-controller.c'; fi`
 
+indicator_sound_service-mpris2-controller.o: mpris2-controller.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-mpris2-controller.o -MD -MP -MF $(DEPDIR)/indicator_sound_service-mpris2-controller.Tpo -c -o indicator_sound_service-mpris2-controller.o `test -f 'mpris2-controller.c' || echo '$(srcdir)/'`mpris2-controller.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-mpris2-controller.Tpo $(DEPDIR)/indicator_sound_service-mpris2-controller.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpris2-controller.c' object='indicator_sound_service-mpris2-controller.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-mpris2-controller.o `test -f 'mpris2-controller.c' || echo '$(srcdir)/'`mpris2-controller.c
+
+indicator_sound_service-mpris2-controller.obj: mpris2-controller.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-mpris2-controller.obj -MD -MP -MF $(DEPDIR)/indicator_sound_service-mpris2-controller.Tpo -c -o indicator_sound_service-mpris2-controller.obj `if test -f 'mpris2-controller.c'; then $(CYGPATH_W) 'mpris2-controller.c'; else $(CYGPATH_W) '$(srcdir)/mpris2-controller.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-mpris2-controller.Tpo $(DEPDIR)/indicator_sound_service-mpris2-controller.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mpris2-controller.c' object='indicator_sound_service-mpris2-controller.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -c -o indicator_sound_service-mpris2-controller.obj `if test -f 'mpris2-controller.c'; then $(CYGPATH_W) 'mpris2-controller.c'; else $(CYGPATH_W) '$(srcdir)/mpris2-controller.c'; fi`
+
 indicator_sound_service-player-item.o: player-item.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_sound_service_CFLAGS) $(CFLAGS) -MT indicator_sound_service-player-item.o -MD -MP -MF $(DEPDIR)/indicator_sound_service-player-item.Tpo -c -o indicator_sound_service-player-item.o `test -f 'player-item.c' || echo '$(srcdir)/'`player-item.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_sound_service-player-item.Tpo $(DEPDIR)/indicator_sound_service-player-item.Po
@@ -1098,6 +1130,7 @@ sound-service-server.h: $(srcdir)/sound-service.xml
 		--mode=glib-server \
 		--output=sound-service-server.h \
 		$(srcdir)/sound-service.xml
+
  $(MAINTAINER_VALAFLAGS)
 
 music_bridge_vala.stamp $(music_bridge_APIFILES): $(music_bridge_VALASOURCES)
diff --git a/src/common-defs.h b/src/common-defs.h
index 46ff520..e3b4552 100644
--- a/src/common-defs.h
+++ b/src/common-defs.h
@@ -27,7 +27,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DBUSMENU_PROPERTY_EMPTY									-1
 
 /* DBUS Custom Items */
-#define DBUSMENU_SLIDER_MENUITEM_TYPE          	"x-canonical-ido-slider-type"
+#define DBUSMENU_VOLUME_MENUITEM_TYPE          	"x-canonical-ido-volume-type"
+#define DBUSMENU_VOLUME_MENUITEM_LEVEL					"x-canonical-ido-volume-level"
 
 #define DBUSMENU_TRANSPORT_MENUITEM_TYPE       	"x-canonical-sound-menu-player-transport-type"
 #define DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE  "x-canonical-sound-menu-player-transport-state"
diff --git a/src/dbus-menu-manager.c b/src/dbus-menu-manager.c
index 4cd4a6b..6f0af9e 100644
--- a/src/dbus-menu-manager.c
+++ b/src/dbus-menu-manager.c
@@ -31,6 +31,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sound-service-dbus.h"
 #include "pulse-manager.h"
 #include "slider-menu-item.h"
+#include "common-defs.h"
 
 #include "dbus-shared-names.h"
 
@@ -74,13 +75,15 @@ DbusmenuMenuitem* dbus_menu_manager_setup()
   return root_menuitem;
 }
 
-/**
-teardown:
-**/
-void dbus_menu_manager_teardown()
+
+void dbus_menu_manager_update_volume(gdouble  volume)
 {
-  //TODO tidy up dbus_interface and items!
+  GValue value = {0};
+  g_value_init(&value, G_TYPE_DOUBLE);
+  g_value_set_double(&value, volume);
+	dbusmenu_menuitem_property_set_value(DBUSMENU_MENUITEM(volume_slider_menuitem), DBUSMENU_VOLUME_MENUITEM_LEVEL, &value);	
 }
+                                     
 
 /**
 update_pa_state:
@@ -102,7 +105,7 @@ void dbus_menu_manager_update_pa_state(gboolean pa_state, gboolean sink_availabl
   // Emit the signals after the menus are setup/torn down
   // preserve ordering !
   sound_service_dbus_update_sink_availability(dbus_interface, sink_available);
-  sound_service_dbus_update_sink_volume(dbus_interface, percent);
+	dbus_menu_manager_update_volume(percent);
   sound_service_dbus_update_sink_mute(dbus_interface, sink_muted);
   dbus_menu_manager_update_mute_ui(b_all_muted);
 }
@@ -123,7 +126,6 @@ void dbus_menu_manager_update_mute_ui(gboolean incoming_mute_value)
 /*-------------------------------------------------------------------------*/
 //                          Private Methods
 /*-------------------------------------------------------------------------*/
-
 static void refresh_menu()
 {
   g_debug("in the refresh menu method");
@@ -172,7 +174,7 @@ Bring up the gnome volume preferences dialog
 static void show_sound_settings_dialog (DbusmenuMenuitem *mi, gpointer user_data)
 {
   GError * error = NULL;
-  if (!g_spawn_command_line_async("gnome-volume-control", &error) &&
+  if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) &&
       !g_spawn_command_line_async("xfce4-mixer", &error)) 
   {
     g_warning("Unable to show dialog: %s", error->message);
diff --git a/src/dbus-menu-manager.h b/src/dbus-menu-manager.h
index 926e292..ec2b2e2 100644
--- a/src/dbus-menu-manager.h
+++ b/src/dbus-menu-manager.h
@@ -25,6 +25,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 DbusmenuMenuitem* dbus_menu_manager_setup();
 void dbus_menu_manager_teardown();
+void dbus_menu_manager_update_volume(gdouble volume);
 void dbus_menu_manager_update_pa_state(gboolean pa_state, gboolean sink_available, gboolean sink_muted, gdouble current_vol);
 // TODO update pa_state should incorporate the method below !
 void dbus_menu_manager_update_mute_ui(gboolean incoming_mute_value);
diff --git a/src/familiar-players-db.c b/src/familiar-players-db.c
index c7bfda3..4d2b452 100644
--- a/src/familiar-players-db.c
+++ b/src/familiar-players-db.c
@@ -1,4 +1,4 @@
-/* familiar-players-db.c generated by valac, the Vala compiler
+/* familiar-players-db.c generated by valac 0.9.5, the Vala compiler
  * generated from familiar-players-db.vala, do not modify */
 
 /*
@@ -141,10 +141,10 @@ static gboolean familiar_players_db_create_key_file (FamiliarPlayersDB* self) {
 			_tmp1_ = g_key_file_load_from_file (self->priv->key_file, self->priv->file_name, G_KEY_FILE_NONE, &_inner_error_);
 			if (_inner_error_ != NULL) {
 				if (_inner_error_->domain == G_KEY_FILE_ERROR) {
-					goto __catch3_g_key_file_error;
+					goto __catch9_g_key_file_error;
 				}
 				if (_inner_error_->domain == G_FILE_ERROR) {
-					goto __catch3_g_file_error;
+					goto __catch9_g_file_error;
 				}
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 				g_clear_error (&_inner_error_);
@@ -152,8 +152,8 @@ static gboolean familiar_players_db_create_key_file (FamiliarPlayersDB* self) {
 			}
 			_result_ = _tmp1_;
 		}
-		goto __finally3;
-		__catch3_g_key_file_error:
+		goto __finally9;
+		__catch9_g_key_file_error:
 		{
 			GError * e;
 			e = _inner_error_;
@@ -164,8 +164,8 @@ static gboolean familiar_players_db_create_key_file (FamiliarPlayersDB* self) {
 				_g_error_free0 (e);
 			}
 		}
-		goto __finally3;
-		__catch3_g_file_error:
+		goto __finally9;
+		__catch9_g_file_error:
 		{
 			GError * e;
 			e = _inner_error_;
@@ -176,7 +176,7 @@ static gboolean familiar_players_db_create_key_file (FamiliarPlayersDB* self) {
 				_g_error_free0 (e);
 			}
 		}
-		__finally3:
+		__finally9:
 		if (_inner_error_ != NULL) {
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 			g_clear_error (&_inner_error_);
@@ -198,7 +198,7 @@ static gboolean familiar_players_db_check_for_keys (FamiliarPlayersDB* self) {
 		_tmp0_ = g_key_file_has_key (self->priv->key_file, FAMILIAR_PLAYERS_DB_GROUP_NAME, FAMILIAR_PLAYERS_DB_KEY_NAME, &_inner_error_);
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_KEY_FILE_ERROR) {
-				goto __catch4_g_key_file_error;
+				goto __catch10_g_key_file_error;
 			}
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 			g_clear_error (&_inner_error_);
@@ -209,8 +209,8 @@ static gboolean familiar_players_db_check_for_keys (FamiliarPlayersDB* self) {
 			return result;
 		}
 	}
-	goto __finally4;
-	__catch4_g_key_file_error:
+	goto __finally10;
+	__catch10_g_key_file_error:
 	{
 		GError * e;
 		e = _inner_error_;
@@ -221,7 +221,7 @@ static gboolean familiar_players_db_check_for_keys (FamiliarPlayersDB* self) {
 			return result;
 		}
 	}
-	__finally4:
+	__finally10:
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
@@ -248,7 +248,7 @@ static gboolean familiar_players_db_load_data_from_key_file (FamiliarPlayersDB*
 		desktops = (_tmp1_ = g_key_file_get_string_list (self->priv->key_file, FAMILIAR_PLAYERS_DB_GROUP_NAME, FAMILIAR_PLAYERS_DB_KEY_NAME, &_tmp0_, &_inner_error_), desktops_length1 = _tmp0_, _desktops_size_ = desktops_length1, _tmp1_);
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_KEY_FILE_ERROR) {
-				goto __catch5_g_key_file_error;
+				goto __catch11_g_key_file_error;
 			}
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 			g_clear_error (&_inner_error_);
@@ -273,8 +273,8 @@ static gboolean familiar_players_db_load_data_from_key_file (FamiliarPlayersDB*
 		desktops = (_vala_array_free (desktops, desktops_length1, (GDestroyNotify) g_free), NULL);
 		return result;
 	}
-	goto __finally5;
-	__catch5_g_key_file_error:
+	goto __finally11;
+	__catch11_g_key_file_error:
 	{
 		GError * _error_;
 		_error_ = _inner_error_;
@@ -286,7 +286,7 @@ static gboolean familiar_players_db_load_data_from_key_file (FamiliarPlayersDB*
 			return result;
 		}
 	}
-	__finally5:
+	__finally11:
 	{
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
@@ -342,8 +342,8 @@ static gboolean familiar_players_db_write_db (FamiliarPlayersDB* self) {
 		char* _tmp4_;
 		data = (_tmp4_ = g_key_file_to_data (keyfile, &data_length, NULL), _g_free0 (data), _tmp4_);
 	}
-	goto __finally6;
-	__catch6_g_key_file_error:
+	goto __finally12;
+	__catch12_g_key_file_error:
 	{
 		GError * e;
 		e = _inner_error_;
@@ -358,7 +358,7 @@ static gboolean familiar_players_db_write_db (FamiliarPlayersDB* self) {
 			return result;
 		}
 	}
-	__finally6:
+	__finally12:
 	if (_inner_error_ != NULL) {
 		_g_free0 (data);
 		desktops = (_vala_array_free (desktops, desktops_length1, (GDestroyNotify) g_free), NULL);
@@ -380,7 +380,7 @@ static gboolean familiar_players_db_write_db (FamiliarPlayersDB* self) {
 		_tmp5_ = g_file_set_contents (self->priv->file_name, data, (gssize) data_length, &_inner_error_);
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_FILE_ERROR) {
-				goto __catch7_g_file_error;
+				goto __catch13_g_file_error;
 			}
 			_g_free0 (data);
 			desktops = (_vala_array_free (desktops, desktops_length1, (GDestroyNotify) g_free), NULL);
@@ -393,8 +393,8 @@ static gboolean familiar_players_db_write_db (FamiliarPlayersDB* self) {
 			g_warning ("familiar-players-db.vala:125: Unable to write out file '%s'", self->priv->file_name);
 		}
 	}
-	goto __finally7;
-	__catch7_g_file_error:
+	goto __finally13;
+	__catch13_g_file_error:
 	{
 		GError * err;
 		err = _inner_error_;
@@ -404,7 +404,7 @@ static gboolean familiar_players_db_write_db (FamiliarPlayersDB* self) {
 			_g_error_free0 (err);
 		}
 	}
-	__finally7:
+	__finally13:
 	if (_inner_error_ != NULL) {
 		_g_free0 (data);
 		desktops = (_vala_array_free (desktops, desktops_length1, (GDestroyNotify) g_free), NULL);
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 1c6041b..3a7abe9 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -32,44 +32,27 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 
-#include <libindicator/indicator.h>
-#include <libindicator/indicator-object.h>
-#include <libindicator/indicator-service-manager.h>
-#include <libindicator/indicator-image-helper.h>
-
 #include "indicator-sound.h"
 #include "transport-widget.h"
 #include "metadata-widget.h"
 #include "title-widget.h"
 #include "scrub-widget.h"
+#include "volume-widget.h"
+
 #include "dbus-shared-names.h"
 #include "sound-service-client.h"
 #include "common-defs.h"
 
-// GObject Boiler plate
-#define INDICATOR_SOUND_TYPE            (indicator_sound_get_type ())
-#define INDICATOR_SOUND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SOUND_TYPE, IndicatorSound))
-#define INDICATOR_SOUND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SOUND_TYPE, IndicatorSoundClass))
-#define IS_INDICATOR_SOUND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SOUND_TYPE))
-#define IS_INDICATOR_SOUND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SOUND_TYPE))
-#define INDICATOR_SOUND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SOUND_TYPE, IndicatorSoundClass))
-
-typedef struct _IndicatorSound      IndicatorSound;
-typedef struct _IndicatorSoundClass IndicatorSoundClass;
-
-//GObject class struct
-struct _IndicatorSoundClass {
-  IndicatorObjectClass parent_class;
-};
+typedef struct _IndicatorSoundPrivate IndicatorSoundPrivate;
 
-//GObject instance struct
-struct _IndicatorSound {
-  IndicatorObject parent;
-  GtkWidget *slider;
-  IndicatorServiceManager *service;
+struct _IndicatorSoundPrivate
+{
+	GtkWidget* volume_widget;
 };
+
+#define INDICATOR_SOUND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_SOUND_TYPE, IndicatorSoundPrivate))
+
 // GObject Boiler plate
-GType indicator_sound_get_type (void);
 INDICATOR_SET_VERSION
 INDICATOR_SET_TYPE(INDICATOR_SOUND_TYPE)
 
@@ -84,15 +67,10 @@ G_DEFINE_TYPE (IndicatorSound, indicator_sound, INDICATOR_OBJECT_TYPE);
 static GtkLabel * get_label (IndicatorObject * io);
 static GtkImage * get_icon (IndicatorObject * io);
 static GtkMenu *  get_menu (IndicatorObject * io);
-static void       scroll   (IndicatorObject*io, gint delta, IndicatorScrollDirection direction);
 
 //Slider related
-static GtkWidget *volume_slider = NULL;
-static gboolean new_slider_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
-static gboolean value_changed_event_cb(GtkRange *range, gpointer user_data);
+static gboolean new_volume_slider_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
 static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data);
-static void slider_grabbed(GtkWidget *widget, gpointer user_data);
-static void slider_released(GtkWidget *widget, gpointer user_data);
 static void style_changed_cb(GtkWidget *widget, gpointer user_data);
 
 //player widget realisation methods
@@ -105,12 +83,10 @@ static gboolean new_scrub_bar_widget(DbusmenuMenuitem * newitem, DbusmenuMenuite
 static DBusGProxy *sound_dbus_proxy = NULL;
 static void connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer userdata);
 static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean value, gpointer userdata);
-static void catch_signal_sink_volume_update(DBusGProxy * proxy, gdouble volume_percent, gpointer userdata);
 static void catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value, gpointer userdata);
 static void catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_value, gpointer userdata);
-static void fetch_volume_percent_from_dbus();
 static void fetch_mute_value_from_dbus();
-static void fetch_sink_availability_from_dbus();
+static void fetch_sink_availability_from_dbus(IndicatorSound* self);
 
 /****Volume States 'members' ***/
 static void update_state(const gint state);
@@ -122,18 +98,14 @@ static const gint STATE_MEDIUM = 3;
 static const gint STATE_HIGH = 4;
 static const gint STATE_MUTED_WHILE_INPUT = 5;
 static const gint STATE_SINKS_NONE = 6;
-static const gint OUT_OF_RANGE = -10;
 
 static GHashTable *volume_states = NULL;
 static GtkImage *speaker_image = NULL;
 static gint current_state = 0;
 static gint previous_state = 0;
 
-static gdouble initial_volume_percent;
 static gboolean initial_mute ;
 static gboolean device_available;
-static gboolean slider_in_direct_use;
-static gdouble exterior_vol_update;
 
 static GtkIconSize design_team_size;
 static gint blocked_id;
@@ -157,10 +129,12 @@ indicator_sound_class_init (IndicatorSoundClass *klass)
   object_class->finalize = indicator_sound_finalize;
 
   IndicatorObjectClass *io_class = INDICATOR_OBJECT_CLASS(klass);
+
+	g_type_class_add_private (klass, sizeof (IndicatorSoundPrivate));
+	
   io_class->get_label = get_label;
   io_class->get_image = get_icon;
   io_class->get_menu  = get_menu;
-  io_class->scroll    = scroll;
 
   design_team_size = gtk_icon_size_register("design-team-size", 22, 22);
 
@@ -178,10 +152,11 @@ indicator_sound_init (IndicatorSound *self)
   blocked_id = 0;
   initial_mute = FALSE;
   device_available = TRUE;
-  slider_in_direct_use = FALSE;
-  exterior_vol_update = OUT_OF_RANGE;
+	
+	IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self);
+	priv->volume_widget = NULL;
 
-  g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
+	g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
   return;
 }
 
@@ -202,15 +177,6 @@ indicator_sound_dispose (GObject *object)
   return;
 }
 
-static void
-free_the_animation_list()
-{
-  if (blocked_animation_list != NULL) {
-    g_list_foreach (blocked_animation_list, (GFunc)g_object_unref, NULL);
-    g_list_free(blocked_animation_list);
-    blocked_animation_list = NULL;
-  }
-}
 
 static void
 indicator_sound_finalize (GObject *object)
@@ -244,80 +210,25 @@ get_menu (IndicatorObject * io)
   DbusmenuGtkMenu *menu = dbusmenu_gtkmenu_new(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_OBJECT);
   DbusmenuGtkClient *client = dbusmenu_gtkmenu_get_client(menu);
   g_object_set_data (G_OBJECT (client), "indicator", io);
-  dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_SLIDER_MENUITEM_TYPE, new_slider_item);
+  dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_VOLUME_MENUITEM_TYPE, new_volume_slider_widget);
   dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_TRANSPORT_MENUITEM_TYPE, new_transport_widget);
   dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_METADATA_MENUITEM_TYPE, new_metadata_widget);
   dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_TITLE_MENUITEM_TYPE, new_title_widget);
 	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(client), DBUSMENU_SCRUB_MENUITEM_TYPE, new_scrub_bar_widget);	
 
 	// register Key-press listening on the menu widget as the slider does not allow this.
-  g_signal_connect(menu, "key-press-event", G_CALLBACK(key_press_cb), NULL);
+  g_signal_connect(menu, "key-press-event", G_CALLBACK(key_press_cb), io);
   return GTK_MENU(menu);
 }
 
 static void
-slider_parent_changed (GtkWidget *widget,
-                       gpointer   user_data)
-{
-  gtk_widget_set_size_request (widget, 200, -1);
-  g_debug("slider parent changed");
-}
-
-/**
-new_slider_item:
-Create a new dBusMenu Slider item.
-**/
-static gboolean
-new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+free_the_animation_list()
 {
-  IndicatorObject *io = NULL;
-
-  g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
-  g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
-
-  io = g_object_get_data (G_OBJECT (client), "indicator");
-
-  volume_slider = ido_scale_menu_item_new_with_range ("Volume", IDO_RANGE_STYLE_DEFAULT, initial_volume_percent, 0, 100, 1);
-	ido_scale_menu_item_set_style (IDO_SCALE_MENU_ITEM (volume_slider), IDO_SCALE_MENU_ITEM_STYLE_IMAGE);	
-  g_object_set(volume_slider, "reverse-scroll-events", TRUE, NULL);
-
-  g_signal_connect (volume_slider,
-                    "notify::parent", G_CALLBACK (slider_parent_changed),
-                    NULL);
-
-  GtkMenuItem *menu_volume_slider = GTK_MENU_ITEM(volume_slider);
-
-  dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, menu_volume_slider, parent);
-
-  // register slider changes listening on the range
-  GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
-
-  INDICATOR_SOUND (io)->slider = slider;
-
-  g_signal_connect(slider, "value-changed", G_CALLBACK(value_changed_event_cb), newitem);
-  g_signal_connect(volume_slider, "slider-grabbed", G_CALLBACK(slider_grabbed), NULL);
-  g_signal_connect(volume_slider, "slider-released", G_CALLBACK(slider_released), NULL);
-  g_signal_connect(slider, "style-set", G_CALLBACK(style_changed_cb), NULL);
-
-  // Set images on the ido
-  GtkWidget* primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)volume_slider);
-  GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks(g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_ZERO)));
-  gtk_image_set_from_gicon(GTK_IMAGE(primary_image), primary_gicon, GTK_ICON_SIZE_MENU);
-  g_object_unref(primary_gicon);
-
-  GtkWidget* secondary_image = ido_scale_menu_item_get_secondary_image((IdoScaleMenuItem*)volume_slider);
-  GIcon * secondary_gicon = g_themed_icon_new_with_default_fallbacks(g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_HIGH)));
-  gtk_image_set_from_gicon(GTK_IMAGE(secondary_image), secondary_gicon, GTK_ICON_SIZE_MENU);
-  g_object_unref(secondary_gicon);
-
-  gtk_widget_set_sensitive(volume_slider, !initial_mute);
-
-  GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (slider));
-  gtk_adjustment_set_step_increment(adj, 3);
-
-  gtk_widget_show_all(volume_slider);
-
-  return TRUE;
+  if (blocked_animation_list != NULL) {
+    g_list_foreach (blocked_animation_list, (GFunc)g_object_unref, NULL);
+    g_list_free(blocked_animation_list);
+    blocked_animation_list = NULL;
+  }
 }
 
 static gboolean
@@ -398,6 +309,42 @@ new_scrub_bar_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbus
   return TRUE;
 }
 
+static gboolean
+new_volume_slider_widget(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+{
+  g_debug("indicator-sound: new_volume_slider_widget");
+
+  GtkWidget* volume_widget = NULL;
+  IndicatorObject *io = NULL;
+
+  g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
+  g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
+
+  volume_widget = volume_widget_new (newitem);	
+	io = g_object_get_data (G_OBJECT (client), "indicator");
+	IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
+	priv->volume_widget = volume_widget;
+
+	GtkWidget* ido_slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget));
+
+  g_signal_connect(ido_slider_widget, "style-set", G_CALLBACK(style_changed_cb), NULL);		
+	gtk_widget_set_sensitive(ido_slider_widget,
+	                         !initial_mute);
+	gtk_widget_show_all(ido_slider_widget);
+
+	
+  GtkMenuItem *menu_volume_item = GTK_MENU_ITEM(ido_slider_widget);
+	dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client),
+	                                newitem,
+	                                menu_volume_item,
+	                                parent);
+	
+	fetch_mute_value_from_dbus();
+  fetch_sink_availability_from_dbus(INDICATOR_SOUND (io));
+	
+  return TRUE;	
+}
+
 
 static void
 connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer userdata)
@@ -420,27 +367,18 @@ connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer u
       }
       g_debug("about to connect to the signals");
       dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_INPUT_WHILE_MUTED, G_TYPE_BOOLEAN, G_TYPE_INVALID);
-
       dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_INPUT_WHILE_MUTED, G_CALLBACK(catch_signal_sink_input_while_muted), NULL, NULL);
-      dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_VOLUME_UPDATE, G_TYPE_DOUBLE, G_TYPE_INVALID);
-      dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_VOLUME_UPDATE, G_CALLBACK(catch_signal_sink_volume_update), NULL, NULL);
       dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_MUTE_UPDATE, G_TYPE_BOOLEAN, G_TYPE_INVALID);
-      dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_MUTE_UPDATE, G_CALLBACK(catch_signal_sink_mute_update), NULL, NULL);
+      dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_MUTE_UPDATE, G_CALLBACK(catch_signal_sink_mute_update), userdata, NULL);
       dbus_g_proxy_add_signal(sound_dbus_proxy, SIGNAL_SINK_AVAILABLE_UPDATE, G_TYPE_BOOLEAN, G_TYPE_INVALID);
       dbus_g_proxy_connect_signal(sound_dbus_proxy, SIGNAL_SINK_AVAILABLE_UPDATE, G_CALLBACK(catch_signal_sink_availability_update), NULL, NULL);
 
+			g_return_if_fail(IS_INDICATOR_SOUND(userdata));
+			
       // Ensure we are in a coherent state with the service at start up.
       // Preserve ordering!
-      fetch_volume_percent_from_dbus();
-      fetch_mute_value_from_dbus();
-      fetch_sink_availability_from_dbus();
     }
-
-  } else {
-    //TODO : will need to handle this scenario
-    // Not much can we do here really, if there is no dbus connection tis goosed.
   }
-
   return;
 }
 
@@ -498,7 +436,6 @@ prepare_blocked_animation()
   g_object_unref(blocked_buf);
 }
 
-
 gint
 get_state()
 {
@@ -564,7 +501,7 @@ start_animation()
 {
   blocked_iter = blocked_animation_list;
   blocked_id = 0;
-  g_debug("exit from blocked hold start the animation\n");
+  //g_debug("exit from blocked hold start the animation\n");
   animation_id = g_timeout_add(50, fade_back_to_mute_image, NULL);
   return FALSE;
 }
@@ -584,12 +521,30 @@ fade_back_to_mute_image()
   }
 }
 
+static void
+reset_mute_blocking_animation()
+{
+  if (animation_id != 0) {
+    g_debug("about to remove the animation_id callback from the mainloop!!**");
+    g_source_remove(animation_id);
+    animation_id = 0;
+  }
+  if (blocked_id != 0) {
+    g_debug("about to remove the blocked_id callback from the mainloop!!**");
+    g_source_remove(blocked_id);
+    blocked_id = 0;
+  }
+}
+
+
 /*******************************************************************/
 //DBus method handlers
 /*******************************************************************/
 static void
-fetch_sink_availability_from_dbus()
+fetch_sink_availability_from_dbus(IndicatorSound* self)
 {
+	g_return_if_fail(IS_INDICATOR_SOUND(self));
+	
   GError * error = NULL;
   gboolean * available_input;
   available_input = g_new0(gboolean, 1);
@@ -600,38 +555,21 @@ fetch_sink_availability_from_dbus()
     g_free(available_input);
     return;
   }
+	
   device_available = *available_input;
   if (device_available == FALSE) {
     update_state(STATE_SINKS_NONE);
     g_debug("NO DEVICE AVAILABLE");
   }
 
-  if (GTK_IS_WIDGET (volume_slider))
-    gtk_widget_set_sensitive(volume_slider, device_available);
+	IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self);
+	GtkWidget* slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget));	
+  gtk_widget_set_sensitive(slider_widget, device_available);
 
   g_free(available_input);
-  g_debug("IndicatorSound::fetch_sink_availability_from_dbus -> AVAILABILTY returned from dbus method is %i", device_available);
-
+  g_debug("IndicatorSound::fetch_sink_availability_from_dbus ->%i", device_available);
 }
 
-static void
-fetch_volume_percent_from_dbus()
-{
-  GError * error = NULL;
-  gdouble *volume_percent_input;
-  volume_percent_input = g_new0(gdouble, 1);
-  org_ayatana_indicator_sound_get_sink_volume(sound_dbus_proxy, volume_percent_input, &error);
-  if (error != NULL) {
-    g_warning("Unable to fetch VOLUME at indicator start up: %s", error->message);
-    g_error_free(error);
-    g_free(volume_percent_input);
-    return;
-  }
-  initial_volume_percent = *volume_percent_input;
-  determine_state_from_volume(initial_volume_percent);
-  g_free(volume_percent_input);
-  g_debug("at the indicator start up and the volume percent returned from dbus method is %f", initial_volume_percent);
-}
 
 static void
 fetch_mute_value_from_dbus()
@@ -667,52 +605,31 @@ catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean block_value, gp
   }
 }
 
-
-static void
-catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_percent, gpointer userdata)
-{
-  if (slider_in_direct_use == FALSE) {
-    GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
-    GtkRange *range = (GtkRange*)slider;
-
-    // DEBUG
-    gdouble current_value = gtk_range_get_value(range);
-    g_debug("SIGNAL- update sink volume - current_value : %f and new value : %f", current_value, volume_percent);
-    exterior_vol_update = volume_percent;
-    gtk_range_set_value(range, volume_percent);
-    determine_state_from_volume(volume_percent);
-  }
-}
-
+/*
+ We can be sure the service won't send a mute signal unless it has changed !
+ UNMUTE's force a volume update therefore icon is updated appropriately => no need for unmute handling here.
+*/ 
 static void
 catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value, gpointer userdata)
 {
-  //We can be sure the service won't send a mute signal unless it has changed !
-  //UNMUTE's force a volume update therefore icon is updated appropriately => no need for unmute handling here.
   if (mute_value == TRUE && device_available == TRUE) {
     update_state(STATE_MUTED);
   } else {
     reset_mute_blocking_animation();
   }
   g_debug("signal caught - sink mute update with mute value: %i", mute_value);
-  gtk_widget_set_sensitive(volume_slider, !mute_value);
-}
+	g_return_if_fail(IS_INDICATOR_SOUND(userdata));
+	IndicatorSound* indicator = INDICATOR_SOUND(userdata);
+	IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(indicator);
 
-static void
-reset_mute_blocking_animation()
-{
-  if (animation_id != 0) {
-    g_debug("about to remove the animation_id callback from the mainloop!!**");
-    g_source_remove(animation_id);
-    animation_id = 0;
-  }
-  if (blocked_id != 0) {
-    g_debug("about to remove the blocked_id callback from the mainloop!!**");
-    g_source_remove(blocked_id);
-    blocked_id = 0;
-  }
+	if(priv->volume_widget == NULL){
+		return;
+	}
+	GtkWidget* slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget)); 
+  gtk_widget_set_sensitive(slider_widget, !mute_value);
 }
 
+
 static void
 catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_value, gpointer userdata)
 {
@@ -723,51 +640,9 @@ catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_valu
   g_debug("signal caught - sink availability update with  value: %i", available_value);
 }
 
-
-
-
 /*******************************************************************/
 //UI callbacks
 /******************************************************************/
-/**
-value_changed_event_cb:
-This callback will get triggered irregardless of whether its a user change or a programmatic change.
-**/
-static gboolean
-value_changed_event_cb(GtkRange *range, gpointer user_data)
-{
-  gdouble current_value =  CLAMP(gtk_range_get_value(range), 0, 100);
-  if (current_value == exterior_vol_update) {
-    g_debug("ignore the value changed event - its come from the outside");
-    return FALSE;
-  }
-  DbusmenuMenuitem *item = (DbusmenuMenuitem*)user_data;
-  GValue value = {0};
-  g_value_init(&value, G_TYPE_DOUBLE);
-  g_value_set_double(&value, current_value);
-  g_debug("Value changed callback - = %f", current_value);
-  dbusmenu_menuitem_handle_event (item, "slider_change", &value, 0);
-  // This is not ideal in that the icon ui will update on ui actions and not on actual service feedback.
-  // but necessary for now as the server does not send volume update information if the source of change was this ui.
-  determine_state_from_volume(current_value);
-  return FALSE;
-}
-
-
-static void
-slider_grabbed (GtkWidget *widget, gpointer user_data)
-{
-  slider_in_direct_use = TRUE;
-  g_debug ("!!!!!!  grabbed\n");
-}
-
-static void
-slider_released (GtkWidget *widget, gpointer user_data)
-{
-  slider_in_direct_use = FALSE;
-  g_debug ("!!!!!! released\n");
-}
-
 
 /**
 key_press_cb:
@@ -777,7 +652,17 @@ key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data)
 {
   gboolean digested = FALSE;
 
-  GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
+	g_return_val_if_fail(IS_INDICATOR_SOUND(data), FALSE);
+
+	IndicatorSound *indicator = INDICATOR_SOUND (data);
+
+	IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(indicator);
+	if(priv->volume_widget == NULL){
+		return FALSE;
+	}
+	
+	GtkWidget* slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget)); 
+  GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)slider_widget);
   GtkRange* range = (GtkRange*)slider;
   gdouble current_value = gtk_range_get_value(range);
   gdouble new_value = current_value;
@@ -814,14 +699,10 @@ key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data)
     default:
       break;
     }
-
     new_value = CLAMP(new_value, 0, 100);
     if (new_value != current_value && current_state != STATE_MUTED) {
       g_debug("Attempting to set the range from the key listener to %f", new_value);
-      // In order to ensure that the exterior filtering does not catch this, reset the exterior_vol_update
-      // to ensure these updates.
-      exterior_vol_update = OUT_OF_RANGE;
-      gtk_range_set_value(range, new_value);
+			volume_widget_update(VOLUME_WIDGET(priv->volume_widget), new_value);
     }
   }
   return digested;
@@ -837,21 +718,3 @@ style_changed_cb(GtkWidget *widget, gpointer user_data)
   free_the_animation_list();
   prepare_blocked_animation();
 }
-
-static void
-scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction)
-{
-  if (device_available == FALSE || current_state == STATE_MUTED)
-    return;
-
-  IndicatorSound *sound = INDICATOR_SOUND (io);
-  GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (sound->slider));
-  gdouble value = gtk_range_get_value (GTK_RANGE (sound->slider));
-
-  if (direction == INDICATOR_OBJECT_SCROLL_UP) {
-    value += adj->step_increment;
-  } else {
-    value -= adj->step_increment;
-  }
-  gtk_range_set_value (GTK_RANGE (sound->slider), value);
-}
diff --git a/src/indicator-sound.h b/src/indicator-sound.h
index 386ad2a..9f829bb 100644
--- a/src/indicator-sound.h
+++ b/src/indicator-sound.h
@@ -23,10 +23,37 @@ PURPOSE.  See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include <libindicator/indicator.h>
+#include <libindicator/indicator-object.h>
+#include <libindicator/indicator-service-manager.h>
+#include <libindicator/indicator-image-helper.h>
+
+#define INDICATOR_SOUND_TYPE            (indicator_sound_get_type ())
+#define INDICATOR_SOUND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SOUND_TYPE, IndicatorSound))
+#define INDICATOR_SOUND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SOUND_TYPE, IndicatorSoundClass))
+#define IS_INDICATOR_SOUND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SOUND_TYPE))
+#define IS_INDICATOR_SOUND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SOUND_TYPE))
+#define INDICATOR_SOUND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SOUND_TYPE, IndicatorSoundClass))
+
+typedef struct _IndicatorSound      IndicatorSound;
+typedef struct _IndicatorSoundClass IndicatorSoundClass;
+
+//GObject class struct
+struct _IndicatorSoundClass {
+  IndicatorObjectClass parent_class;
+};
+
+//GObject instance struct
+struct _IndicatorSound {
+  IndicatorObject parent;
+  IndicatorServiceManager *service;
+};
+
+// GObject Boiler plate
+GType indicator_sound_get_type (void);
 
-// Essentially these are all exported to faciltiate testing
 void prepare_state_machine();
-void determine_state_from_volume(gdouble volume_percent);
+extern void determine_state_from_volume(gdouble volume_percent);
 gint get_state();
 gchar* get_state_image_name(gint state);
 void prepare_for_tests(IndicatorObject * io);
diff --git a/src/metadata-menu-item.c b/src/metadata-menu-item.c
index aadaf2c..662a9ea 100644
--- a/src/metadata-menu-item.c
+++ b/src/metadata-menu-item.c
@@ -1,4 +1,4 @@
-/* metadata-menu-item.c generated by valac, the Vala compiler
+/* metadata-menu-item.c generated by valac 0.9.5, the Vala compiler
  * generated from metadata-menu-item.vala, do not modify */
 
 /*
diff --git a/src/metadata-widget.c b/src/metadata-widget.c
index 670d983..aaf71e2 100644
--- a/src/metadata-widget.c
+++ b/src/metadata-widget.c
@@ -150,8 +150,8 @@ metadata_widget_init (MetadataWidget *self)
 	g_signal_connect(G_OBJECT(twin_item), "property-changed", 
 	                 G_CALLBACK(metadata_widget_property_update), self);
 	gtk_widget_show_all (priv->hbox);
-  gtk_container_add (GTK_CONTAINER (self), hbox);
-	
+	gtk_widget_set_size_request(GTK_WIDGET(self), 200, 60); 
+  gtk_container_add (GTK_CONTAINER (self), hbox);	
 }
 
 static gboolean
@@ -201,11 +201,9 @@ metadata_widget_property_update(DbusmenuMenuitem* item, gchar* property,
 
 	if(g_value_get_int(value) == DBUSMENU_PROPERTY_EMPTY){
 		g_debug("Metadata widget: property update - reset");
-		gchar* empty = "";
 		GValue new_value = {0};
   	g_value_init(&new_value, G_TYPE_STRING);		
 		g_value_set_string(&new_value, g_strdup(""));		
-		//g_free(empty);
 		value = &new_value;
 	}
 	
diff --git a/src/metadata-widget.h b/src/metadata-widget.h
index 6f1d4d3..814d5e8 100644
--- a/src/metadata-widget.h
+++ b/src/metadata-widget.h
@@ -20,7 +20,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __METADATA_WIDGET_H__
 
 #include <gtk/gtkmenuitem.h>
-#include <libdbusmenu-gtk/menu.h>
+#include <libdbusmenu-gtk/menuitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/mpris-bridge.c b/src/mpris-bridge.c
new file mode 100644
index 0000000..15ad9d5
--- /dev/null
+++ b/src/mpris-bridge.c
@@ -0,0 +1,246 @@
+/* mpris-bridge.c generated by valac 0.9.5, the Vala compiler
+ * generated from mpris-bridge.vala, do not modify */
+
+
+#include <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include <string.h>
+#include <float.h>
+#include <math.h>
+
+
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
+typedef struct _MprisBridgePrivate MprisBridgePrivate;
+
+#define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
+#define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
+#define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
+#define IS_MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER))
+#define IS_MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER))
+#define MPRIS_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
+
+typedef struct _MprisController MprisController;
+typedef struct _MprisControllerClass MprisControllerClass;
+
+#define TYPE_MPRIS2_CONTROLLER (mpris2_controller_get_type ())
+#define MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2Controller))
+#define MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
+#define IS_MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS2_CONTROLLER))
+#define IS_MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS2_CONTROLLER))
+#define MPRIS2_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
+
+typedef struct _Mpris2Controller Mpris2Controller;
+typedef struct _Mpris2ControllerClass Mpris2ControllerClass;
+
+#define MPRIS_BRIDGE_TYPE_MODE (mpris_bridge_mode_get_type ())
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_PLAYER_CONTROLLER (player_controller_get_type ())
+#define PLAYER_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PLAYER_CONTROLLER, PlayerController))
+#define PLAYER_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PLAYER_CONTROLLER, PlayerControllerClass))
+#define IS_PLAYER_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PLAYER_CONTROLLER))
+#define IS_PLAYER_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PLAYER_CONTROLLER))
+#define PLAYER_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PLAYER_CONTROLLER, PlayerControllerClass))
+
+typedef struct _PlayerController PlayerController;
+typedef struct _PlayerControllerClass PlayerControllerClass;
+
+#define TRANSPORT_MENUITEM_TYPE_ACTION (transport_menuitem_action_get_type ())
+
+struct _MprisBridge {
+	GObject parent_instance;
+	MprisBridgePrivate * priv;
+};
+
+struct _MprisBridgeClass {
+	GObjectClass parent_class;
+};
+
+typedef enum  {
+	MPRIS_BRIDGE_MODE_MPRIS_1,
+	MPRIS_BRIDGE_MODE_MPRIS_2
+} MprisBridgemode;
+
+struct _MprisBridgePrivate {
+	MprisController* mpris1_controller;
+	Mpris2Controller* mpris2_controller;
+	MprisBridgemode mode_in_use;
+};
+
+typedef enum  {
+	TRANSPORT_MENUITEM_ACTION_PREVIOUS,
+	TRANSPORT_MENUITEM_ACTION_PLAY_PAUSE,
+	TRANSPORT_MENUITEM_ACTION_NEXT
+} TransportMenuitemaction;
+
+
+static gpointer mpris_bridge_parent_class = NULL;
+
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
+GType mpris_controller_get_type (void) G_GNUC_CONST;
+GType mpris2_controller_get_type (void) G_GNUC_CONST;
+static GType mpris_bridge_mode_get_type (void) G_GNUC_UNUSED;
+#define MPRIS_BRIDGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MPRIS_BRIDGE, MprisBridgePrivate))
+enum  {
+	MPRIS_BRIDGE_DUMMY_PROPERTY
+};
+GType player_controller_get_type (void) G_GNUC_CONST;
+Mpris2Controller* mpris2_controller_new (PlayerController* ctrl);
+Mpris2Controller* mpris2_controller_construct (GType object_type, PlayerController* ctrl);
+gboolean mpris2_controller_was_successfull (Mpris2Controller* self);
+void mpris2_controller_initial_update (Mpris2Controller* self);
+MprisController* mpris_controller_new (PlayerController* ctrl, const char* inter);
+MprisController* mpris_controller_construct (GType object_type, PlayerController* ctrl, const char* inter);
+MprisBridge* mpris_bridge_new (PlayerController* ctrl);
+MprisBridge* mpris_bridge_construct (GType object_type, PlayerController* ctrl);
+gboolean mpris_controller_connected (MprisController* self);
+gboolean mpris2_controller_connected (Mpris2Controller* self);
+gboolean mpris_bridge_connected (MprisBridge* self);
+GType transport_menuitem_action_get_type (void) G_GNUC_CONST;
+void mpris_controller_transport_event (MprisController* self, TransportMenuitemaction command);
+void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuitemaction command);
+void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update);
+void mpris2_controller_expose (Mpris2Controller* self);
+void mpris_bridge_expose (MprisBridge* self);
+void mpris_controller_set_position (MprisController* self, double position);
+void mpris2_controller_set_position (Mpris2Controller* self, double position);
+void mpris_bridge_set_track_position (MprisBridge* self, double pos);
+static void mpris_bridge_finalize (GObject* obj);
+
+
+
+static GType mpris_bridge_mode_get_type (void) {
+	static volatile gsize mpris_bridge_mode_type_id__volatile = 0;
+	if (g_once_init_enter (&mpris_bridge_mode_type_id__volatile)) {
+		static const GEnumValue values[] = {{MPRIS_BRIDGE_MODE_MPRIS_1, "MPRIS_BRIDGE_MODE_MPRIS_1", "mpris-1"}, {MPRIS_BRIDGE_MODE_MPRIS_2, "MPRIS_BRIDGE_MODE_MPRIS_2", "mpris-2"}, {0, NULL, NULL}};
+		GType mpris_bridge_mode_type_id;
+		mpris_bridge_mode_type_id = g_enum_register_static ("MprisBridgemode", values);
+		g_once_init_leave (&mpris_bridge_mode_type_id__volatile, mpris_bridge_mode_type_id);
+	}
+	return mpris_bridge_mode_type_id__volatile;
+}
+
+
+MprisBridge* mpris_bridge_construct (GType object_type, PlayerController* ctrl) {
+	MprisBridge * self;
+	Mpris2Controller* _tmp0_;
+	g_return_val_if_fail (ctrl != NULL, NULL);
+	self = (MprisBridge*) g_object_new (object_type, NULL);
+	self->priv->mpris2_controller = (_tmp0_ = mpris2_controller_new (ctrl), _g_object_unref0 (self->priv->mpris2_controller), _tmp0_);
+	if (mpris2_controller_was_successfull (self->priv->mpris2_controller) == TRUE) {
+		MprisController* _tmp1_;
+		self->priv->mode_in_use = MPRIS_BRIDGE_MODE_MPRIS_2;
+		self->priv->mpris1_controller = (_tmp1_ = NULL, _g_object_unref0 (self->priv->mpris1_controller), _tmp1_);
+		mpris2_controller_initial_update (self->priv->mpris2_controller);
+	} else {
+		Mpris2Controller* _tmp2_;
+		MprisController* _tmp3_;
+		self->priv->mpris2_controller = (_tmp2_ = NULL, _g_object_unref0 (self->priv->mpris2_controller), _tmp2_);
+		self->priv->mode_in_use = MPRIS_BRIDGE_MODE_MPRIS_1;
+		self->priv->mpris1_controller = (_tmp3_ = mpris_controller_new (ctrl, "org.freedesktop.MediaPlayer"), _g_object_unref0 (self->priv->mpris1_controller), _tmp3_);
+	}
+	return self;
+}
+
+
+MprisBridge* mpris_bridge_new (PlayerController* ctrl) {
+	return mpris_bridge_construct (TYPE_MPRIS_BRIDGE, ctrl);
+}
+
+
+gboolean mpris_bridge_connected (MprisBridge* self) {
+	gboolean result = FALSE;
+	g_return_val_if_fail (self != NULL, FALSE);
+	if (self->priv->mode_in_use == MPRIS_BRIDGE_MODE_MPRIS_1) {
+		result = mpris_controller_connected (self->priv->mpris1_controller);
+		return result;
+	} else {
+		if (self->priv->mode_in_use == MPRIS_BRIDGE_MODE_MPRIS_2) {
+			result = mpris2_controller_connected (self->priv->mpris2_controller);
+			return result;
+		}
+	}
+	result = FALSE;
+	return result;
+}
+
+
+void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update) {
+	g_return_if_fail (self != NULL);
+	if (self->priv->mode_in_use == MPRIS_BRIDGE_MODE_MPRIS_1) {
+		mpris_controller_transport_event (self->priv->mpris1_controller, update);
+	} else {
+		if (self->priv->mode_in_use == MPRIS_BRIDGE_MODE_MPRIS_2) {
+			mpris2_controller_transport_event (self->priv->mpris2_controller, update);
+		}
+	}
+}
+
+
+void mpris_bridge_expose (MprisBridge* self) {
+	g_return_if_fail (self != NULL);
+	if (self->priv->mode_in_use == MPRIS_BRIDGE_MODE_MPRIS_2) {
+		mpris2_controller_expose (self->priv->mpris2_controller);
+	} else {
+		g_warning ("mpris-bridge.vala:56: MPRIS1 clients don't have the ability to raise/e" \
+"xpose the client");
+	}
+}
+
+
+void mpris_bridge_set_track_position (MprisBridge* self, double pos) {
+	g_return_if_fail (self != NULL);
+	if (self->priv->mode_in_use == MPRIS_BRIDGE_MODE_MPRIS_1) {
+		mpris_controller_set_position (self->priv->mpris1_controller, pos);
+	} else {
+		if (self->priv->mode_in_use == MPRIS_BRIDGE_MODE_MPRIS_2) {
+			mpris2_controller_set_position (self->priv->mpris2_controller, pos);
+		}
+	}
+}
+
+
+static void mpris_bridge_class_init (MprisBridgeClass * klass) {
+	mpris_bridge_parent_class = g_type_class_peek_parent (klass);
+	g_type_class_add_private (klass, sizeof (MprisBridgePrivate));
+	G_OBJECT_CLASS (klass)->finalize = mpris_bridge_finalize;
+}
+
+
+static void mpris_bridge_instance_init (MprisBridge * self) {
+	self->priv = MPRIS_BRIDGE_GET_PRIVATE (self);
+}
+
+
+static void mpris_bridge_finalize (GObject* obj) {
+	MprisBridge * self;
+	self = MPRIS_BRIDGE (obj);
+	_g_object_unref0 (self->priv->mpris1_controller);
+	_g_object_unref0 (self->priv->mpris2_controller);
+	G_OBJECT_CLASS (mpris_bridge_parent_class)->finalize (obj);
+}
+
+
+GType mpris_bridge_get_type (void) {
+	static volatile gsize mpris_bridge_type_id__volatile = 0;
+	if (g_once_init_enter (&mpris_bridge_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (MprisBridgeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) mpris_bridge_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MprisBridge), 0, (GInstanceInitFunc) mpris_bridge_instance_init, NULL };
+		GType mpris_bridge_type_id;
+		mpris_bridge_type_id = g_type_register_static (G_TYPE_OBJECT, "MprisBridge", &g_define_type_info, 0);
+		g_once_init_leave (&mpris_bridge_type_id__volatile, mpris_bridge_type_id);
+	}
+	return mpris_bridge_type_id__volatile;
+}
+
+
+
+
diff --git a/src/mpris-bridge.vala b/src/mpris-bridge.vala
new file mode 100644
index 0000000..bd9d472
--- /dev/null
+++ b/src/mpris-bridge.vala
@@ -0,0 +1,70 @@
+public class MprisBridge : GLib.Object
+{
+	private MprisController mpris1_controller;
+	private Mpris2Controller mpris2_controller;	
+	private enum mode{
+		MPRIS_1,
+		MPRIS_2
+	}
+	private mode mode_in_use;
+	
+	public MprisBridge(PlayerController ctrl)
+	{
+		this.mpris2_controller = new Mpris2Controller(ctrl);
+		if(this.mpris2_controller.was_successfull() == true){
+			this.mode_in_use = mode.MPRIS_2;
+			this.mpris1_controller = null;
+			this.mpris2_controller.initial_update();
+		}
+		else{
+			this.mpris2_controller = null;
+			this.mode_in_use = mode.MPRIS_1;
+			this.mpris1_controller = new MprisController(ctrl);
+		}
+	}
+	
+	// The handling of both mpris controllers can be abstracted further 
+	// once the mpris2 is implemented. This will allow for one instance
+	// variable to point at the active controller. For now handle both ...  
+	public bool connected()
+	{
+		if(this.mode_in_use == mode.MPRIS_1){
+			return this.mpris1_controller.connected();			
+		}
+		else if(this.mode_in_use == mode.MPRIS_2){
+			return this.mpris2_controller.connected();			
+		}
+		return false;
+	}
+	
+	public void transport_update(TransportMenuitem.action update)
+	{
+		if(this.mode_in_use == mode.MPRIS_1){
+			this.mpris1_controller.transport_event(update);
+		}
+		else if(this.mode_in_use == mode.MPRIS_2){
+			this.mpris2_controller.transport_event(update);
+		}
+	}
+
+	public void expose()
+	{
+ 		if(this.mode_in_use == mode.MPRIS_2){
+			this.mpris2_controller.expose();
+		 }
+		else{
+			warning("MPRIS1 clients don't have the ability to raise/expose the client"); 			        
+		}						
+	}
+
+
+	public void set_track_position(double pos)
+	{
+		if(this.mode_in_use == mode.MPRIS_1){
+			this.mpris1_controller.set_position(pos);
+		}
+		else if(this.mode_in_use == mode.MPRIS_2){
+			this.mpris2_controller.set_position(pos);
+		}
+	}	
+}
+\ No newline at end of file
diff --git a/src/mpris-controller-v2.c b/src/mpris-controller-v2.c
deleted file mode 100644
index 03665a5..0000000
--- a/src/mpris-controller-v2.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* mpris-controller-v2.c generated by valac, the Vala compiler
- * generated from mpris-controller-v2.vala, do not modify */
-
-/*
-This service primarily controls PulseAudio and is driven by the sound indicator menu on the panel.
-Copyright 2010 Canonical Ltd.
-
-Authors:
-    Conor Curran <conor.curran@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
-#define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
-#define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-#define IS_MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER))
-#define IS_MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER))
-#define MPRIS_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-
-typedef struct _MprisController MprisController;
-typedef struct _MprisControllerClass MprisControllerClass;
-typedef struct _MprisControllerPrivate MprisControllerPrivate;
-
-#define TYPE_MPRIS_CONTROLLER_V2 (mpris_controller_v2_get_type ())
-#define MPRIS_CONTROLLER_V2(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER_V2, MprisControllerV2))
-#define MPRIS_CONTROLLER_V2_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER_V2, MprisControllerV2Class))
-#define IS_MPRIS_CONTROLLER_V2(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER_V2))
-#define IS_MPRIS_CONTROLLER_V2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER_V2))
-#define MPRIS_CONTROLLER_V2_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER_V2, MprisControllerV2Class))
-
-typedef struct _MprisControllerV2 MprisControllerV2;
-typedef struct _MprisControllerV2Class MprisControllerV2Class;
-typedef struct _MprisControllerV2Private MprisControllerV2Private;
-
-#define TYPE_PLAYER_CONTROLLER (player_controller_get_type ())
-#define PLAYER_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PLAYER_CONTROLLER, PlayerController))
-#define PLAYER_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PLAYER_CONTROLLER, PlayerControllerClass))
-#define IS_PLAYER_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PLAYER_CONTROLLER))
-#define IS_PLAYER_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PLAYER_CONTROLLER))
-#define PLAYER_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PLAYER_CONTROLLER, PlayerControllerClass))
-
-typedef struct _PlayerController PlayerController;
-typedef struct _PlayerControllerClass PlayerControllerClass;
-
-struct _MprisController {
-	GObject parent_instance;
-	MprisControllerPrivate * priv;
-};
-
-struct _MprisControllerClass {
-	GObjectClass parent_class;
-};
-
-struct _MprisControllerV2 {
-	MprisController parent_instance;
-	MprisControllerV2Private * priv;
-};
-
-struct _MprisControllerV2Class {
-	MprisControllerClass parent_class;
-};
-
-
-static gpointer mpris_controller_v2_parent_class = NULL;
-
-GType mpris_controller_get_type (void) G_GNUC_CONST;
-GType mpris_controller_v2_get_type (void) G_GNUC_CONST;
-enum  {
-	MPRIS_CONTROLLER_V2_DUMMY_PROPERTY
-};
-GType player_controller_get_type (void) G_GNUC_CONST;
-MprisControllerV2* mpris_controller_v2_new (PlayerController* ctrl, const char* inter);
-MprisControllerV2* mpris_controller_v2_construct (GType object_type, PlayerController* ctrl, const char* inter);
-
-
-
-MprisControllerV2* mpris_controller_v2_construct (GType object_type, PlayerController* ctrl, const char* inter) {
-	MprisControllerV2 * self;
-	g_return_val_if_fail (ctrl != NULL, NULL);
-	g_return_val_if_fail (inter != NULL, NULL);
-	self = (MprisControllerV2*) g_object_new (object_type, "owner", ctrl, "mpris-interface", inter, NULL);
-	return self;
-}
-
-
-MprisControllerV2* mpris_controller_v2_new (PlayerController* ctrl, const char* inter) {
-	return mpris_controller_v2_construct (TYPE_MPRIS_CONTROLLER_V2, ctrl, inter);
-}
-
-
-static void mpris_controller_v2_class_init (MprisControllerV2Class * klass) {
-	mpris_controller_v2_parent_class = g_type_class_peek_parent (klass);
-}
-
-
-static void mpris_controller_v2_instance_init (MprisControllerV2 * self) {
-}
-
-
-GType mpris_controller_v2_get_type (void) {
-	static volatile gsize mpris_controller_v2_type_id__volatile = 0;
-	if (g_once_init_enter (&mpris_controller_v2_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (MprisControllerV2Class), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) mpris_controller_v2_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MprisControllerV2), 0, (GInstanceInitFunc) mpris_controller_v2_instance_init, NULL };
-		GType mpris_controller_v2_type_id;
-		mpris_controller_v2_type_id = g_type_register_static (TYPE_MPRIS_CONTROLLER, "MprisControllerV2", &g_define_type_info, 0);
-		g_once_init_leave (&mpris_controller_v2_type_id__volatile, mpris_controller_v2_type_id);
-	}
-	return mpris_controller_v2_type_id__volatile;
-}
-
-
-
-
diff --git a/src/mpris-controller-v2.vala b/src/mpris-controller-v2.vala
deleted file mode 100644
index efb5084..0000000
--- a/src/mpris-controller-v2.vala
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This service primarily controls PulseAudio and is driven by the sound indicator menu on the panel.
-Copyright 2010 Canonical Ltd.
-
-Authors:
-    Conor Curran <conor.curran@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-using Gee;
-
-public class MprisControllerV2 : MprisController
-{		
-	public MprisControllerV2(PlayerController ctrl, string inter="org.mpris.MediaPlayer.Player"){
-		Object(owner: ctrl, mpris_interface: inter);				
-	}
-
-}
diff --git a/src/mpris-controller.c b/src/mpris-controller.c
index 14a462b..1f891f7 100644
--- a/src/mpris-controller.c
+++ b/src/mpris-controller.c
@@ -1,4 +1,4 @@
-/* mpris-controller.c generated by valac, the Vala compiler
+/* mpris-controller.c generated by valac 0.9.5, the Vala compiler
  * generated from mpris-controller.vala, do not modify */
 
 /*
@@ -74,6 +74,16 @@ typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 typedef struct _PlayerItem PlayerItem;
 typedef struct _PlayerItemClass PlayerItemClass;
 
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
+
 #define PLAYER_CONTROLLER_TYPE_WIDGET_ORDER (player_controller_widget_order_get_type ())
 
 #define TYPE_TRANSPORT_MENUITEM (transport_menuitem_get_type ())
@@ -128,7 +138,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisController* mpris_adaptor;
+	MprisBridge* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -140,8 +150,7 @@ typedef enum  {
 	PLAYER_CONTROLLER_WIDGET_ORDER_TITLE,
 	PLAYER_CONTROLLER_WIDGET_ORDER_METADATA,
 	PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB,
-	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT,
-	PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLIST
+	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT
 } PlayerControllerwidget_order;
 
 typedef enum  {
@@ -171,6 +180,7 @@ static void mpris_controller_status_free (MprisControllerstatus* self);
 static void _dynamic_GetStatus0 (DBusGProxy* self, MprisControllerstatus* result, GError** error);
 PlayerController* mpris_controller_get_owner (MprisController* self);
 GType player_item_get_type (void) G_GNUC_CONST;
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
 GType player_controller_widget_order_get_type (void) G_GNUC_CONST;
 GType transport_menuitem_get_type (void) G_GNUC_CONST;
 void transport_menuitem_change_play_state (TransportMenuitem* self, gint state);
@@ -197,8 +207,10 @@ gboolean mpris_controller_connected (MprisController* self);
 GeeHashSet* transport_menuitem_attributes_format (void);
 static void mpris_controller_onStatusChange (MprisController* self, DBusGProxy* mpris_client, MprisControllerstatus* st);
 void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
-static GHashTable* _dynamic_GetMetadata10 (DBusGProxy* self, GError** error);
-static gint32 _dynamic_PositionGet11 (DBusGProxy* self, GError** error);
+static void _dynamic_GetStatus10 (DBusGProxy* self, MprisControllerstatus* result, GError** error);
+void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state);
+static GHashTable* _dynamic_GetMetadata11 (DBusGProxy* self, GError** error);
+static gint32 _dynamic_PositionGet12 (DBusGProxy* self, GError** error);
 static void mpris_controller_onTrackChange (MprisController* self, DBusGProxy* mpris_client, GHashTable* ht);
 static void mpris_controller_set_mpris_player (MprisController* self, DBusGProxy* value);
 static void mpris_controller_set_owner (MprisController* self, PlayerController* value);
@@ -365,9 +377,9 @@ void mpris_controller_transport_event (MprisController* self, TransportMenuitema
 	GError * _inner_error_;
 	g_return_if_fail (self != NULL);
 	_inner_error_ = NULL;
-	g_debug ("mpris-controller.vala:73: transport_event input = %i", (gint) command);
+	g_debug ("mpris-controller.vala:72: transport_event input = %i", (gint) command);
 	if (command == TRANSPORT_MENUITEM_ACTION_PLAY_PAUSE) {
-		g_debug ("mpris-controller.vala:75: transport_event PLAY_PAUSE");
+		g_debug ("mpris-controller.vala:74: transport_event PLAY_PAUSE");
 		_dynamic_Pause4 (self->priv->_mpris_player, &_inner_error_);
 		if (_inner_error_ != NULL) {
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -445,7 +457,7 @@ void mpris_controller_set_position (MprisController* self, double position) {
 	gint32 _tmp1_;
 	g_return_if_fail (self != NULL);
 	_inner_error_ = NULL;
-	g_debug ("mpris-controller.vala:88: Set position with pos (0-100) %f", position);
+	g_debug ("mpris-controller.vala:87: Set position with pos (0-100) %f", position);
 	data = _dynamic_GetMetadata7 (self->priv->_mpris_player, &_inner_error_);
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -454,16 +466,16 @@ void mpris_controller_set_position (MprisController* self, double position) {
 	}
 	time_value = __g_value_dup0 ((GValue*) g_hash_table_lookup (data, "time"));
 	if (time_value == NULL) {
-		g_warning ("mpris-controller.vala:92: Can't fetch the duration of the track theref" \
+		g_warning ("mpris-controller.vala:91: Can't fetch the duration of the track theref" \
 "ore cant set the position");
 		_g_free0 (time_value);
 		_g_hash_table_unref0 (data);
 		return;
 	}
 	total_time = (guint32) g_value_get_uint (time_value);
-	g_debug ("mpris-controller.vala:96: total time of track = %i", (gint) total_time);
+	g_debug ("mpris-controller.vala:95: total time of track = %i", (gint) total_time);
 	new_time_position = (total_time * position) / 100.0;
-	g_debug ("mpris-controller.vala:98: new position = %f", new_time_position * 1000);
+	g_debug ("mpris-controller.vala:97: new position = %f", new_time_position * 1000);
 	_dynamic_PositionSet8 (self->priv->_mpris_player, (gint32) new_time_position, &_inner_error_);
 	if (_inner_error_ != NULL) {
 		_g_free0 (time_value);
@@ -509,11 +521,11 @@ static void mpris_controller_onStatusChange (MprisController* self, DBusGProxy*
 	PlayerItem* _tmp2_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (mpris_client != NULL);
-	g_debug ("mpris-controller.vala:111: onStatusChange - signal received");
+	g_debug ("mpris-controller.vala:110: onStatusChange - signal received");
 	status = st;
 	ar = (GValueArray*) status;
 	play_state = g_value_get_int (g_value_array_get_nth (ar, (guint) 0));
-	g_debug ("mpris-controller.vala:115: onStatusChange - play state %i", play_state);
+	g_debug ("mpris-controller.vala:114: onStatusChange - play state %i", play_state);
 	ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	g_value_init (&v, G_TYPE_INT);
 	g_value_set_int (&v, play_state);
@@ -529,7 +541,20 @@ static void mpris_controller_onStatusChange (MprisController* self, DBusGProxy*
 }
 
 
-static GHashTable* _dynamic_GetMetadata10 (DBusGProxy* self, GError** error) {
+static void _dynamic_GetStatus10 (DBusGProxy* self, MprisControllerstatus* result, GError** error) {
+	GValueArray* dbus_result;
+	dbus_g_proxy_call (self, "GetStatus", error, G_TYPE_INVALID, dbus_g_type_get_struct ("GValueArray", G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID), &dbus_result, G_TYPE_INVALID);
+	if (*error) {
+		return;
+	}
+	result->playback = g_value_get_int (&dbus_result->values[0]);
+	result->shuffle = g_value_get_int (&dbus_result->values[1]);
+	result->repeat = g_value_get_int (&dbus_result->values[2]);
+	result->endless = g_value_get_int (&dbus_result->values[3]);
+}
+
+
+static GHashTable* _dynamic_GetMetadata11 (DBusGProxy* self, GError** error) {
 	GHashTable* result;
 	dbus_g_proxy_call (self, "GetMetadata", error, G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &result, G_TYPE_INVALID);
 	if (*error) {
@@ -539,7 +564,7 @@ static GHashTable* _dynamic_GetMetadata10 (DBusGProxy* self, GError** error) {
 }
 
 
-static gint32 _dynamic_PositionGet11 (DBusGProxy* self, GError** error) {
+static gint32 _dynamic_PositionGet12 (DBusGProxy* self, GError** error) {
 	gint32 result;
 	dbus_g_proxy_call (self, "PositionGet", error, G_TYPE_INVALID, G_TYPE_INT, &result, G_TYPE_INVALID);
 	if (*error) {
@@ -555,33 +580,43 @@ static void mpris_controller_onTrackChange (MprisController* self, DBusGProxy* m
 	PlayerItem* _tmp0_;
 	GeeHashSet* _tmp3_;
 	PlayerItem* _tmp2_;
-	GeeHashSet* _tmp5_;
-	PlayerItem* _tmp4_;
+	MprisControllerstatus _tmp4_ = {0};
+	MprisControllerstatus st;
+	gint play_state;
+	PlayerItem* _tmp5_;
+	ScrubMenuitem* scrub;
 	GHashTable* _tmp6_;
 	GeeHashSet* _tmp9_;
 	GHashTable* _tmp8_;
 	PlayerItem* _tmp7_;
+	GeeHashSet* _tmp11_;
 	PlayerItem* _tmp10_;
-	ScrubMenuitem* scrub;
-	gint32 _tmp11_;
+	gint32 _tmp12_;
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (mpris_client != NULL);
 	g_return_if_fail (ht != NULL);
 	_inner_error_ = NULL;
-	g_debug ("mpris-controller.vala:126: onTrackChange");
+	g_debug ("mpris-controller.vala:125: onTrackChange");
 	player_item_reset (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp1_ = metadata_menuitem_attributes_format ());
 	_g_object_unref0 (_tmp1_);
 	_g_object_unref0 (_tmp0_);
 	player_item_reset (_tmp2_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp3_ = scrub_menuitem_attributes_format ());
 	_g_object_unref0 (_tmp3_);
 	_g_object_unref0 (_tmp2_);
-	player_item_update (_tmp4_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), ht, _tmp5_ = metadata_menuitem_attributes_format ());
-	_g_object_unref0 (_tmp5_);
-	_g_object_unref0 (_tmp4_);
-	g_debug ("mpris-controller.vala:131: about to update the duration on the scrub b" \
-"ar");
-	_tmp6_ = _dynamic_GetMetadata10 (self->priv->_mpris_player, &_inner_error_);
+	st = (_dynamic_GetStatus10 (self->priv->_mpris_player, &_tmp4_, &_inner_error_), _tmp4_);
+	if (_inner_error_ != NULL) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+		g_clear_error (&_inner_error_);
+		return;
+	}
+	play_state = (gint) st.playback;
+	g_debug ("mpris-controller.vala:133: GetStatusChange, about to update scrub with" \
+" play state - %i", play_state);
+	scrub = (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp5_) ? ((ScrubMenuitem*) _tmp5_) : NULL);
+	scrub_menuitem_update_playstate (scrub, play_state);
+	_tmp6_ = _dynamic_GetMetadata11 (self->priv->_mpris_player, &_inner_error_);
 	if (_inner_error_ != NULL) {
+		_g_object_unref0 (scrub);
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
 		return;
@@ -590,15 +625,19 @@ static void mpris_controller_onTrackChange (MprisController* self, DBusGProxy* m
 	_g_object_unref0 (_tmp9_);
 	_g_hash_table_unref0 (_tmp8_);
 	_g_object_unref0 (_tmp7_);
-	scrub = (_tmp10_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp10_) ? ((ScrubMenuitem*) _tmp10_) : NULL);
-	_tmp11_ = _dynamic_PositionGet11 (self->priv->_mpris_player, &_inner_error_);
+	player_item_update (_tmp10_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), ht, _tmp11_ = metadata_menuitem_attributes_format ());
+	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp10_);
+	g_debug ("mpris-controller.vala:141: about to update the duration on the scrub b" \
+"ar");
+	_tmp12_ = _dynamic_PositionGet12 (self->priv->_mpris_player, &_inner_error_);
 	if (_inner_error_ != NULL) {
 		_g_object_unref0 (scrub);
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
 		return;
 	}
-	scrub_menuitem_update_position (scrub, _tmp11_);
+	scrub_menuitem_update_position (scrub, _tmp12_);
 	_g_object_unref0 (scrub);
 }
 
diff --git a/src/mpris-controller.vala b/src/mpris-controller.vala
index 8ecd20a..1e1e00a 100644
--- a/src/mpris-controller.vala
+++ b/src/mpris-controller.vala
@@ -63,7 +63,6 @@ public class MprisController : GLib.Object
 		                            MetadataMenuitem.attributes_format());
 		this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.mpris_player.GetMetadata(),
 		                        ScrubMenuitem.attributes_format());		
-		// temporary fix
 		ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
 		scrub.update_position(this.mpris_player.PositionGet());		
 	}
@@ -124,17 +123,23 @@ public class MprisController : GLib.Object
 	private void onTrackChange(dynamic DBus.Object mpris_client, HashTable<string,Value?> ht)
 	{
 		debug("onTrackChange");
+		
 		this.owner.custom_items[PlayerController.widget_order.METADATA].reset(MetadataMenuitem.attributes_format());
 		this.owner.custom_items[PlayerController.widget_order.SCRUB].reset(ScrubMenuitem.attributes_format());
+		//HashTable<string, Value?> status_hash = new HashTable<string, Value?>(str_hash, str_equal);
+
+		status st = this.mpris_player.GetStatus();
+		int play_state =  st.playback;
+		debug("GetStatusChange, about to update scrub with play state - %i", play_state);
+
+		ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
+		scrub.update_playstate(play_state);
+		this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.mpris_player.GetMetadata(),
+		                        ScrubMenuitem.attributes_format());		
 		this.owner.custom_items[PlayerController.widget_order.METADATA].update(ht,
 		                            MetadataMenuitem.attributes_format());
 		debug("about to update the duration on the scrub bar");
-		this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.mpris_player.GetMetadata(),
-		                        ScrubMenuitem.attributes_format());		
 		// temporary fix
-		ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
 		scrub.update_position(this.mpris_player.PositionGet());
 	}
-		
-	
 }
diff --git a/src/mpris2-controller.c b/src/mpris2-controller.c
new file mode 100644
index 0000000..a6546bb
--- /dev/null
+++ b/src/mpris2-controller.c
@@ -0,0 +1,5424 @@
+/* mpris2-controller.c generated by valac 0.9.5, the Vala compiler
+ * generated from mpris2-controller.vala, do not modify */
+
+/*
+This service primarily controls PulseAudio and is driven by the sound indicator menu on the panel.
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <glib.h>
+#include <glib-object.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-glib.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dbus/dbus.h>
+#include <gee.h>
+#include <libdbusmenu-glib/client.h>
+#include <libdbusmenu-glib/menuitem-proxy.h>
+#include <libdbusmenu-glib/menuitem.h>
+#include <libdbusmenu-glib/server.h>
+#include <float.h>
+#include <math.h>
+
+
+#define TYPE_MPRIS_ROOT (mpris_root_get_type ())
+#define MPRIS_ROOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_ROOT, MprisRoot))
+#define IS_MPRIS_ROOT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_ROOT))
+#define MPRIS_ROOT_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_MPRIS_ROOT, MprisRootIface))
+
+typedef struct _MprisRoot MprisRoot;
+typedef struct _MprisRootIface MprisRootIface;
+typedef struct _DBusObjectVTable _DBusObjectVTable;
+#define _g_free0(var) (var = (g_free (var), NULL))
+typedef struct _MprisRootDBusProxy MprisRootDBusProxy;
+typedef DBusGProxyClass MprisRootDBusProxyClass;
+
+#define TYPE_MPRIS_PLAYER (mpris_player_get_type ())
+#define MPRIS_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_PLAYER, MprisPlayer))
+#define IS_MPRIS_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_PLAYER))
+#define MPRIS_PLAYER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_MPRIS_PLAYER, MprisPlayerIface))
+
+typedef struct _MprisPlayer MprisPlayer;
+typedef struct _MprisPlayerIface MprisPlayerIface;
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
+typedef struct _MprisPlayerDBusProxy MprisPlayerDBusProxy;
+typedef DBusGProxyClass MprisPlayerDBusProxyClass;
+
+#define TYPE_FREE_DESKTOP_PROPERTIES (free_desktop_properties_get_type ())
+#define FREE_DESKTOP_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FREE_DESKTOP_PROPERTIES, FreeDesktopProperties))
+#define IS_FREE_DESKTOP_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FREE_DESKTOP_PROPERTIES))
+#define FREE_DESKTOP_PROPERTIES_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_FREE_DESKTOP_PROPERTIES, FreeDesktopPropertiesIface))
+
+typedef struct _FreeDesktopProperties FreeDesktopProperties;
+typedef struct _FreeDesktopPropertiesIface FreeDesktopPropertiesIface;
+typedef struct _FreeDesktopPropertiesDBusProxy FreeDesktopPropertiesDBusProxy;
+typedef DBusGProxyClass FreeDesktopPropertiesDBusProxyClass;
+
+#define TYPE_MPRIS2_CONTROLLER (mpris2_controller_get_type ())
+#define MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2Controller))
+#define MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
+#define IS_MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS2_CONTROLLER))
+#define IS_MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS2_CONTROLLER))
+#define MPRIS2_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
+
+typedef struct _Mpris2Controller Mpris2Controller;
+typedef struct _Mpris2ControllerClass Mpris2ControllerClass;
+typedef struct _Mpris2ControllerPrivate Mpris2ControllerPrivate;
+
+#define TYPE_PLAYER_CONTROLLER (player_controller_get_type ())
+#define PLAYER_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PLAYER_CONTROLLER, PlayerController))
+#define PLAYER_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PLAYER_CONTROLLER, PlayerControllerClass))
+#define IS_PLAYER_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PLAYER_CONTROLLER))
+#define IS_PLAYER_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PLAYER_CONTROLLER))
+#define PLAYER_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PLAYER_CONTROLLER, PlayerControllerClass))
+
+typedef struct _PlayerController PlayerController;
+typedef struct _PlayerControllerClass PlayerControllerClass;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
+
+#define TYPE_PLAYER_ITEM (player_item_get_type ())
+#define PLAYER_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PLAYER_ITEM, PlayerItem))
+#define PLAYER_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PLAYER_ITEM, PlayerItemClass))
+#define IS_PLAYER_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PLAYER_ITEM))
+#define IS_PLAYER_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PLAYER_ITEM))
+#define PLAYER_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PLAYER_ITEM, PlayerItemClass))
+
+typedef struct _PlayerItem PlayerItem;
+typedef struct _PlayerItemClass PlayerItemClass;
+
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
+
+#define PLAYER_CONTROLLER_TYPE_WIDGET_ORDER (player_controller_widget_order_get_type ())
+
+#define TYPE_TRANSPORT_MENUITEM (transport_menuitem_get_type ())
+#define TRANSPORT_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TRANSPORT_MENUITEM, TransportMenuitem))
+#define TRANSPORT_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TRANSPORT_MENUITEM, TransportMenuitemClass))
+#define IS_TRANSPORT_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TRANSPORT_MENUITEM))
+#define IS_TRANSPORT_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TRANSPORT_MENUITEM))
+#define TRANSPORT_MENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TRANSPORT_MENUITEM, TransportMenuitemClass))
+
+typedef struct _TransportMenuitem TransportMenuitem;
+typedef struct _TransportMenuitemClass TransportMenuitemClass;
+
+#define TYPE_SCRUB_MENUITEM (scrub_menuitem_get_type ())
+#define SCRUB_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCRUB_MENUITEM, ScrubMenuitem))
+#define SCRUB_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCRUB_MENUITEM, ScrubMenuitemClass))
+#define IS_SCRUB_MENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCRUB_MENUITEM))
+#define IS_SCRUB_MENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SCRUB_MENUITEM))
+#define SCRUB_MENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SCRUB_MENUITEM, ScrubMenuitemClass))
+
+typedef struct _ScrubMenuitem ScrubMenuitem;
+typedef struct _ScrubMenuitemClass ScrubMenuitemClass;
+
+#define TRANSPORT_MENUITEM_TYPE_ACTION (transport_menuitem_action_get_type ())
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _dbus_g_connection_unref0(var) ((var == NULL) ? NULL : (var = (dbus_g_connection_unref (var), NULL)))
+
+struct _MprisRootIface {
+	GTypeInterface parent_iface;
+	void (*Quit) (MprisRoot* self, GError** error);
+	void (*Raise) (MprisRoot* self, GError** error);
+	gboolean (*get_HasTracklist) (MprisRoot* self);
+	void (*set_HasTracklist) (MprisRoot* self, gboolean value);
+	gboolean (*get_CanQuit) (MprisRoot* self);
+	void (*set_CanQuit) (MprisRoot* self, gboolean value);
+	gboolean (*get_CanRaise) (MprisRoot* self);
+	void (*set_CanRaise) (MprisRoot* self, gboolean value);
+	char* (*get_Identity) (MprisRoot* self);
+	void (*set_Identity) (MprisRoot* self, const char* value);
+	char* (*get_DesktopEntry) (MprisRoot* self);
+	void (*set_DesktopEntry) (MprisRoot* self, const char* value);
+};
+
+struct _DBusObjectVTable {
+	void (*register_object) (DBusConnection*, const char*, void*);
+};
+
+struct _MprisRootDBusProxy {
+	DBusGProxy parent_instance;
+	gboolean disposed;
+};
+
+struct _MprisPlayerIface {
+	GTypeInterface parent_iface;
+	void (*SetPosition) (MprisPlayer* self, const char* path, gint64 pos, GError** error);
+	void (*PlayPause) (MprisPlayer* self, GError** error);
+	void (*Pause) (MprisPlayer* self, GError** error);
+	void (*Next) (MprisPlayer* self, GError** error);
+	void (*Previous) (MprisPlayer* self, GError** error);
+	GHashTable* (*get_Metadata) (MprisPlayer* self);
+	void (*set_Metadata) (MprisPlayer* self, GHashTable* value);
+	gint32 (*get_Position) (MprisPlayer* self);
+	void (*set_Position) (MprisPlayer* self, gint32 value);
+	char* (*get_PlaybackStatus) (MprisPlayer* self);
+	void (*set_PlaybackStatus) (MprisPlayer* self, const char* value);
+};
+
+struct _MprisPlayerDBusProxy {
+	DBusGProxy parent_instance;
+	gboolean disposed;
+};
+
+struct _FreeDesktopPropertiesIface {
+	GTypeInterface parent_iface;
+};
+
+struct _FreeDesktopPropertiesDBusProxy {
+	DBusGProxy parent_instance;
+	gboolean disposed;
+};
+
+struct _Mpris2Controller {
+	GObject parent_instance;
+	Mpris2ControllerPrivate * priv;
+};
+
+struct _Mpris2ControllerClass {
+	GObjectClass parent_class;
+};
+
+struct _Mpris2ControllerPrivate {
+	MprisRoot* _mpris2_root;
+	MprisPlayer* _player;
+	PlayerController* _owner;
+	FreeDesktopProperties* _properties_interface;
+};
+
+struct _PlayerController {
+	GObject parent_instance;
+	PlayerControllerPrivate * priv;
+	gint current_state;
+	GeeArrayList* custom_items;
+	MprisBridge* mpris_bridge;
+};
+
+struct _PlayerControllerClass {
+	GObjectClass parent_class;
+};
+
+typedef enum  {
+	PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR,
+	PLAYER_CONTROLLER_WIDGET_ORDER_TITLE,
+	PLAYER_CONTROLLER_WIDGET_ORDER_METADATA,
+	PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB,
+	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT
+} PlayerControllerwidget_order;
+
+typedef enum  {
+	TRANSPORT_MENUITEM_ACTION_PREVIOUS,
+	TRANSPORT_MENUITEM_ACTION_PLAY_PAUSE,
+	TRANSPORT_MENUITEM_ACTION_NEXT
+} TransportMenuitemaction;
+
+
+static gpointer mpris2_controller_parent_class = NULL;
+
+MprisRoot* mpris_root_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path);
+GType mpris_root_get_type (void) G_GNUC_CONST;
+void mpris_root_Quit (MprisRoot* self, GError** error);
+void mpris_root_Raise (MprisRoot* self, GError** error);
+gboolean mpris_root_get_HasTracklist (MprisRoot* self);
+void mpris_root_set_HasTracklist (MprisRoot* self, gboolean value);
+gboolean mpris_root_get_CanQuit (MprisRoot* self);
+void mpris_root_set_CanQuit (MprisRoot* self, gboolean value);
+gboolean mpris_root_get_CanRaise (MprisRoot* self);
+void mpris_root_set_CanRaise (MprisRoot* self, gboolean value);
+char* mpris_root_get_Identity (MprisRoot* self);
+void mpris_root_set_Identity (MprisRoot* self, const char* value);
+char* mpris_root_get_DesktopEntry (MprisRoot* self);
+void mpris_root_set_DesktopEntry (MprisRoot* self, const char* value);
+static void _vala_dbus_register_object (DBusConnection* connection, const char* path, void* object);
+static void _vala_dbus_unregister_object (gpointer connection, GObject* object);
+void mpris_root_dbus_register_object (DBusConnection* connection, const char* path, void* object);
+void _mpris_root_dbus_unregister (DBusConnection* connection, void* _user_data_);
+DBusHandlerResult mpris_root_dbus_message (DBusConnection* connection, DBusMessage* message, void* object);
+static DBusHandlerResult _dbus_mpris_root_introspect (MprisRoot* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_root_property_get (MprisRoot* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_root_property_set (MprisRoot* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_root_property_get_all (MprisRoot* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_root_Quit (MprisRoot* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_root_Raise (MprisRoot* self, DBusConnection* connection, DBusMessage* message);
+GType mpris_root_dbus_proxy_get_type (void) G_GNUC_CONST;
+DBusHandlerResult mpris_root_dbus_proxy_filter (DBusConnection* connection, DBusMessage* message, void* user_data);
+enum  {
+	MPRIS_ROOT_DBUS_PROXY_DUMMY_PROPERTY,
+	MPRIS_ROOT_DBUS_PROXY_HAS_TRACKLIST,
+	MPRIS_ROOT_DBUS_PROXY_CAN_QUIT,
+	MPRIS_ROOT_DBUS_PROXY_CAN_RAISE,
+	MPRIS_ROOT_DBUS_PROXY_IDENTITY,
+	MPRIS_ROOT_DBUS_PROXY_DESKTOP_ENTRY
+};
+static void mpris_root_dbus_proxy_Quit (MprisRoot* self, GError** error);
+static void mpris_root_dbus_proxy_Raise (MprisRoot* self, GError** error);
+static gboolean mpris_root_dbus_proxy_get_HasTracklist (MprisRoot* self);
+static void mpris_root_dbus_proxy_set_HasTracklist (MprisRoot* self, gboolean value);
+static gboolean mpris_root_dbus_proxy_get_CanQuit (MprisRoot* self);
+static void mpris_root_dbus_proxy_set_CanQuit (MprisRoot* self, gboolean value);
+static gboolean mpris_root_dbus_proxy_get_CanRaise (MprisRoot* self);
+static void mpris_root_dbus_proxy_set_CanRaise (MprisRoot* self, gboolean value);
+static char* mpris_root_dbus_proxy_get_Identity (MprisRoot* self);
+static void mpris_root_dbus_proxy_set_Identity (MprisRoot* self, const char* value);
+static char* mpris_root_dbus_proxy_get_DesktopEntry (MprisRoot* self);
+static void mpris_root_dbus_proxy_set_DesktopEntry (MprisRoot* self, const char* value);
+static void mpris_root_dbus_proxy_mpris_root__interface_init (MprisRootIface* iface);
+static void mpris_root_dbus_proxy_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void mpris_root_dbus_proxy_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+MprisPlayer* mpris_player_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path);
+GType mpris_player_get_type (void) G_GNUC_CONST;
+void mpris_player_SetPosition (MprisPlayer* self, const char* path, gint64 pos, GError** error);
+void mpris_player_PlayPause (MprisPlayer* self, GError** error);
+void mpris_player_Pause (MprisPlayer* self, GError** error);
+void mpris_player_Next (MprisPlayer* self, GError** error);
+void mpris_player_Previous (MprisPlayer* self, GError** error);
+GHashTable* mpris_player_get_Metadata (MprisPlayer* self);
+void mpris_player_set_Metadata (MprisPlayer* self, GHashTable* value);
+gint32 mpris_player_get_Position (MprisPlayer* self);
+void mpris_player_set_Position (MprisPlayer* self, gint32 value);
+char* mpris_player_get_PlaybackStatus (MprisPlayer* self);
+void mpris_player_set_PlaybackStatus (MprisPlayer* self, const char* value);
+void mpris_player_dbus_register_object (DBusConnection* connection, const char* path, void* object);
+void _mpris_player_dbus_unregister (DBusConnection* connection, void* _user_data_);
+DBusHandlerResult mpris_player_dbus_message (DBusConnection* connection, DBusMessage* message, void* object);
+static DBusHandlerResult _dbus_mpris_player_introspect (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_player_property_get (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_player_property_set (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_player_property_get_all (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_player_SetPosition (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_player_PlayPause (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_player_Pause (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_player_Next (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_mpris_player_Previous (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+static void _dbus_mpris_player_seeked (GObject* _sender, gint64 new_position, DBusConnection* _connection);
+GType mpris_player_dbus_proxy_get_type (void) G_GNUC_CONST;
+static void _dbus_handle_mpris_player_seeked (MprisPlayer* self, DBusConnection* connection, DBusMessage* message);
+DBusHandlerResult mpris_player_dbus_proxy_filter (DBusConnection* connection, DBusMessage* message, void* user_data);
+enum  {
+	MPRIS_PLAYER_DBUS_PROXY_DUMMY_PROPERTY,
+	MPRIS_PLAYER_DBUS_PROXY_METADATA,
+	MPRIS_PLAYER_DBUS_PROXY_POSITION,
+	MPRIS_PLAYER_DBUS_PROXY_PLAYBACK_STATUS
+};
+static void mpris_player_dbus_proxy_SetPosition (MprisPlayer* self, const char* path, gint64 pos, GError** error);
+static void mpris_player_dbus_proxy_PlayPause (MprisPlayer* self, GError** error);
+static void mpris_player_dbus_proxy_Pause (MprisPlayer* self, GError** error);
+static void mpris_player_dbus_proxy_Next (MprisPlayer* self, GError** error);
+static void mpris_player_dbus_proxy_Previous (MprisPlayer* self, GError** error);
+static GHashTable* mpris_player_dbus_proxy_get_Metadata (MprisPlayer* self);
+static void mpris_player_dbus_proxy_set_Metadata (MprisPlayer* self, GHashTable* value);
+static gint32 mpris_player_dbus_proxy_get_Position (MprisPlayer* self);
+static void mpris_player_dbus_proxy_set_Position (MprisPlayer* self, gint32 value);
+static char* mpris_player_dbus_proxy_get_PlaybackStatus (MprisPlayer* self);
+static void mpris_player_dbus_proxy_set_PlaybackStatus (MprisPlayer* self, const char* value);
+static void mpris_player_dbus_proxy_mpris_player__interface_init (MprisPlayerIface* iface);
+static void mpris_player_dbus_proxy_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void mpris_player_dbus_proxy_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+GType free_desktop_properties_get_type (void) G_GNUC_CONST;
+FreeDesktopProperties* free_desktop_properties_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path);
+void free_desktop_properties_dbus_register_object (DBusConnection* connection, const char* path, void* object);
+void _free_desktop_properties_dbus_unregister (DBusConnection* connection, void* _user_data_);
+DBusHandlerResult free_desktop_properties_dbus_message (DBusConnection* connection, DBusMessage* message, void* object);
+static DBusHandlerResult _dbus_free_desktop_properties_introspect (FreeDesktopProperties* self, DBusConnection* connection, DBusMessage* message);
+static DBusHandlerResult _dbus_free_desktop_properties_property_get_all (FreeDesktopProperties* self, DBusConnection* connection, DBusMessage* message);
+static void _dbus_free_desktop_properties_properties_changed (GObject* _sender, const char* source, GHashTable* changed_properties, char** invalid, int invalid_length1, DBusConnection* _connection);
+GType free_desktop_properties_dbus_proxy_get_type (void) G_GNUC_CONST;
+static void _dbus_handle_free_desktop_properties_properties_changed (FreeDesktopProperties* self, DBusConnection* connection, DBusMessage* message);
+DBusHandlerResult free_desktop_properties_dbus_proxy_filter (DBusConnection* connection, DBusMessage* message, void* user_data);
+enum  {
+	FREE_DESKTOP_PROPERTIES_DBUS_PROXY_DUMMY_PROPERTY
+};
+static void free_desktop_properties_dbus_proxy_free_desktop_properties__interface_init (FreeDesktopPropertiesIface* iface);
+static void free_desktop_properties_dbus_proxy_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void free_desktop_properties_dbus_proxy_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+GType mpris2_controller_get_type (void) G_GNUC_CONST;
+GType player_controller_get_type (void) G_GNUC_CONST;
+#define MPRIS2_CONTROLLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerPrivate))
+enum  {
+	MPRIS2_CONTROLLER_DUMMY_PROPERTY,
+	MPRIS2_CONTROLLER_MPRIS2_ROOT,
+	MPRIS2_CONTROLLER_PLAYER,
+	MPRIS2_CONTROLLER_OWNER,
+	MPRIS2_CONTROLLER_PROPERTIES_INTERFACE
+};
+#define MPRIS2_CONTROLLER_root_interface "org.mpris.MediaPlayer2"
+Mpris2Controller* mpris2_controller_new (PlayerController* ctrl);
+Mpris2Controller* mpris2_controller_construct (GType object_type, PlayerController* ctrl);
+static GValue* _g_value_dup (GValue* self);
+static gint mpris2_controller_determine_play_state (Mpris2Controller* self, const char* status);
+PlayerController* mpris2_controller_get_owner (Mpris2Controller* self);
+GType player_item_get_type (void) G_GNUC_CONST;
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
+GType player_controller_widget_order_get_type (void) G_GNUC_CONST;
+GType transport_menuitem_get_type (void) G_GNUC_CONST;
+void transport_menuitem_change_play_state (TransportMenuitem* self, gint state);
+GType scrub_menuitem_get_type (void) G_GNUC_CONST;
+void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state);
+void scrub_menuitem_update_position (ScrubMenuitem* self, gint32 new_position);
+MprisPlayer* mpris2_controller_get_player (Mpris2Controller* self);
+void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
+GeeHashSet* metadata_menuitem_attributes_format (void);
+void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attributes);
+GeeHashSet* scrub_menuitem_attributes_format (void);
+void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char* interface_source, GHashTable* changed_properties, char** invalid, int invalid_length1);
+void mpris2_controller_initial_update (Mpris2Controller* self);
+GType transport_menuitem_action_get_type (void) G_GNUC_CONST;
+void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuitemaction command);
+void mpris2_controller_set_position (Mpris2Controller* self, double position);
+void mpris2_controller_onSeeked (Mpris2Controller* self, gint64 position);
+MprisRoot* mpris2_controller_get_mpris2_root (Mpris2Controller* self);
+gboolean mpris2_controller_connected (Mpris2Controller* self);
+gboolean mpris2_controller_was_successfull (Mpris2Controller* self);
+void mpris2_controller_expose (Mpris2Controller* self);
+static void mpris2_controller_set_mpris2_root (Mpris2Controller* self, MprisRoot* value);
+static void mpris2_controller_set_player (Mpris2Controller* self, MprisPlayer* value);
+static void mpris2_controller_set_owner (Mpris2Controller* self, PlayerController* value);
+FreeDesktopProperties* mpris2_controller_get_properties_interface (Mpris2Controller* self);
+static void mpris2_controller_set_properties_interface (Mpris2Controller* self, FreeDesktopProperties* value);
+const char* player_controller_get_name (PlayerController* self);
+static void _mpris2_controller_onSeeked_mpris_player_seeked (MprisPlayer* _sender, gint64 new_position, gpointer self);
+static void _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed (FreeDesktopProperties* _sender, const char* source, GHashTable* changed_properties, char** invalid, int invalid_length1, gpointer self);
+static GObject * mpris2_controller_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
+static void mpris2_controller_finalize (GObject* obj);
+static void mpris2_controller_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void mpris2_controller_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static int _vala_strcmp0 (const char * str1, const char * str2);
+
+static const DBusObjectPathVTable _mpris_root_dbus_path_vtable = {_mpris_root_dbus_unregister, mpris_root_dbus_message};
+static const _DBusObjectVTable _mpris_root_dbus_vtable = {mpris_root_dbus_register_object};
+static const DBusObjectPathVTable _mpris_player_dbus_path_vtable = {_mpris_player_dbus_unregister, mpris_player_dbus_message};
+static const _DBusObjectVTable _mpris_player_dbus_vtable = {mpris_player_dbus_register_object};
+static const DBusObjectPathVTable _free_desktop_properties_dbus_path_vtable = {_free_desktop_properties_dbus_unregister, free_desktop_properties_dbus_message};
+static const _DBusObjectVTable _free_desktop_properties_dbus_vtable = {free_desktop_properties_dbus_register_object};
+
+static void g_cclosure_user_marshal_VOID__INT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+
+void mpris_root_Quit (MprisRoot* self, GError** error) {
+	MPRIS_ROOT_GET_INTERFACE (self)->Quit (self, error);
+}
+
+
+void mpris_root_Raise (MprisRoot* self, GError** error) {
+	MPRIS_ROOT_GET_INTERFACE (self)->Raise (self, error);
+}
+
+
+gboolean mpris_root_get_HasTracklist (MprisRoot* self) {
+	return MPRIS_ROOT_GET_INTERFACE (self)->get_HasTracklist (self);
+}
+
+
+void mpris_root_set_HasTracklist (MprisRoot* self, gboolean value) {
+	MPRIS_ROOT_GET_INTERFACE (self)->set_HasTracklist (self, value);
+}
+
+
+gboolean mpris_root_get_CanQuit (MprisRoot* self) {
+	return MPRIS_ROOT_GET_INTERFACE (self)->get_CanQuit (self);
+}
+
+
+void mpris_root_set_CanQuit (MprisRoot* self, gboolean value) {
+	MPRIS_ROOT_GET_INTERFACE (self)->set_CanQuit (self, value);
+}
+
+
+gboolean mpris_root_get_CanRaise (MprisRoot* self) {
+	return MPRIS_ROOT_GET_INTERFACE (self)->get_CanRaise (self);
+}
+
+
+void mpris_root_set_CanRaise (MprisRoot* self, gboolean value) {
+	MPRIS_ROOT_GET_INTERFACE (self)->set_CanRaise (self, value);
+}
+
+
+char* mpris_root_get_Identity (MprisRoot* self) {
+	return MPRIS_ROOT_GET_INTERFACE (self)->get_Identity (self);
+}
+
+
+void mpris_root_set_Identity (MprisRoot* self, const char* value) {
+	MPRIS_ROOT_GET_INTERFACE (self)->set_Identity (self, value);
+}
+
+
+char* mpris_root_get_DesktopEntry (MprisRoot* self) {
+	return MPRIS_ROOT_GET_INTERFACE (self)->get_DesktopEntry (self);
+}
+
+
+void mpris_root_set_DesktopEntry (MprisRoot* self, const char* value) {
+	MPRIS_ROOT_GET_INTERFACE (self)->set_DesktopEntry (self, value);
+}
+
+
+static void _vala_dbus_register_object (DBusConnection* connection, const char* path, void* object) {
+	const _DBusObjectVTable * vtable;
+	vtable = g_type_get_qdata (G_TYPE_FROM_INSTANCE (object), g_quark_from_static_string ("DBusObjectVTable"));
+	if (vtable) {
+		vtable->register_object (connection, path, object);
+	} else {
+		g_warning ("Object does not implement any D-Bus interface");
+	}
+}
+
+
+static void _vala_dbus_unregister_object (gpointer connection, GObject* object) {
+	char* path;
+	path = g_object_steal_data ((GObject*) object, "dbus_object_path");
+	dbus_connection_unregister_object_path (connection, path);
+	g_free (path);
+}
+
+
+void _mpris_root_dbus_unregister (DBusConnection* connection, void* _user_data_) {
+}
+
+
+static DBusHandlerResult _dbus_mpris_root_introspect (MprisRoot* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter;
+	GString* xml_data;
+	char** children;
+	int i;
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	xml_data = g_string_new ("<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" \"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n");
+	g_string_append (xml_data, "<node>\n<interface name=\"org.freedesktop.DBus.Introspectable\">\n  <method name=\"Introspect\">\n    <arg name=\"data\" direction=\"out\" type=\"s\"/>\n  </method>\n</interface>\n<interface name=\"org.freedesktop.DBus.Properties\">\n  <method name=\"Get\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"propname\" direction=\"in\" type=\"s\"/>\n    <arg name=\"value\" direction=\"out\" type=\"v\"/>\n  </method>\n  <method name=\"Set\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"propname\" direction=\"in\" type=\"s\"/>\n    <arg name=\"value\" direction=\"in\" type=\"v\"/>\n  </method>\n  <method name=\"GetAll\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"props\" direction=\"out\" type=\"a{sv}\"/>\n  </method>\n</interface>\n<interface name=\"org.mpris.MediaPlayer2\">\n  <method name=\"Quit\">\n  </method>\n  <method name=\"Raise\">\n  </method>\n  <property name=\"HasTracklist\" type=\"b\" access=\"readwrite\"/>\n  <property name=\"CanQuit\" type=\"b\" access=\"readwrite\"/>\n  <property name=\"CanRaise\" type=\"b\" access=\"readwrite\"/>\n  <property name=\"Identity\" type=\"s\" access=\"readwrite\"/>\n  <property name=\"DesktopEntry\" type=\"s\" access=\"readwrite\"/>\n</interface>\n");
+	dbus_connection_list_registered (connection, g_object_get_data ((GObject *) self, "dbus_object_path"), &children);
+	for (i = 0; children[i]; i++) {
+		g_string_append_printf (xml_data, "<node name=\"%s\"/>\n", children[i]);
+	}
+	dbus_free_string_array (children);
+	g_string_append (xml_data, "</node>\n");
+	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &xml_data->str);
+	g_string_free (xml_data, TRUE);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_root_property_get (MprisRoot* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter, reply_iter, subiter;
+	char* interface_name;
+	const char* _tmp0_;
+	char* property_name;
+	const char* _tmp1_;
+	if (strcmp (dbus_message_get_signature (message), "ss")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &reply_iter);
+	dbus_message_iter_get_basic (&iter, &_tmp0_);
+	dbus_message_iter_next (&iter);
+	interface_name = g_strdup (_tmp0_);
+	dbus_message_iter_get_basic (&iter, &_tmp1_);
+	dbus_message_iter_next (&iter);
+	property_name = g_strdup (_tmp1_);
+	if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "HasTracklist") == 0)) {
+		gboolean result;
+		dbus_bool_t _tmp2_;
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "b", &subiter);
+		result = mpris_root_get_HasTracklist (self);
+		_tmp2_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_BOOLEAN, &_tmp2_);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "CanQuit") == 0)) {
+		gboolean result;
+		dbus_bool_t _tmp3_;
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "b", &subiter);
+		result = mpris_root_get_CanQuit (self);
+		_tmp3_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_BOOLEAN, &_tmp3_);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "CanRaise") == 0)) {
+		gboolean result;
+		dbus_bool_t _tmp4_;
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "b", &subiter);
+		result = mpris_root_get_CanRaise (self);
+		_tmp4_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_BOOLEAN, &_tmp4_);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "Identity") == 0)) {
+		char* result;
+		const char* _tmp5_;
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "s", &subiter);
+		result = mpris_root_get_Identity (self);
+		_tmp5_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_STRING, &_tmp5_);
+		_g_free0 (result);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "DesktopEntry") == 0)) {
+		char* result;
+		const char* _tmp6_;
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "s", &subiter);
+		result = mpris_root_get_DesktopEntry (self);
+		_tmp6_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_STRING, &_tmp6_);
+		_g_free0 (result);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else {
+		dbus_message_unref (reply);
+		reply = NULL;
+	}
+	g_free (interface_name);
+	g_free (property_name);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_root_property_set (MprisRoot* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter, subiter;
+	char* interface_name;
+	const char* _tmp7_;
+	char* property_name;
+	const char* _tmp8_;
+	if (strcmp (dbus_message_get_signature (message), "ssv")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_get_basic (&iter, &_tmp7_);
+	dbus_message_iter_next (&iter);
+	interface_name = g_strdup (_tmp7_);
+	dbus_message_iter_get_basic (&iter, &_tmp8_);
+	dbus_message_iter_next (&iter);
+	property_name = g_strdup (_tmp8_);
+	dbus_message_iter_recurse (&iter, &subiter);
+	if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "HasTracklist") == 0)) {
+		gboolean value;
+		dbus_bool_t _tmp9_;
+		dbus_message_iter_get_basic (&subiter, &_tmp9_);
+		dbus_message_iter_next (&subiter);
+		value = _tmp9_;
+		mpris_root_set_HasTracklist (self, value);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "CanQuit") == 0)) {
+		gboolean value;
+		dbus_bool_t _tmp10_;
+		dbus_message_iter_get_basic (&subiter, &_tmp10_);
+		dbus_message_iter_next (&subiter);
+		value = _tmp10_;
+		mpris_root_set_CanQuit (self, value);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "CanRaise") == 0)) {
+		gboolean value;
+		dbus_bool_t _tmp11_;
+		dbus_message_iter_get_basic (&subiter, &_tmp11_);
+		dbus_message_iter_next (&subiter);
+		value = _tmp11_;
+		mpris_root_set_CanRaise (self, value);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "Identity") == 0)) {
+		char* value;
+		const char* _tmp12_;
+		dbus_message_iter_get_basic (&subiter, &_tmp12_);
+		dbus_message_iter_next (&subiter);
+		value = g_strdup (_tmp12_);
+		mpris_root_set_Identity (self, value);
+		_g_free0 (value);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) && (strcmp (property_name, "DesktopEntry") == 0)) {
+		char* value;
+		const char* _tmp13_;
+		dbus_message_iter_get_basic (&subiter, &_tmp13_);
+		dbus_message_iter_next (&subiter);
+		value = g_strdup (_tmp13_);
+		mpris_root_set_DesktopEntry (self, value);
+		_g_free0 (value);
+	} else {
+		dbus_message_unref (reply);
+		reply = NULL;
+	}
+	g_free (interface_name);
+	g_free (property_name);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_root_property_get_all (MprisRoot* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter, reply_iter, subiter, entry_iter, value_iter;
+	char* interface_name;
+	const char* _tmp14_;
+	const char* property_name;
+	if (strcmp (dbus_message_get_signature (message), "s")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &reply_iter);
+	dbus_message_iter_get_basic (&iter, &_tmp14_);
+	dbus_message_iter_next (&iter);
+	interface_name = g_strdup (_tmp14_);
+	if (strcmp (interface_name, "org.mpris.MediaPlayer2") == 0) {
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_ARRAY, "{sv}", &subiter);
+		{
+			gboolean result;
+			dbus_bool_t _tmp15_;
+			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
+			property_name = "HasTracklist";
+			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
+			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "b", &value_iter);
+			result = mpris_root_get_HasTracklist (self);
+			_tmp15_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_BOOLEAN, &_tmp15_);
+			dbus_message_iter_close_container (&entry_iter, &value_iter);
+			dbus_message_iter_close_container (&subiter, &entry_iter);
+		}
+		{
+			gboolean result;
+			dbus_bool_t _tmp16_;
+			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
+			property_name = "CanQuit";
+			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
+			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "b", &value_iter);
+			result = mpris_root_get_CanQuit (self);
+			_tmp16_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_BOOLEAN, &_tmp16_);
+			dbus_message_iter_close_container (&entry_iter, &value_iter);
+			dbus_message_iter_close_container (&subiter, &entry_iter);
+		}
+		{
+			gboolean result;
+			dbus_bool_t _tmp17_;
+			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
+			property_name = "CanRaise";
+			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
+			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "b", &value_iter);
+			result = mpris_root_get_CanRaise (self);
+			_tmp17_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_BOOLEAN, &_tmp17_);
+			dbus_message_iter_close_container (&entry_iter, &value_iter);
+			dbus_message_iter_close_container (&subiter, &entry_iter);
+		}
+		{
+			char* result;
+			const char* _tmp18_;
+			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
+			property_name = "Identity";
+			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
+			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "s", &value_iter);
+			result = mpris_root_get_Identity (self);
+			_tmp18_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &_tmp18_);
+			_g_free0 (result);
+			dbus_message_iter_close_container (&entry_iter, &value_iter);
+			dbus_message_iter_close_container (&subiter, &entry_iter);
+		}
+		{
+			char* result;
+			const char* _tmp19_;
+			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
+			property_name = "DesktopEntry";
+			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
+			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "s", &value_iter);
+			result = mpris_root_get_DesktopEntry (self);
+			_tmp19_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &_tmp19_);
+			_g_free0 (result);
+			dbus_message_iter_close_container (&entry_iter, &value_iter);
+			dbus_message_iter_close_container (&subiter, &entry_iter);
+		}
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else {
+		dbus_message_unref (reply);
+		reply = NULL;
+	}
+	g_free (interface_name);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_root_Quit (MprisRoot* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	GError* error;
+	DBusMessage* reply;
+	error = NULL;
+	if (strcmp (dbus_message_get_signature (message), "")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	mpris_root_Quit (self, &error);
+	if (error) {
+		if (error->domain == DBUS_GERROR) {
+			switch (error->code) {
+				case DBUS_GERROR_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Failed", error->message);
+				break;
+				case DBUS_GERROR_NO_MEMORY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoMemory", error->message);
+				break;
+				case DBUS_GERROR_SERVICE_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.ServiceUnknown", error->message);
+				break;
+				case DBUS_GERROR_NAME_HAS_NO_OWNER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NameHasNoOwner", error->message);
+				break;
+				case DBUS_GERROR_NO_REPLY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoReply", error->message);
+				break;
+				case DBUS_GERROR_IO_ERROR:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.IOError", error->message);
+				break;
+				case DBUS_GERROR_BAD_ADDRESS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.BadAddress", error->message);
+				break;
+				case DBUS_GERROR_NOT_SUPPORTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NotSupported", error->message);
+				break;
+				case DBUS_GERROR_LIMITS_EXCEEDED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.LimitsExceeded", error->message);
+				break;
+				case DBUS_GERROR_ACCESS_DENIED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AccessDenied", error->message);
+				break;
+				case DBUS_GERROR_AUTH_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AuthFailed", error->message);
+				break;
+				case DBUS_GERROR_NO_SERVER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoServer", error->message);
+				break;
+				case DBUS_GERROR_TIMEOUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Timeout", error->message);
+				break;
+				case DBUS_GERROR_NO_NETWORK:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoNetwork", error->message);
+				break;
+				case DBUS_GERROR_ADDRESS_IN_USE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AddressInUse", error->message);
+				break;
+				case DBUS_GERROR_DISCONNECTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Disconnected", error->message);
+				break;
+				case DBUS_GERROR_INVALID_ARGS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidArgs", error->message);
+				break;
+				case DBUS_GERROR_FILE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileNotFound", error->message);
+				break;
+				case DBUS_GERROR_FILE_EXISTS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileExists", error->message);
+				break;
+				case DBUS_GERROR_UNKNOWN_METHOD:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnknownMethod", error->message);
+				break;
+				case DBUS_GERROR_TIMED_OUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.TimedOut", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleNotFound", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_INVALID:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleInvalid", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_EXEC_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ExecFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FORK_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ForkFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_EXITED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildExited", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_SIGNALED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildSignaled", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.Failed", error->message);
+				break;
+				case DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnixProcessIdUnknown", error->message);
+				break;
+				case DBUS_GERROR_INVALID_SIGNATURE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidSignature", error->message);
+				break;
+				case DBUS_GERROR_INVALID_FILE_CONTENT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidFileContent", error->message);
+				break;
+				case DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", error->message);
+				break;
+				case DBUS_GERROR_REMOTE_EXCEPTION:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.RemoteException", error->message);
+				break;
+			}
+		}
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	}
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_root_Raise (MprisRoot* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	GError* error;
+	DBusMessage* reply;
+	error = NULL;
+	if (strcmp (dbus_message_get_signature (message), "")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	mpris_root_Raise (self, &error);
+	if (error) {
+		if (error->domain == DBUS_GERROR) {
+			switch (error->code) {
+				case DBUS_GERROR_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Failed", error->message);
+				break;
+				case DBUS_GERROR_NO_MEMORY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoMemory", error->message);
+				break;
+				case DBUS_GERROR_SERVICE_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.ServiceUnknown", error->message);
+				break;
+				case DBUS_GERROR_NAME_HAS_NO_OWNER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NameHasNoOwner", error->message);
+				break;
+				case DBUS_GERROR_NO_REPLY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoReply", error->message);
+				break;
+				case DBUS_GERROR_IO_ERROR:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.IOError", error->message);
+				break;
+				case DBUS_GERROR_BAD_ADDRESS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.BadAddress", error->message);
+				break;
+				case DBUS_GERROR_NOT_SUPPORTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NotSupported", error->message);
+				break;
+				case DBUS_GERROR_LIMITS_EXCEEDED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.LimitsExceeded", error->message);
+				break;
+				case DBUS_GERROR_ACCESS_DENIED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AccessDenied", error->message);
+				break;
+				case DBUS_GERROR_AUTH_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AuthFailed", error->message);
+				break;
+				case DBUS_GERROR_NO_SERVER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoServer", error->message);
+				break;
+				case DBUS_GERROR_TIMEOUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Timeout", error->message);
+				break;
+				case DBUS_GERROR_NO_NETWORK:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoNetwork", error->message);
+				break;
+				case DBUS_GERROR_ADDRESS_IN_USE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AddressInUse", error->message);
+				break;
+				case DBUS_GERROR_DISCONNECTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Disconnected", error->message);
+				break;
+				case DBUS_GERROR_INVALID_ARGS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidArgs", error->message);
+				break;
+				case DBUS_GERROR_FILE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileNotFound", error->message);
+				break;
+				case DBUS_GERROR_FILE_EXISTS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileExists", error->message);
+				break;
+				case DBUS_GERROR_UNKNOWN_METHOD:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnknownMethod", error->message);
+				break;
+				case DBUS_GERROR_TIMED_OUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.TimedOut", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleNotFound", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_INVALID:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleInvalid", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_EXEC_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ExecFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FORK_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ForkFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_EXITED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildExited", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_SIGNALED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildSignaled", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.Failed", error->message);
+				break;
+				case DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnixProcessIdUnknown", error->message);
+				break;
+				case DBUS_GERROR_INVALID_SIGNATURE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidSignature", error->message);
+				break;
+				case DBUS_GERROR_INVALID_FILE_CONTENT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidFileContent", error->message);
+				break;
+				case DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", error->message);
+				break;
+				case DBUS_GERROR_REMOTE_EXCEPTION:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.RemoteException", error->message);
+				break;
+			}
+		}
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	}
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+DBusHandlerResult mpris_root_dbus_message (DBusConnection* connection, DBusMessage* message, void* object) {
+	DBusHandlerResult result;
+	result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) {
+		result = _dbus_mpris_root_introspect (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Properties", "Get")) {
+		result = _dbus_mpris_root_property_get (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Properties", "Set")) {
+		result = _dbus_mpris_root_property_set (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Properties", "GetAll")) {
+		result = _dbus_mpris_root_property_get_all (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.mpris.MediaPlayer2", "Quit")) {
+		result = _dbus_mpris_root_Quit (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.mpris.MediaPlayer2", "Raise")) {
+		result = _dbus_mpris_root_Raise (object, connection, message);
+	}
+	if (result == DBUS_HANDLER_RESULT_HANDLED) {
+		return result;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+void mpris_root_dbus_register_object (DBusConnection* connection, const char* path, void* object) {
+	if (!g_object_get_data (object, "dbus_object_path")) {
+		g_object_set_data (object, "dbus_object_path", g_strdup (path));
+		dbus_connection_register_object_path (connection, path, &_mpris_root_dbus_path_vtable, object);
+		g_object_weak_ref (object, _vala_dbus_unregister_object, connection);
+	}
+}
+
+
+static void mpris_root_base_init (MprisRootIface * iface) {
+	static gboolean initialized = FALSE;
+	if (!initialized) {
+		initialized = TRUE;
+		g_object_interface_install_property (iface, g_param_spec_boolean ("HasTracklist", "HasTracklist", "HasTracklist", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+		g_object_interface_install_property (iface, g_param_spec_boolean ("CanQuit", "CanQuit", "CanQuit", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+		g_object_interface_install_property (iface, g_param_spec_boolean ("CanRaise", "CanRaise", "CanRaise", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+		g_object_interface_install_property (iface, g_param_spec_string ("Identity", "Identity", "Identity", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+		g_object_interface_install_property (iface, g_param_spec_string ("DesktopEntry", "DesktopEntry", "DesktopEntry", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+		g_type_set_qdata (TYPE_MPRIS_ROOT, g_quark_from_static_string ("DBusObjectVTable"), (void*) (&_mpris_root_dbus_vtable));
+	}
+}
+
+
+GType mpris_root_get_type (void) {
+	static volatile gsize mpris_root_type_id__volatile = 0;
+	if (g_once_init_enter (&mpris_root_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (MprisRootIface), (GBaseInitFunc) mpris_root_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType mpris_root_type_id;
+		mpris_root_type_id = g_type_register_static (G_TYPE_INTERFACE, "MprisRoot", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (mpris_root_type_id, DBUS_TYPE_G_PROXY);
+		g_type_set_qdata (mpris_root_type_id, g_quark_from_string ("ValaDBusInterfaceProxyType"), &mpris_root_dbus_proxy_get_type);
+		g_once_init_leave (&mpris_root_type_id__volatile, mpris_root_type_id);
+	}
+	return mpris_root_type_id__volatile;
+}
+
+
+G_DEFINE_TYPE_EXTENDED (MprisRootDBusProxy, mpris_root_dbus_proxy, DBUS_TYPE_G_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MPRIS_ROOT, mpris_root_dbus_proxy_mpris_root__interface_init) );
+MprisRoot* mpris_root_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path) {
+	MprisRoot* self;
+	self = g_object_new (mpris_root_dbus_proxy_get_type (), "connection", connection, "name", name, "path", path, "interface", "org.mpris.MediaPlayer2", NULL);
+	return self;
+}
+
+
+static GObject* mpris_root_dbus_proxy_construct (GType gtype, guint n_properties, GObjectConstructParam* properties) {
+	GObject* self;
+	DBusGConnection *connection;
+	char* path;
+	char* filter;
+	self = G_OBJECT_CLASS (mpris_root_dbus_proxy_parent_class)->constructor (gtype, n_properties, properties);
+	g_object_get (self, "connection", &connection, NULL);
+	g_object_get (self, "path", &path, NULL);
+	dbus_connection_add_filter (dbus_g_connection_get_connection (connection), mpris_root_dbus_proxy_filter, self, NULL);
+	filter = g_strdup_printf ("type='signal',path='%s'", path);
+	dbus_bus_add_match (dbus_g_connection_get_connection (connection), filter, NULL);
+	dbus_g_connection_unref (connection);
+	g_free (path);
+	g_free (filter);
+	return self;
+}
+
+
+DBusHandlerResult mpris_root_dbus_proxy_filter (DBusConnection* connection, DBusMessage* message, void* user_data) {
+	if (dbus_message_has_path (message, dbus_g_proxy_get_path (user_data))) {
+	}
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+
+static void mpris_root_dbus_proxy_dispose (GObject* self) {
+	DBusGConnection *connection;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return;
+	}
+	((MprisRootDBusProxy*) self)->disposed = TRUE;
+	g_object_get (self, "connection", &connection, NULL);
+	dbus_connection_remove_filter (dbus_g_connection_get_connection (connection), mpris_root_dbus_proxy_filter, self);
+	G_OBJECT_CLASS (mpris_root_dbus_proxy_parent_class)->dispose (self);
+}
+
+
+static void mpris_root_dbus_proxy_class_init (MprisRootDBusProxyClass* klass) {
+	G_OBJECT_CLASS (klass)->constructor = mpris_root_dbus_proxy_construct;
+	G_OBJECT_CLASS (klass)->dispose = mpris_root_dbus_proxy_dispose;
+	G_OBJECT_CLASS (klass)->get_property = mpris_root_dbus_proxy_get_property;
+	G_OBJECT_CLASS (klass)->set_property = mpris_root_dbus_proxy_set_property;
+	g_object_class_override_property (G_OBJECT_CLASS (klass), MPRIS_ROOT_DBUS_PROXY_HAS_TRACKLIST, "HasTracklist");
+	g_object_class_override_property (G_OBJECT_CLASS (klass), MPRIS_ROOT_DBUS_PROXY_CAN_QUIT, "CanQuit");
+	g_object_class_override_property (G_OBJECT_CLASS (klass), MPRIS_ROOT_DBUS_PROXY_CAN_RAISE, "CanRaise");
+	g_object_class_override_property (G_OBJECT_CLASS (klass), MPRIS_ROOT_DBUS_PROXY_IDENTITY, "Identity");
+	g_object_class_override_property (G_OBJECT_CLASS (klass), MPRIS_ROOT_DBUS_PROXY_DESKTOP_ENTRY, "DesktopEntry");
+}
+
+
+static void mpris_root_dbus_proxy_init (MprisRootDBusProxy* self) {
+}
+
+
+static void mpris_root_dbus_proxy_Quit (MprisRoot* self, GError** error) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.mpris.MediaPlayer2", "Quit");
+	dbus_message_iter_init_append (_message, &_iter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		GQuark _edomain;
+		gint _ecode;
+		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
+			const char* _tmp20_;
+			_edomain = DBUS_GERROR;
+			_tmp20_ = _dbus_error.name + 27;
+			if (strcmp (_tmp20_, "Failed") == 0) {
+				_ecode = DBUS_GERROR_FAILED;
+			} else if (strcmp (_tmp20_, "NoMemory") == 0) {
+				_ecode = DBUS_GERROR_NO_MEMORY;
+			} else if (strcmp (_tmp20_, "ServiceUnknown") == 0) {
+				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
+			} else if (strcmp (_tmp20_, "NameHasNoOwner") == 0) {
+				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
+			} else if (strcmp (_tmp20_, "NoReply") == 0) {
+				_ecode = DBUS_GERROR_NO_REPLY;
+			} else if (strcmp (_tmp20_, "IOError") == 0) {
+				_ecode = DBUS_GERROR_IO_ERROR;
+			} else if (strcmp (_tmp20_, "BadAddress") == 0) {
+				_ecode = DBUS_GERROR_BAD_ADDRESS;
+			} else if (strcmp (_tmp20_, "NotSupported") == 0) {
+				_ecode = DBUS_GERROR_NOT_SUPPORTED;
+			} else if (strcmp (_tmp20_, "LimitsExceeded") == 0) {
+				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
+			} else if (strcmp (_tmp20_, "AccessDenied") == 0) {
+				_ecode = DBUS_GERROR_ACCESS_DENIED;
+			} else if (strcmp (_tmp20_, "AuthFailed") == 0) {
+				_ecode = DBUS_GERROR_AUTH_FAILED;
+			} else if (strcmp (_tmp20_, "NoServer") == 0) {
+				_ecode = DBUS_GERROR_NO_SERVER;
+			} else if (strcmp (_tmp20_, "Timeout") == 0) {
+				_ecode = DBUS_GERROR_TIMEOUT;
+			} else if (strcmp (_tmp20_, "NoNetwork") == 0) {
+				_ecode = DBUS_GERROR_NO_NETWORK;
+			} else if (strcmp (_tmp20_, "AddressInUse") == 0) {
+				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
+			} else if (strcmp (_tmp20_, "Disconnected") == 0) {
+				_ecode = DBUS_GERROR_DISCONNECTED;
+			} else if (strcmp (_tmp20_, "InvalidArgs") == 0) {
+				_ecode = DBUS_GERROR_INVALID_ARGS;
+			} else if (strcmp (_tmp20_, "FileNotFound") == 0) {
+				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
+			} else if (strcmp (_tmp20_, "FileExists") == 0) {
+				_ecode = DBUS_GERROR_FILE_EXISTS;
+			} else if (strcmp (_tmp20_, "UnknownMethod") == 0) {
+				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
+			} else if (strcmp (_tmp20_, "TimedOut") == 0) {
+				_ecode = DBUS_GERROR_TIMED_OUT;
+			} else if (strcmp (_tmp20_, "MatchRuleNotFound") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
+			} else if (strcmp (_tmp20_, "MatchRuleInvalid") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
+			} else if (strcmp (_tmp20_, "Spawn.ExecFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
+			} else if (strcmp (_tmp20_, "Spawn.ForkFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
+			} else if (strcmp (_tmp20_, "Spawn.ChildExited") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
+			} else if (strcmp (_tmp20_, "Spawn.ChildSignaled") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
+			} else if (strcmp (_tmp20_, "Spawn.Failed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FAILED;
+			} else if (strcmp (_tmp20_, "UnixProcessIdUnknown") == 0) {
+				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
+			} else if (strcmp (_tmp20_, "InvalidSignature") == 0) {
+				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
+			} else if (strcmp (_tmp20_, "InvalidFileContent") == 0) {
+				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
+			} else if (strcmp (_tmp20_, "SELinuxSecurityContextUnknown") == 0) {
+				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
+			} else if (strcmp (_tmp20_, "RemoteException") == 0) {
+				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
+			}
+		}
+		g_set_error (error, _edomain, _ecode, "%s", _dbus_error.message);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_SIGNATURE, "Invalid signature, expected \"%s\", got \"%s\"", "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static void mpris_root_dbus_proxy_Raise (MprisRoot* self, GError** error) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.mpris.MediaPlayer2", "Raise");
+	dbus_message_iter_init_append (_message, &_iter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		GQuark _edomain;
+		gint _ecode;
+		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
+			const char* _tmp21_;
+			_edomain = DBUS_GERROR;
+			_tmp21_ = _dbus_error.name + 27;
+			if (strcmp (_tmp21_, "Failed") == 0) {
+				_ecode = DBUS_GERROR_FAILED;
+			} else if (strcmp (_tmp21_, "NoMemory") == 0) {
+				_ecode = DBUS_GERROR_NO_MEMORY;
+			} else if (strcmp (_tmp21_, "ServiceUnknown") == 0) {
+				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
+			} else if (strcmp (_tmp21_, "NameHasNoOwner") == 0) {
+				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
+			} else if (strcmp (_tmp21_, "NoReply") == 0) {
+				_ecode = DBUS_GERROR_NO_REPLY;
+			} else if (strcmp (_tmp21_, "IOError") == 0) {
+				_ecode = DBUS_GERROR_IO_ERROR;
+			} else if (strcmp (_tmp21_, "BadAddress") == 0) {
+				_ecode = DBUS_GERROR_BAD_ADDRESS;
+			} else if (strcmp (_tmp21_, "NotSupported") == 0) {
+				_ecode = DBUS_GERROR_NOT_SUPPORTED;
+			} else if (strcmp (_tmp21_, "LimitsExceeded") == 0) {
+				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
+			} else if (strcmp (_tmp21_, "AccessDenied") == 0) {
+				_ecode = DBUS_GERROR_ACCESS_DENIED;
+			} else if (strcmp (_tmp21_, "AuthFailed") == 0) {
+				_ecode = DBUS_GERROR_AUTH_FAILED;
+			} else if (strcmp (_tmp21_, "NoServer") == 0) {
+				_ecode = DBUS_GERROR_NO_SERVER;
+			} else if (strcmp (_tmp21_, "Timeout") == 0) {
+				_ecode = DBUS_GERROR_TIMEOUT;
+			} else if (strcmp (_tmp21_, "NoNetwork") == 0) {
+				_ecode = DBUS_GERROR_NO_NETWORK;
+			} else if (strcmp (_tmp21_, "AddressInUse") == 0) {
+				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
+			} else if (strcmp (_tmp21_, "Disconnected") == 0) {
+				_ecode = DBUS_GERROR_DISCONNECTED;
+			} else if (strcmp (_tmp21_, "InvalidArgs") == 0) {
+				_ecode = DBUS_GERROR_INVALID_ARGS;
+			} else if (strcmp (_tmp21_, "FileNotFound") == 0) {
+				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
+			} else if (strcmp (_tmp21_, "FileExists") == 0) {
+				_ecode = DBUS_GERROR_FILE_EXISTS;
+			} else if (strcmp (_tmp21_, "UnknownMethod") == 0) {
+				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
+			} else if (strcmp (_tmp21_, "TimedOut") == 0) {
+				_ecode = DBUS_GERROR_TIMED_OUT;
+			} else if (strcmp (_tmp21_, "MatchRuleNotFound") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
+			} else if (strcmp (_tmp21_, "MatchRuleInvalid") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
+			} else if (strcmp (_tmp21_, "Spawn.ExecFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
+			} else if (strcmp (_tmp21_, "Spawn.ForkFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
+			} else if (strcmp (_tmp21_, "Spawn.ChildExited") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
+			} else if (strcmp (_tmp21_, "Spawn.ChildSignaled") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
+			} else if (strcmp (_tmp21_, "Spawn.Failed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FAILED;
+			} else if (strcmp (_tmp21_, "UnixProcessIdUnknown") == 0) {
+				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
+			} else if (strcmp (_tmp21_, "InvalidSignature") == 0) {
+				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
+			} else if (strcmp (_tmp21_, "InvalidFileContent") == 0) {
+				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
+			} else if (strcmp (_tmp21_, "SELinuxSecurityContextUnknown") == 0) {
+				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
+			} else if (strcmp (_tmp21_, "RemoteException") == 0) {
+				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
+			}
+		}
+		g_set_error (error, _edomain, _ecode, "%s", _dbus_error.message);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_SIGNATURE, "Invalid signature, expected \"%s\", got \"%s\"", "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static gboolean mpris_root_dbus_proxy_get_HasTracklist (MprisRoot* self) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp22_;
+	const char* _tmp23_;
+	gboolean _result;
+	dbus_bool_t _tmp24_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return FALSE;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp22_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp22_);
+	_tmp23_ = "HasTracklist";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp23_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return FALSE;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "v")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "v", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return FALSE;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_iter_recurse (&_iter, &_subiter);
+	if (strcmp (dbus_message_iter_get_signature (&_subiter), "b")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "b", dbus_message_iter_get_signature (&_subiter));
+		dbus_message_unref (_reply);
+		return FALSE;
+	}
+	dbus_message_iter_get_basic (&_subiter, &_tmp24_);
+	dbus_message_iter_next (&_subiter);
+	_result = _tmp24_;
+	dbus_message_unref (_reply);
+	return _result;
+}
+
+
+static void mpris_root_dbus_proxy_set_HasTracklist (MprisRoot* self, gboolean value) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp25_;
+	const char* _tmp26_;
+	dbus_bool_t _tmp27_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp25_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp25_);
+	_tmp26_ = "HasTracklist";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp26_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "b", &_subiter);
+	_tmp27_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp27_);
+	dbus_message_iter_close_container (&_iter, &_subiter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static gboolean mpris_root_dbus_proxy_get_CanQuit (MprisRoot* self) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp28_;
+	const char* _tmp29_;
+	gboolean _result;
+	dbus_bool_t _tmp30_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return FALSE;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp28_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp28_);
+	_tmp29_ = "CanQuit";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp29_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return FALSE;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "v")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "v", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return FALSE;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_iter_recurse (&_iter, &_subiter);
+	if (strcmp (dbus_message_iter_get_signature (&_subiter), "b")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "b", dbus_message_iter_get_signature (&_subiter));
+		dbus_message_unref (_reply);
+		return FALSE;
+	}
+	dbus_message_iter_get_basic (&_subiter, &_tmp30_);
+	dbus_message_iter_next (&_subiter);
+	_result = _tmp30_;
+	dbus_message_unref (_reply);
+	return _result;
+}
+
+
+static void mpris_root_dbus_proxy_set_CanQuit (MprisRoot* self, gboolean value) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp31_;
+	const char* _tmp32_;
+	dbus_bool_t _tmp33_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp31_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp31_);
+	_tmp32_ = "CanQuit";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp32_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "b", &_subiter);
+	_tmp33_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp33_);
+	dbus_message_iter_close_container (&_iter, &_subiter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static gboolean mpris_root_dbus_proxy_get_CanRaise (MprisRoot* self) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp34_;
+	const char* _tmp35_;
+	gboolean _result;
+	dbus_bool_t _tmp36_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return FALSE;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp34_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp34_);
+	_tmp35_ = "CanRaise";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp35_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return FALSE;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "v")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "v", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return FALSE;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_iter_recurse (&_iter, &_subiter);
+	if (strcmp (dbus_message_iter_get_signature (&_subiter), "b")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "b", dbus_message_iter_get_signature (&_subiter));
+		dbus_message_unref (_reply);
+		return FALSE;
+	}
+	dbus_message_iter_get_basic (&_subiter, &_tmp36_);
+	dbus_message_iter_next (&_subiter);
+	_result = _tmp36_;
+	dbus_message_unref (_reply);
+	return _result;
+}
+
+
+static void mpris_root_dbus_proxy_set_CanRaise (MprisRoot* self, gboolean value) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp37_;
+	const char* _tmp38_;
+	dbus_bool_t _tmp39_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp37_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp37_);
+	_tmp38_ = "CanRaise";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp38_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "b", &_subiter);
+	_tmp39_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_BOOLEAN, &_tmp39_);
+	dbus_message_iter_close_container (&_iter, &_subiter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static char* mpris_root_dbus_proxy_get_Identity (MprisRoot* self) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp40_;
+	const char* _tmp41_;
+	char* _result;
+	const char* _tmp42_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return NULL;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp40_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp40_);
+	_tmp41_ = "Identity";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp41_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return NULL;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "v")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "v", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return NULL;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_iter_recurse (&_iter, &_subiter);
+	if (strcmp (dbus_message_iter_get_signature (&_subiter), "s")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "s", dbus_message_iter_get_signature (&_subiter));
+		dbus_message_unref (_reply);
+		return NULL;
+	}
+	dbus_message_iter_get_basic (&_subiter, &_tmp42_);
+	dbus_message_iter_next (&_subiter);
+	_result = g_strdup (_tmp42_);
+	dbus_message_unref (_reply);
+	return _result;
+}
+
+
+static void mpris_root_dbus_proxy_set_Identity (MprisRoot* self, const char* value) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp43_;
+	const char* _tmp44_;
+	const char* _tmp45_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp43_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp43_);
+	_tmp44_ = "Identity";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp44_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "s", &_subiter);
+	_tmp45_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp45_);
+	dbus_message_iter_close_container (&_iter, &_subiter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static char* mpris_root_dbus_proxy_get_DesktopEntry (MprisRoot* self) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp46_;
+	const char* _tmp47_;
+	char* _result;
+	const char* _tmp48_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return NULL;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp46_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp46_);
+	_tmp47_ = "DesktopEntry";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp47_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return NULL;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "v")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "v", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return NULL;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_iter_recurse (&_iter, &_subiter);
+	if (strcmp (dbus_message_iter_get_signature (&_subiter), "s")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "s", dbus_message_iter_get_signature (&_subiter));
+		dbus_message_unref (_reply);
+		return NULL;
+	}
+	dbus_message_iter_get_basic (&_subiter, &_tmp48_);
+	dbus_message_iter_next (&_subiter);
+	_result = g_strdup (_tmp48_);
+	dbus_message_unref (_reply);
+	return _result;
+}
+
+
+static void mpris_root_dbus_proxy_set_DesktopEntry (MprisRoot* self, const char* value) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp49_;
+	const char* _tmp50_;
+	const char* _tmp51_;
+	if (((MprisRootDBusProxy*) self)->disposed) {
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp49_ = "org.mpris.MediaPlayer2";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp49_);
+	_tmp50_ = "DesktopEntry";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp50_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "s", &_subiter);
+	_tmp51_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp51_);
+	dbus_message_iter_close_container (&_iter, &_subiter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static void mpris_root_dbus_proxy_mpris_root__interface_init (MprisRootIface* iface) {
+	iface->Quit = mpris_root_dbus_proxy_Quit;
+	iface->Raise = mpris_root_dbus_proxy_Raise;
+	iface->get_HasTracklist = mpris_root_dbus_proxy_get_HasTracklist;
+	iface->set_HasTracklist = mpris_root_dbus_proxy_set_HasTracklist;
+	iface->get_CanQuit = mpris_root_dbus_proxy_get_CanQuit;
+	iface->set_CanQuit = mpris_root_dbus_proxy_set_CanQuit;
+	iface->get_CanRaise = mpris_root_dbus_proxy_get_CanRaise;
+	iface->set_CanRaise = mpris_root_dbus_proxy_set_CanRaise;
+	iface->get_Identity = mpris_root_dbus_proxy_get_Identity;
+	iface->set_Identity = mpris_root_dbus_proxy_set_Identity;
+	iface->get_DesktopEntry = mpris_root_dbus_proxy_get_DesktopEntry;
+	iface->set_DesktopEntry = mpris_root_dbus_proxy_set_DesktopEntry;
+}
+
+
+static void mpris_root_dbus_proxy_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+}
+
+
+static void mpris_root_dbus_proxy_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+}
+
+
+void mpris_player_SetPosition (MprisPlayer* self, const char* path, gint64 pos, GError** error) {
+	MPRIS_PLAYER_GET_INTERFACE (self)->SetPosition (self, path, pos, error);
+}
+
+
+void mpris_player_PlayPause (MprisPlayer* self, GError** error) {
+	MPRIS_PLAYER_GET_INTERFACE (self)->PlayPause (self, error);
+}
+
+
+void mpris_player_Pause (MprisPlayer* self, GError** error) {
+	MPRIS_PLAYER_GET_INTERFACE (self)->Pause (self, error);
+}
+
+
+void mpris_player_Next (MprisPlayer* self, GError** error) {
+	MPRIS_PLAYER_GET_INTERFACE (self)->Next (self, error);
+}
+
+
+void mpris_player_Previous (MprisPlayer* self, GError** error) {
+	MPRIS_PLAYER_GET_INTERFACE (self)->Previous (self, error);
+}
+
+
+GHashTable* mpris_player_get_Metadata (MprisPlayer* self) {
+	return MPRIS_PLAYER_GET_INTERFACE (self)->get_Metadata (self);
+}
+
+
+void mpris_player_set_Metadata (MprisPlayer* self, GHashTable* value) {
+	MPRIS_PLAYER_GET_INTERFACE (self)->set_Metadata (self, value);
+}
+
+
+gint32 mpris_player_get_Position (MprisPlayer* self) {
+	return MPRIS_PLAYER_GET_INTERFACE (self)->get_Position (self);
+}
+
+
+void mpris_player_set_Position (MprisPlayer* self, gint32 value) {
+	MPRIS_PLAYER_GET_INTERFACE (self)->set_Position (self, value);
+}
+
+
+char* mpris_player_get_PlaybackStatus (MprisPlayer* self) {
+	return MPRIS_PLAYER_GET_INTERFACE (self)->get_PlaybackStatus (self);
+}
+
+
+void mpris_player_set_PlaybackStatus (MprisPlayer* self, const char* value) {
+	MPRIS_PLAYER_GET_INTERFACE (self)->set_PlaybackStatus (self, value);
+}
+
+
+void _mpris_player_dbus_unregister (DBusConnection* connection, void* _user_data_) {
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_introspect (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter;
+	GString* xml_data;
+	char** children;
+	int i;
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	xml_data = g_string_new ("<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" \"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n");
+	g_string_append (xml_data, "<node>\n<interface name=\"org.freedesktop.DBus.Introspectable\">\n  <method name=\"Introspect\">\n    <arg name=\"data\" direction=\"out\" type=\"s\"/>\n  </method>\n</interface>\n<interface name=\"org.freedesktop.DBus.Properties\">\n  <method name=\"Get\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"propname\" direction=\"in\" type=\"s\"/>\n    <arg name=\"value\" direction=\"out\" type=\"v\"/>\n  </method>\n  <method name=\"Set\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"propname\" direction=\"in\" type=\"s\"/>\n    <arg name=\"value\" direction=\"in\" type=\"v\"/>\n  </method>\n  <method name=\"GetAll\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"props\" direction=\"out\" type=\"a{sv}\"/>\n  </method>\n</interface>\n<interface name=\"org.mpris.MediaPlayer2.Player\">\n  <method name=\"SetPosition\">\n    <arg name=\"path\" type=\"o\" direction=\"in\"/>\n    <arg name=\"pos\" type=\"x\" direction=\"in\"/>\n  </method>\n  <method name=\"PlayPause\">\n  </method>\n  <method name=\"Pause\">\n  </method>\n  <method name=\"Next\">\n  </method>\n  <method name=\"Previous\">\n  </method>\n  <property name=\"Metadata\" type=\"a{sv}\" access=\"readwrite\"/>\n  <property name=\"Position\" type=\"i\" access=\"readwrite\"/>\n  <property name=\"PlaybackStatus\" type=\"s\" access=\"readwrite\"/>\n  <signal name=\"Seeked\">\n    <arg name=\"new_position\" type=\"x\"/>\n  </signal>\n</interface>\n");
+	dbus_connection_list_registered (connection, g_object_get_data ((GObject *) self, "dbus_object_path"), &children);
+	for (i = 0; children[i]; i++) {
+		g_string_append_printf (xml_data, "<node name=\"%s\"/>\n", children[i]);
+	}
+	dbus_free_string_array (children);
+	g_string_append (xml_data, "</node>\n");
+	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &xml_data->str);
+	g_string_free (xml_data, TRUE);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_property_get (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter, reply_iter, subiter;
+	char* interface_name;
+	const char* _tmp52_;
+	char* property_name;
+	const char* _tmp53_;
+	if (strcmp (dbus_message_get_signature (message), "ss")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &reply_iter);
+	dbus_message_iter_get_basic (&iter, &_tmp52_);
+	dbus_message_iter_next (&iter);
+	interface_name = g_strdup (_tmp52_);
+	dbus_message_iter_get_basic (&iter, &_tmp53_);
+	dbus_message_iter_next (&iter);
+	property_name = g_strdup (_tmp53_);
+	if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "Metadata") == 0)) {
+		GHashTable* result;
+		DBusMessageIter _tmp54_, _tmp55_;
+		GHashTableIter _tmp56_;
+		gpointer _tmp57_, _tmp58_;
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "a{sv}", &subiter);
+		result = mpris_player_get_Metadata (self);
+		dbus_message_iter_open_container (&subiter, DBUS_TYPE_ARRAY, "{sv}", &_tmp54_);
+		g_hash_table_iter_init (&_tmp56_, result);
+		while (g_hash_table_iter_next (&_tmp56_, &_tmp57_, &_tmp58_)) {
+			char* _key;
+			GValue* _value;
+			const char* _tmp59_;
+			DBusMessageIter _tmp60_;
+			dbus_message_iter_open_container (&_tmp54_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp55_);
+			_key = (char*) _tmp57_;
+			_value = (GValue*) _tmp58_;
+			_tmp59_ = _key;
+			dbus_message_iter_append_basic (&_tmp55_, DBUS_TYPE_STRING, &_tmp59_);
+			if (G_VALUE_TYPE (_value) == G_TYPE_UCHAR) {
+				guint8 _tmp61_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "y", &_tmp60_);
+				_tmp61_ = g_value_get_uchar (_value);
+				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_BYTE, &_tmp61_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			} else if (G_VALUE_TYPE (_value) == G_TYPE_BOOLEAN) {
+				dbus_bool_t _tmp62_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "b", &_tmp60_);
+				_tmp62_ = g_value_get_boolean (_value);
+				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_BOOLEAN, &_tmp62_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			} else if (G_VALUE_TYPE (_value) == G_TYPE_INT) {
+				dbus_int32_t _tmp63_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "i", &_tmp60_);
+				_tmp63_ = g_value_get_int (_value);
+				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_INT32, &_tmp63_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT) {
+				dbus_uint32_t _tmp64_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "u", &_tmp60_);
+				_tmp64_ = g_value_get_uint (_value);
+				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_UINT32, &_tmp64_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			} else if (G_VALUE_TYPE (_value) == G_TYPE_INT64) {
+				dbus_int64_t _tmp65_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "x", &_tmp60_);
+				_tmp65_ = g_value_get_int64 (_value);
+				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_INT64, &_tmp65_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT64) {
+				dbus_uint64_t _tmp66_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "t", &_tmp60_);
+				_tmp66_ = g_value_get_uint64 (_value);
+				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_UINT64, &_tmp66_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			} else if (G_VALUE_TYPE (_value) == G_TYPE_DOUBLE) {
+				double _tmp67_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "d", &_tmp60_);
+				_tmp67_ = g_value_get_double (_value);
+				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_DOUBLE, &_tmp67_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			} else if (G_VALUE_TYPE (_value) == G_TYPE_STRING) {
+				const char* _tmp68_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "s", &_tmp60_);
+				_tmp68_ = g_value_get_string (_value);
+				dbus_message_iter_append_basic (&_tmp60_, DBUS_TYPE_STRING, &_tmp68_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			} else if (G_VALUE_TYPE (_value) == G_TYPE_STRV) {
+				const char** _tmp69_;
+				DBusMessageIter _tmp70_;
+				int _tmp71_;
+				dbus_message_iter_open_container (&_tmp55_, DBUS_TYPE_VARIANT, "as", &_tmp60_);
+				_tmp69_ = g_value_get_boxed (_value);
+				dbus_message_iter_open_container (&_tmp60_, DBUS_TYPE_ARRAY, "s", &_tmp70_);
+				for (_tmp71_ = 0; _tmp71_ < g_strv_length (g_value_get_boxed (_value)); _tmp71_++) {
+					const char* _tmp72_;
+					_tmp72_ = *_tmp69_;
+					dbus_message_iter_append_basic (&_tmp70_, DBUS_TYPE_STRING, &_tmp72_);
+					_tmp69_++;
+				}
+				dbus_message_iter_close_container (&_tmp60_, &_tmp70_);
+				dbus_message_iter_close_container (&_tmp55_, &_tmp60_);
+			}
+			dbus_message_iter_close_container (&_tmp54_, &_tmp55_);
+		}
+		dbus_message_iter_close_container (&subiter, &_tmp54_);
+		_g_hash_table_unref0 (result);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "Position") == 0)) {
+		gint32 result;
+		dbus_int32_t _tmp73_;
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "i", &subiter);
+		result = mpris_player_get_Position (self);
+		_tmp73_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_INT32, &_tmp73_);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "PlaybackStatus") == 0)) {
+		char* result;
+		const char* _tmp74_;
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_VARIANT, "s", &subiter);
+		result = mpris_player_get_PlaybackStatus (self);
+		_tmp74_ = result;
+		dbus_message_iter_append_basic (&subiter, DBUS_TYPE_STRING, &_tmp74_);
+		_g_free0 (result);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else {
+		dbus_message_unref (reply);
+		reply = NULL;
+	}
+	g_free (interface_name);
+	g_free (property_name);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_property_set (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter, subiter;
+	char* interface_name;
+	const char* _tmp75_;
+	char* property_name;
+	const char* _tmp76_;
+	if (strcmp (dbus_message_get_signature (message), "ssv")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_get_basic (&iter, &_tmp75_);
+	dbus_message_iter_next (&iter);
+	interface_name = g_strdup (_tmp75_);
+	dbus_message_iter_get_basic (&iter, &_tmp76_);
+	dbus_message_iter_next (&iter);
+	property_name = g_strdup (_tmp76_);
+	dbus_message_iter_recurse (&iter, &subiter);
+	if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "Metadata") == 0)) {
+		GHashTable* value;
+		GHashTable* _tmp77_;
+		DBusMessageIter _tmp78_;
+		DBusMessageIter _tmp79_;
+		_tmp77_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+		dbus_message_iter_recurse (&subiter, &_tmp78_);
+		while (dbus_message_iter_get_arg_type (&_tmp78_)) {
+			char* _key;
+			GValue* _value;
+			const char* _tmp80_;
+			GValue _tmp81_ = {0};
+			DBusMessageIter _tmp82_;
+			dbus_message_iter_recurse (&_tmp78_, &_tmp79_);
+			dbus_message_iter_get_basic (&_tmp79_, &_tmp80_);
+			dbus_message_iter_next (&_tmp79_);
+			_key = g_strdup (_tmp80_);
+			dbus_message_iter_recurse (&_tmp79_, &_tmp82_);
+			if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_BYTE) {
+				guint8 _tmp83_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp83_);
+				g_value_init (&_tmp81_, G_TYPE_UCHAR);
+				g_value_set_uchar (&_tmp81_, _tmp83_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_BOOLEAN) {
+				dbus_bool_t _tmp84_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp84_);
+				g_value_init (&_tmp81_, G_TYPE_BOOLEAN);
+				g_value_set_boolean (&_tmp81_, _tmp84_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_INT16) {
+				dbus_int16_t _tmp85_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp85_);
+				g_value_init (&_tmp81_, G_TYPE_INT);
+				g_value_set_int (&_tmp81_, _tmp85_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_UINT16) {
+				dbus_uint16_t _tmp86_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp86_);
+				g_value_init (&_tmp81_, G_TYPE_UINT);
+				g_value_set_uint (&_tmp81_, _tmp86_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_INT32) {
+				dbus_int32_t _tmp87_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp87_);
+				g_value_init (&_tmp81_, G_TYPE_INT);
+				g_value_set_int (&_tmp81_, _tmp87_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_UINT32) {
+				dbus_uint32_t _tmp88_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp88_);
+				g_value_init (&_tmp81_, G_TYPE_UINT);
+				g_value_set_uint (&_tmp81_, _tmp88_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_INT64) {
+				dbus_int64_t _tmp89_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp89_);
+				g_value_init (&_tmp81_, G_TYPE_INT64);
+				g_value_set_int64 (&_tmp81_, _tmp89_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_UINT64) {
+				dbus_uint64_t _tmp90_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp90_);
+				g_value_init (&_tmp81_, G_TYPE_UINT64);
+				g_value_set_uint64 (&_tmp81_, _tmp90_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_DOUBLE) {
+				double _tmp91_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp91_);
+				g_value_init (&_tmp81_, G_TYPE_DOUBLE);
+				g_value_set_double (&_tmp81_, _tmp91_);
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_STRING) {
+				const char* _tmp92_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp92_);
+				g_value_init (&_tmp81_, G_TYPE_STRING);
+				g_value_take_string (&_tmp81_, g_strdup (_tmp92_));
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_OBJECT_PATH) {
+				const char* _tmp93_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp93_);
+				g_value_init (&_tmp81_, G_TYPE_STRING);
+				g_value_take_string (&_tmp81_, g_strdup (_tmp93_));
+			} else if (dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_SIGNATURE) {
+				const char* _tmp94_;
+				dbus_message_iter_get_basic (&_tmp82_, &_tmp94_);
+				g_value_init (&_tmp81_, G_TYPE_STRING);
+				g_value_take_string (&_tmp81_, g_strdup (_tmp94_));
+			} else if ((dbus_message_iter_get_arg_type (&_tmp82_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp82_) == DBUS_TYPE_STRING)) {
+				const char** _tmp95_;
+				int _tmp95__length;
+				int _tmp95__size;
+				int _tmp95__length1;
+				DBusMessageIter _tmp96_;
+				_tmp95_ = g_new (const char*, 5);
+				_tmp95__length = 0;
+				_tmp95__size = 4;
+				_tmp95__length1 = 0;
+				dbus_message_iter_recurse (&_tmp82_, &_tmp96_);
+				for (; dbus_message_iter_get_arg_type (&_tmp96_); _tmp95__length1++) {
+					const char* _tmp97_;
+					if (_tmp95__size == _tmp95__length) {
+						_tmp95__size = 2 * _tmp95__size;
+						_tmp95_ = g_renew (const char*, _tmp95_, _tmp95__size + 1);
+					}
+					dbus_message_iter_get_basic (&_tmp96_, &_tmp97_);
+					dbus_message_iter_next (&_tmp96_);
+					_tmp95_[_tmp95__length++] = g_strdup (_tmp97_);
+				}
+				_tmp95_[_tmp95__length] = NULL;
+				g_value_init (&_tmp81_, G_TYPE_STRV);
+				g_value_take_boxed (&_tmp81_, _tmp95_);
+			}
+			dbus_message_iter_next (&_tmp79_);
+			_value = g_memdup (&_tmp81_, sizeof (GValue));
+			g_hash_table_insert (_tmp77_, _key, _value);
+			dbus_message_iter_next (&_tmp78_);
+		}
+		dbus_message_iter_next (&subiter);
+		value = _tmp77_;
+		mpris_player_set_Metadata (self, value);
+		_g_hash_table_unref0 (value);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "Position") == 0)) {
+		gint32 value;
+		dbus_int32_t _tmp98_;
+		dbus_message_iter_get_basic (&subiter, &_tmp98_);
+		dbus_message_iter_next (&subiter);
+		value = _tmp98_;
+		mpris_player_set_Position (self, value);
+	} else if ((strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) && (strcmp (property_name, "PlaybackStatus") == 0)) {
+		char* value;
+		const char* _tmp99_;
+		dbus_message_iter_get_basic (&subiter, &_tmp99_);
+		dbus_message_iter_next (&subiter);
+		value = g_strdup (_tmp99_);
+		mpris_player_set_PlaybackStatus (self, value);
+		_g_free0 (value);
+	} else {
+		dbus_message_unref (reply);
+		reply = NULL;
+	}
+	g_free (interface_name);
+	g_free (property_name);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_property_get_all (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter, reply_iter, subiter, entry_iter, value_iter;
+	char* interface_name;
+	const char* _tmp100_;
+	const char* property_name;
+	if (strcmp (dbus_message_get_signature (message), "s")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &reply_iter);
+	dbus_message_iter_get_basic (&iter, &_tmp100_);
+	dbus_message_iter_next (&iter);
+	interface_name = g_strdup (_tmp100_);
+	if (strcmp (interface_name, "org.mpris.MediaPlayer2.Player") == 0) {
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_ARRAY, "{sv}", &subiter);
+		{
+			GHashTable* result;
+			DBusMessageIter _tmp101_, _tmp102_;
+			GHashTableIter _tmp103_;
+			gpointer _tmp104_, _tmp105_;
+			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
+			property_name = "Metadata";
+			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
+			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "a{sv}", &value_iter);
+			result = mpris_player_get_Metadata (self);
+			dbus_message_iter_open_container (&value_iter, DBUS_TYPE_ARRAY, "{sv}", &_tmp101_);
+			g_hash_table_iter_init (&_tmp103_, result);
+			while (g_hash_table_iter_next (&_tmp103_, &_tmp104_, &_tmp105_)) {
+				char* _key;
+				GValue* _value;
+				const char* _tmp106_;
+				DBusMessageIter _tmp107_;
+				dbus_message_iter_open_container (&_tmp101_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp102_);
+				_key = (char*) _tmp104_;
+				_value = (GValue*) _tmp105_;
+				_tmp106_ = _key;
+				dbus_message_iter_append_basic (&_tmp102_, DBUS_TYPE_STRING, &_tmp106_);
+				if (G_VALUE_TYPE (_value) == G_TYPE_UCHAR) {
+					guint8 _tmp108_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "y", &_tmp107_);
+					_tmp108_ = g_value_get_uchar (_value);
+					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_BYTE, &_tmp108_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				} else if (G_VALUE_TYPE (_value) == G_TYPE_BOOLEAN) {
+					dbus_bool_t _tmp109_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "b", &_tmp107_);
+					_tmp109_ = g_value_get_boolean (_value);
+					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_BOOLEAN, &_tmp109_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				} else if (G_VALUE_TYPE (_value) == G_TYPE_INT) {
+					dbus_int32_t _tmp110_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "i", &_tmp107_);
+					_tmp110_ = g_value_get_int (_value);
+					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_INT32, &_tmp110_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT) {
+					dbus_uint32_t _tmp111_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "u", &_tmp107_);
+					_tmp111_ = g_value_get_uint (_value);
+					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_UINT32, &_tmp111_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				} else if (G_VALUE_TYPE (_value) == G_TYPE_INT64) {
+					dbus_int64_t _tmp112_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "x", &_tmp107_);
+					_tmp112_ = g_value_get_int64 (_value);
+					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_INT64, &_tmp112_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT64) {
+					dbus_uint64_t _tmp113_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "t", &_tmp107_);
+					_tmp113_ = g_value_get_uint64 (_value);
+					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_UINT64, &_tmp113_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				} else if (G_VALUE_TYPE (_value) == G_TYPE_DOUBLE) {
+					double _tmp114_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "d", &_tmp107_);
+					_tmp114_ = g_value_get_double (_value);
+					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_DOUBLE, &_tmp114_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				} else if (G_VALUE_TYPE (_value) == G_TYPE_STRING) {
+					const char* _tmp115_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "s", &_tmp107_);
+					_tmp115_ = g_value_get_string (_value);
+					dbus_message_iter_append_basic (&_tmp107_, DBUS_TYPE_STRING, &_tmp115_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				} else if (G_VALUE_TYPE (_value) == G_TYPE_STRV) {
+					const char** _tmp116_;
+					DBusMessageIter _tmp117_;
+					int _tmp118_;
+					dbus_message_iter_open_container (&_tmp102_, DBUS_TYPE_VARIANT, "as", &_tmp107_);
+					_tmp116_ = g_value_get_boxed (_value);
+					dbus_message_iter_open_container (&_tmp107_, DBUS_TYPE_ARRAY, "s", &_tmp117_);
+					for (_tmp118_ = 0; _tmp118_ < g_strv_length (g_value_get_boxed (_value)); _tmp118_++) {
+						const char* _tmp119_;
+						_tmp119_ = *_tmp116_;
+						dbus_message_iter_append_basic (&_tmp117_, DBUS_TYPE_STRING, &_tmp119_);
+						_tmp116_++;
+					}
+					dbus_message_iter_close_container (&_tmp107_, &_tmp117_);
+					dbus_message_iter_close_container (&_tmp102_, &_tmp107_);
+				}
+				dbus_message_iter_close_container (&_tmp101_, &_tmp102_);
+			}
+			dbus_message_iter_close_container (&value_iter, &_tmp101_);
+			_g_hash_table_unref0 (result);
+			dbus_message_iter_close_container (&entry_iter, &value_iter);
+			dbus_message_iter_close_container (&subiter, &entry_iter);
+		}
+		{
+			gint32 result;
+			dbus_int32_t _tmp120_;
+			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
+			property_name = "Position";
+			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
+			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "i", &value_iter);
+			result = mpris_player_get_Position (self);
+			_tmp120_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_INT32, &_tmp120_);
+			dbus_message_iter_close_container (&entry_iter, &value_iter);
+			dbus_message_iter_close_container (&subiter, &entry_iter);
+		}
+		{
+			char* result;
+			const char* _tmp121_;
+			dbus_message_iter_open_container (&subiter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
+			property_name = "PlaybackStatus";
+			dbus_message_iter_append_basic (&entry_iter, DBUS_TYPE_STRING, &property_name);
+			dbus_message_iter_open_container (&entry_iter, DBUS_TYPE_VARIANT, "s", &value_iter);
+			result = mpris_player_get_PlaybackStatus (self);
+			_tmp121_ = result;
+			dbus_message_iter_append_basic (&value_iter, DBUS_TYPE_STRING, &_tmp121_);
+			_g_free0 (result);
+			dbus_message_iter_close_container (&entry_iter, &value_iter);
+			dbus_message_iter_close_container (&subiter, &entry_iter);
+		}
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else {
+		dbus_message_unref (reply);
+		reply = NULL;
+	}
+	g_free (interface_name);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_SetPosition (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	GError* error;
+	char* path = NULL;
+	const char* _tmp122_;
+	gint64 pos = 0LL;
+	dbus_int64_t _tmp123_;
+	DBusMessage* reply;
+	error = NULL;
+	if (strcmp (dbus_message_get_signature (message), "ox")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	dbus_message_iter_get_basic (&iter, &_tmp122_);
+	dbus_message_iter_next (&iter);
+	path = g_strdup (_tmp122_);
+	dbus_message_iter_get_basic (&iter, &_tmp123_);
+	dbus_message_iter_next (&iter);
+	pos = _tmp123_;
+	mpris_player_SetPosition (self, path, pos, &error);
+	if (error) {
+		if (error->domain == DBUS_GERROR) {
+			switch (error->code) {
+				case DBUS_GERROR_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Failed", error->message);
+				break;
+				case DBUS_GERROR_NO_MEMORY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoMemory", error->message);
+				break;
+				case DBUS_GERROR_SERVICE_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.ServiceUnknown", error->message);
+				break;
+				case DBUS_GERROR_NAME_HAS_NO_OWNER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NameHasNoOwner", error->message);
+				break;
+				case DBUS_GERROR_NO_REPLY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoReply", error->message);
+				break;
+				case DBUS_GERROR_IO_ERROR:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.IOError", error->message);
+				break;
+				case DBUS_GERROR_BAD_ADDRESS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.BadAddress", error->message);
+				break;
+				case DBUS_GERROR_NOT_SUPPORTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NotSupported", error->message);
+				break;
+				case DBUS_GERROR_LIMITS_EXCEEDED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.LimitsExceeded", error->message);
+				break;
+				case DBUS_GERROR_ACCESS_DENIED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AccessDenied", error->message);
+				break;
+				case DBUS_GERROR_AUTH_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AuthFailed", error->message);
+				break;
+				case DBUS_GERROR_NO_SERVER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoServer", error->message);
+				break;
+				case DBUS_GERROR_TIMEOUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Timeout", error->message);
+				break;
+				case DBUS_GERROR_NO_NETWORK:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoNetwork", error->message);
+				break;
+				case DBUS_GERROR_ADDRESS_IN_USE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AddressInUse", error->message);
+				break;
+				case DBUS_GERROR_DISCONNECTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Disconnected", error->message);
+				break;
+				case DBUS_GERROR_INVALID_ARGS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidArgs", error->message);
+				break;
+				case DBUS_GERROR_FILE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileNotFound", error->message);
+				break;
+				case DBUS_GERROR_FILE_EXISTS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileExists", error->message);
+				break;
+				case DBUS_GERROR_UNKNOWN_METHOD:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnknownMethod", error->message);
+				break;
+				case DBUS_GERROR_TIMED_OUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.TimedOut", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleNotFound", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_INVALID:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleInvalid", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_EXEC_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ExecFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FORK_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ForkFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_EXITED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildExited", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_SIGNALED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildSignaled", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.Failed", error->message);
+				break;
+				case DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnixProcessIdUnknown", error->message);
+				break;
+				case DBUS_GERROR_INVALID_SIGNATURE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidSignature", error->message);
+				break;
+				case DBUS_GERROR_INVALID_FILE_CONTENT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidFileContent", error->message);
+				break;
+				case DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", error->message);
+				break;
+				case DBUS_GERROR_REMOTE_EXCEPTION:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.RemoteException", error->message);
+				break;
+			}
+		}
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	}
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	_g_free0 (path);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_PlayPause (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	GError* error;
+	DBusMessage* reply;
+	error = NULL;
+	if (strcmp (dbus_message_get_signature (message), "")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	mpris_player_PlayPause (self, &error);
+	if (error) {
+		if (error->domain == DBUS_GERROR) {
+			switch (error->code) {
+				case DBUS_GERROR_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Failed", error->message);
+				break;
+				case DBUS_GERROR_NO_MEMORY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoMemory", error->message);
+				break;
+				case DBUS_GERROR_SERVICE_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.ServiceUnknown", error->message);
+				break;
+				case DBUS_GERROR_NAME_HAS_NO_OWNER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NameHasNoOwner", error->message);
+				break;
+				case DBUS_GERROR_NO_REPLY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoReply", error->message);
+				break;
+				case DBUS_GERROR_IO_ERROR:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.IOError", error->message);
+				break;
+				case DBUS_GERROR_BAD_ADDRESS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.BadAddress", error->message);
+				break;
+				case DBUS_GERROR_NOT_SUPPORTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NotSupported", error->message);
+				break;
+				case DBUS_GERROR_LIMITS_EXCEEDED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.LimitsExceeded", error->message);
+				break;
+				case DBUS_GERROR_ACCESS_DENIED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AccessDenied", error->message);
+				break;
+				case DBUS_GERROR_AUTH_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AuthFailed", error->message);
+				break;
+				case DBUS_GERROR_NO_SERVER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoServer", error->message);
+				break;
+				case DBUS_GERROR_TIMEOUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Timeout", error->message);
+				break;
+				case DBUS_GERROR_NO_NETWORK:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoNetwork", error->message);
+				break;
+				case DBUS_GERROR_ADDRESS_IN_USE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AddressInUse", error->message);
+				break;
+				case DBUS_GERROR_DISCONNECTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Disconnected", error->message);
+				break;
+				case DBUS_GERROR_INVALID_ARGS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidArgs", error->message);
+				break;
+				case DBUS_GERROR_FILE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileNotFound", error->message);
+				break;
+				case DBUS_GERROR_FILE_EXISTS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileExists", error->message);
+				break;
+				case DBUS_GERROR_UNKNOWN_METHOD:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnknownMethod", error->message);
+				break;
+				case DBUS_GERROR_TIMED_OUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.TimedOut", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleNotFound", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_INVALID:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleInvalid", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_EXEC_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ExecFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FORK_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ForkFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_EXITED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildExited", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_SIGNALED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildSignaled", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.Failed", error->message);
+				break;
+				case DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnixProcessIdUnknown", error->message);
+				break;
+				case DBUS_GERROR_INVALID_SIGNATURE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidSignature", error->message);
+				break;
+				case DBUS_GERROR_INVALID_FILE_CONTENT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidFileContent", error->message);
+				break;
+				case DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", error->message);
+				break;
+				case DBUS_GERROR_REMOTE_EXCEPTION:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.RemoteException", error->message);
+				break;
+			}
+		}
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	}
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_Pause (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	GError* error;
+	DBusMessage* reply;
+	error = NULL;
+	if (strcmp (dbus_message_get_signature (message), "")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	mpris_player_Pause (self, &error);
+	if (error) {
+		if (error->domain == DBUS_GERROR) {
+			switch (error->code) {
+				case DBUS_GERROR_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Failed", error->message);
+				break;
+				case DBUS_GERROR_NO_MEMORY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoMemory", error->message);
+				break;
+				case DBUS_GERROR_SERVICE_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.ServiceUnknown", error->message);
+				break;
+				case DBUS_GERROR_NAME_HAS_NO_OWNER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NameHasNoOwner", error->message);
+				break;
+				case DBUS_GERROR_NO_REPLY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoReply", error->message);
+				break;
+				case DBUS_GERROR_IO_ERROR:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.IOError", error->message);
+				break;
+				case DBUS_GERROR_BAD_ADDRESS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.BadAddress", error->message);
+				break;
+				case DBUS_GERROR_NOT_SUPPORTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NotSupported", error->message);
+				break;
+				case DBUS_GERROR_LIMITS_EXCEEDED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.LimitsExceeded", error->message);
+				break;
+				case DBUS_GERROR_ACCESS_DENIED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AccessDenied", error->message);
+				break;
+				case DBUS_GERROR_AUTH_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AuthFailed", error->message);
+				break;
+				case DBUS_GERROR_NO_SERVER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoServer", error->message);
+				break;
+				case DBUS_GERROR_TIMEOUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Timeout", error->message);
+				break;
+				case DBUS_GERROR_NO_NETWORK:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoNetwork", error->message);
+				break;
+				case DBUS_GERROR_ADDRESS_IN_USE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AddressInUse", error->message);
+				break;
+				case DBUS_GERROR_DISCONNECTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Disconnected", error->message);
+				break;
+				case DBUS_GERROR_INVALID_ARGS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidArgs", error->message);
+				break;
+				case DBUS_GERROR_FILE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileNotFound", error->message);
+				break;
+				case DBUS_GERROR_FILE_EXISTS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileExists", error->message);
+				break;
+				case DBUS_GERROR_UNKNOWN_METHOD:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnknownMethod", error->message);
+				break;
+				case DBUS_GERROR_TIMED_OUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.TimedOut", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleNotFound", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_INVALID:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleInvalid", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_EXEC_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ExecFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FORK_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ForkFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_EXITED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildExited", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_SIGNALED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildSignaled", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.Failed", error->message);
+				break;
+				case DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnixProcessIdUnknown", error->message);
+				break;
+				case DBUS_GERROR_INVALID_SIGNATURE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidSignature", error->message);
+				break;
+				case DBUS_GERROR_INVALID_FILE_CONTENT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidFileContent", error->message);
+				break;
+				case DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", error->message);
+				break;
+				case DBUS_GERROR_REMOTE_EXCEPTION:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.RemoteException", error->message);
+				break;
+			}
+		}
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	}
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_Next (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	GError* error;
+	DBusMessage* reply;
+	error = NULL;
+	if (strcmp (dbus_message_get_signature (message), "")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	mpris_player_Next (self, &error);
+	if (error) {
+		if (error->domain == DBUS_GERROR) {
+			switch (error->code) {
+				case DBUS_GERROR_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Failed", error->message);
+				break;
+				case DBUS_GERROR_NO_MEMORY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoMemory", error->message);
+				break;
+				case DBUS_GERROR_SERVICE_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.ServiceUnknown", error->message);
+				break;
+				case DBUS_GERROR_NAME_HAS_NO_OWNER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NameHasNoOwner", error->message);
+				break;
+				case DBUS_GERROR_NO_REPLY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoReply", error->message);
+				break;
+				case DBUS_GERROR_IO_ERROR:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.IOError", error->message);
+				break;
+				case DBUS_GERROR_BAD_ADDRESS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.BadAddress", error->message);
+				break;
+				case DBUS_GERROR_NOT_SUPPORTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NotSupported", error->message);
+				break;
+				case DBUS_GERROR_LIMITS_EXCEEDED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.LimitsExceeded", error->message);
+				break;
+				case DBUS_GERROR_ACCESS_DENIED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AccessDenied", error->message);
+				break;
+				case DBUS_GERROR_AUTH_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AuthFailed", error->message);
+				break;
+				case DBUS_GERROR_NO_SERVER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoServer", error->message);
+				break;
+				case DBUS_GERROR_TIMEOUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Timeout", error->message);
+				break;
+				case DBUS_GERROR_NO_NETWORK:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoNetwork", error->message);
+				break;
+				case DBUS_GERROR_ADDRESS_IN_USE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AddressInUse", error->message);
+				break;
+				case DBUS_GERROR_DISCONNECTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Disconnected", error->message);
+				break;
+				case DBUS_GERROR_INVALID_ARGS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidArgs", error->message);
+				break;
+				case DBUS_GERROR_FILE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileNotFound", error->message);
+				break;
+				case DBUS_GERROR_FILE_EXISTS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileExists", error->message);
+				break;
+				case DBUS_GERROR_UNKNOWN_METHOD:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnknownMethod", error->message);
+				break;
+				case DBUS_GERROR_TIMED_OUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.TimedOut", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleNotFound", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_INVALID:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleInvalid", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_EXEC_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ExecFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FORK_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ForkFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_EXITED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildExited", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_SIGNALED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildSignaled", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.Failed", error->message);
+				break;
+				case DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnixProcessIdUnknown", error->message);
+				break;
+				case DBUS_GERROR_INVALID_SIGNATURE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidSignature", error->message);
+				break;
+				case DBUS_GERROR_INVALID_FILE_CONTENT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidFileContent", error->message);
+				break;
+				case DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", error->message);
+				break;
+				case DBUS_GERROR_REMOTE_EXCEPTION:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.RemoteException", error->message);
+				break;
+			}
+		}
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	}
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_mpris_player_Previous (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	GError* error;
+	DBusMessage* reply;
+	error = NULL;
+	if (strcmp (dbus_message_get_signature (message), "")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	mpris_player_Previous (self, &error);
+	if (error) {
+		if (error->domain == DBUS_GERROR) {
+			switch (error->code) {
+				case DBUS_GERROR_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Failed", error->message);
+				break;
+				case DBUS_GERROR_NO_MEMORY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoMemory", error->message);
+				break;
+				case DBUS_GERROR_SERVICE_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.ServiceUnknown", error->message);
+				break;
+				case DBUS_GERROR_NAME_HAS_NO_OWNER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NameHasNoOwner", error->message);
+				break;
+				case DBUS_GERROR_NO_REPLY:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoReply", error->message);
+				break;
+				case DBUS_GERROR_IO_ERROR:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.IOError", error->message);
+				break;
+				case DBUS_GERROR_BAD_ADDRESS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.BadAddress", error->message);
+				break;
+				case DBUS_GERROR_NOT_SUPPORTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NotSupported", error->message);
+				break;
+				case DBUS_GERROR_LIMITS_EXCEEDED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.LimitsExceeded", error->message);
+				break;
+				case DBUS_GERROR_ACCESS_DENIED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AccessDenied", error->message);
+				break;
+				case DBUS_GERROR_AUTH_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AuthFailed", error->message);
+				break;
+				case DBUS_GERROR_NO_SERVER:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoServer", error->message);
+				break;
+				case DBUS_GERROR_TIMEOUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Timeout", error->message);
+				break;
+				case DBUS_GERROR_NO_NETWORK:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.NoNetwork", error->message);
+				break;
+				case DBUS_GERROR_ADDRESS_IN_USE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.AddressInUse", error->message);
+				break;
+				case DBUS_GERROR_DISCONNECTED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Disconnected", error->message);
+				break;
+				case DBUS_GERROR_INVALID_ARGS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidArgs", error->message);
+				break;
+				case DBUS_GERROR_FILE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileNotFound", error->message);
+				break;
+				case DBUS_GERROR_FILE_EXISTS:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.FileExists", error->message);
+				break;
+				case DBUS_GERROR_UNKNOWN_METHOD:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnknownMethod", error->message);
+				break;
+				case DBUS_GERROR_TIMED_OUT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.TimedOut", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_NOT_FOUND:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleNotFound", error->message);
+				break;
+				case DBUS_GERROR_MATCH_RULE_INVALID:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.MatchRuleInvalid", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_EXEC_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ExecFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FORK_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ForkFailed", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_EXITED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildExited", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_CHILD_SIGNALED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.ChildSignaled", error->message);
+				break;
+				case DBUS_GERROR_SPAWN_FAILED:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.Spawn.Failed", error->message);
+				break;
+				case DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.UnixProcessIdUnknown", error->message);
+				break;
+				case DBUS_GERROR_INVALID_SIGNATURE:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidSignature", error->message);
+				break;
+				case DBUS_GERROR_INVALID_FILE_CONTENT:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.InvalidFileContent", error->message);
+				break;
+				case DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", error->message);
+				break;
+				case DBUS_GERROR_REMOTE_EXCEPTION:
+				reply = dbus_message_new_error (message, "org.freedesktop.DBus.Error.RemoteException", error->message);
+				break;
+			}
+		}
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	}
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+DBusHandlerResult mpris_player_dbus_message (DBusConnection* connection, DBusMessage* message, void* object) {
+	DBusHandlerResult result;
+	result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) {
+		result = _dbus_mpris_player_introspect (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Properties", "Get")) {
+		result = _dbus_mpris_player_property_get (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Properties", "Set")) {
+		result = _dbus_mpris_player_property_set (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Properties", "GetAll")) {
+		result = _dbus_mpris_player_property_get_all (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.mpris.MediaPlayer2.Player", "SetPosition")) {
+		result = _dbus_mpris_player_SetPosition (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.mpris.MediaPlayer2.Player", "PlayPause")) {
+		result = _dbus_mpris_player_PlayPause (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.mpris.MediaPlayer2.Player", "Pause")) {
+		result = _dbus_mpris_player_Pause (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.mpris.MediaPlayer2.Player", "Next")) {
+		result = _dbus_mpris_player_Next (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.mpris.MediaPlayer2.Player", "Previous")) {
+		result = _dbus_mpris_player_Previous (object, connection, message);
+	}
+	if (result == DBUS_HANDLER_RESULT_HANDLED) {
+		return result;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static void _dbus_mpris_player_seeked (GObject* _sender, gint64 new_position, DBusConnection* _connection) {
+	const char * _path;
+	DBusMessage *_message;
+	DBusMessageIter _iter;
+	dbus_int64_t _tmp124_;
+	_path = g_object_get_data (_sender, "dbus_object_path");
+	_message = dbus_message_new_signal (_path, "org.mpris.MediaPlayer2.Player", "Seeked");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp124_ = new_position;
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_INT64, &_tmp124_);
+	dbus_connection_send (_connection, _message, NULL);
+	dbus_message_unref (_message);
+}
+
+
+void mpris_player_dbus_register_object (DBusConnection* connection, const char* path, void* object) {
+	if (!g_object_get_data (object, "dbus_object_path")) {
+		g_object_set_data (object, "dbus_object_path", g_strdup (path));
+		dbus_connection_register_object_path (connection, path, &_mpris_player_dbus_path_vtable, object);
+		g_object_weak_ref (object, _vala_dbus_unregister_object, connection);
+	}
+	g_signal_connect (object, "seeked", (GCallback) _dbus_mpris_player_seeked, connection);
+}
+
+
+static void mpris_player_base_init (MprisPlayerIface * iface) {
+	static gboolean initialized = FALSE;
+	if (!initialized) {
+		initialized = TRUE;
+		g_object_interface_install_property (iface, g_param_spec_boxed ("Metadata", "Metadata", "Metadata", G_TYPE_HASH_TABLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+		g_object_interface_install_property (iface, g_param_spec_int ("Position", "Position", "Position", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+		g_object_interface_install_property (iface, g_param_spec_string ("PlaybackStatus", "PlaybackStatus", "PlaybackStatus", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+		g_signal_new ("seeked", TYPE_MPRIS_PLAYER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT64, G_TYPE_NONE, 1, G_TYPE_INT64);
+		g_type_set_qdata (TYPE_MPRIS_PLAYER, g_quark_from_static_string ("DBusObjectVTable"), (void*) (&_mpris_player_dbus_vtable));
+	}
+}
+
+
+GType mpris_player_get_type (void) {
+	static volatile gsize mpris_player_type_id__volatile = 0;
+	if (g_once_init_enter (&mpris_player_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (MprisPlayerIface), (GBaseInitFunc) mpris_player_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType mpris_player_type_id;
+		mpris_player_type_id = g_type_register_static (G_TYPE_INTERFACE, "MprisPlayer", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (mpris_player_type_id, DBUS_TYPE_G_PROXY);
+		g_type_set_qdata (mpris_player_type_id, g_quark_from_string ("ValaDBusInterfaceProxyType"), &mpris_player_dbus_proxy_get_type);
+		g_once_init_leave (&mpris_player_type_id__volatile, mpris_player_type_id);
+	}
+	return mpris_player_type_id__volatile;
+}
+
+
+G_DEFINE_TYPE_EXTENDED (MprisPlayerDBusProxy, mpris_player_dbus_proxy, DBUS_TYPE_G_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MPRIS_PLAYER, mpris_player_dbus_proxy_mpris_player__interface_init) );
+MprisPlayer* mpris_player_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path) {
+	MprisPlayer* self;
+	self = g_object_new (mpris_player_dbus_proxy_get_type (), "connection", connection, "name", name, "path", path, "interface", "org.mpris.MediaPlayer2.Player", NULL);
+	return self;
+}
+
+
+static GObject* mpris_player_dbus_proxy_construct (GType gtype, guint n_properties, GObjectConstructParam* properties) {
+	GObject* self;
+	DBusGConnection *connection;
+	char* path;
+	char* filter;
+	self = G_OBJECT_CLASS (mpris_player_dbus_proxy_parent_class)->constructor (gtype, n_properties, properties);
+	g_object_get (self, "connection", &connection, NULL);
+	g_object_get (self, "path", &path, NULL);
+	dbus_connection_add_filter (dbus_g_connection_get_connection (connection), mpris_player_dbus_proxy_filter, self, NULL);
+	filter = g_strdup_printf ("type='signal',path='%s'", path);
+	dbus_bus_add_match (dbus_g_connection_get_connection (connection), filter, NULL);
+	dbus_g_connection_unref (connection);
+	g_free (path);
+	g_free (filter);
+	return self;
+}
+
+
+static void _dbus_handle_mpris_player_seeked (MprisPlayer* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	gint64 new_position = 0LL;
+	dbus_int64_t _tmp125_;
+	DBusMessage* reply;
+	if (strcmp (dbus_message_get_signature (message), "x")) {
+		return;
+	}
+	dbus_message_iter_init (message, &iter);
+	dbus_message_iter_get_basic (&iter, &_tmp125_);
+	dbus_message_iter_next (&iter);
+	new_position = _tmp125_;
+	g_signal_emit_by_name (self, "seeked", new_position);
+}
+
+
+DBusHandlerResult mpris_player_dbus_proxy_filter (DBusConnection* connection, DBusMessage* message, void* user_data) {
+	if (dbus_message_has_path (message, dbus_g_proxy_get_path (user_data))) {
+		if (dbus_message_is_signal (message, "org.mpris.MediaPlayer2.Player", "Seeked")) {
+			_dbus_handle_mpris_player_seeked (user_data, connection, message);
+		}
+	}
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+
+static void mpris_player_dbus_proxy_dispose (GObject* self) {
+	DBusGConnection *connection;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		return;
+	}
+	((MprisPlayerDBusProxy*) self)->disposed = TRUE;
+	g_object_get (self, "connection", &connection, NULL);
+	dbus_connection_remove_filter (dbus_g_connection_get_connection (connection), mpris_player_dbus_proxy_filter, self);
+	G_OBJECT_CLASS (mpris_player_dbus_proxy_parent_class)->dispose (self);
+}
+
+
+static void mpris_player_dbus_proxy_class_init (MprisPlayerDBusProxyClass* klass) {
+	G_OBJECT_CLASS (klass)->constructor = mpris_player_dbus_proxy_construct;
+	G_OBJECT_CLASS (klass)->dispose = mpris_player_dbus_proxy_dispose;
+	G_OBJECT_CLASS (klass)->get_property = mpris_player_dbus_proxy_get_property;
+	G_OBJECT_CLASS (klass)->set_property = mpris_player_dbus_proxy_set_property;
+	g_object_class_override_property (G_OBJECT_CLASS (klass), MPRIS_PLAYER_DBUS_PROXY_METADATA, "Metadata");
+	g_object_class_override_property (G_OBJECT_CLASS (klass), MPRIS_PLAYER_DBUS_PROXY_POSITION, "Position");
+	g_object_class_override_property (G_OBJECT_CLASS (klass), MPRIS_PLAYER_DBUS_PROXY_PLAYBACK_STATUS, "PlaybackStatus");
+}
+
+
+static void mpris_player_dbus_proxy_init (MprisPlayerDBusProxy* self) {
+}
+
+
+static void mpris_player_dbus_proxy_SetPosition (MprisPlayer* self, const char* path, gint64 pos, GError** error) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter;
+	const char* _tmp126_;
+	dbus_int64_t _tmp127_;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.mpris.MediaPlayer2.Player", "SetPosition");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp126_ = path;
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_OBJECT_PATH, &_tmp126_);
+	_tmp127_ = pos;
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_INT64, &_tmp127_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		GQuark _edomain;
+		gint _ecode;
+		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
+			const char* _tmp128_;
+			_edomain = DBUS_GERROR;
+			_tmp128_ = _dbus_error.name + 27;
+			if (strcmp (_tmp128_, "Failed") == 0) {
+				_ecode = DBUS_GERROR_FAILED;
+			} else if (strcmp (_tmp128_, "NoMemory") == 0) {
+				_ecode = DBUS_GERROR_NO_MEMORY;
+			} else if (strcmp (_tmp128_, "ServiceUnknown") == 0) {
+				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
+			} else if (strcmp (_tmp128_, "NameHasNoOwner") == 0) {
+				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
+			} else if (strcmp (_tmp128_, "NoReply") == 0) {
+				_ecode = DBUS_GERROR_NO_REPLY;
+			} else if (strcmp (_tmp128_, "IOError") == 0) {
+				_ecode = DBUS_GERROR_IO_ERROR;
+			} else if (strcmp (_tmp128_, "BadAddress") == 0) {
+				_ecode = DBUS_GERROR_BAD_ADDRESS;
+			} else if (strcmp (_tmp128_, "NotSupported") == 0) {
+				_ecode = DBUS_GERROR_NOT_SUPPORTED;
+			} else if (strcmp (_tmp128_, "LimitsExceeded") == 0) {
+				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
+			} else if (strcmp (_tmp128_, "AccessDenied") == 0) {
+				_ecode = DBUS_GERROR_ACCESS_DENIED;
+			} else if (strcmp (_tmp128_, "AuthFailed") == 0) {
+				_ecode = DBUS_GERROR_AUTH_FAILED;
+			} else if (strcmp (_tmp128_, "NoServer") == 0) {
+				_ecode = DBUS_GERROR_NO_SERVER;
+			} else if (strcmp (_tmp128_, "Timeout") == 0) {
+				_ecode = DBUS_GERROR_TIMEOUT;
+			} else if (strcmp (_tmp128_, "NoNetwork") == 0) {
+				_ecode = DBUS_GERROR_NO_NETWORK;
+			} else if (strcmp (_tmp128_, "AddressInUse") == 0) {
+				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
+			} else if (strcmp (_tmp128_, "Disconnected") == 0) {
+				_ecode = DBUS_GERROR_DISCONNECTED;
+			} else if (strcmp (_tmp128_, "InvalidArgs") == 0) {
+				_ecode = DBUS_GERROR_INVALID_ARGS;
+			} else if (strcmp (_tmp128_, "FileNotFound") == 0) {
+				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
+			} else if (strcmp (_tmp128_, "FileExists") == 0) {
+				_ecode = DBUS_GERROR_FILE_EXISTS;
+			} else if (strcmp (_tmp128_, "UnknownMethod") == 0) {
+				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
+			} else if (strcmp (_tmp128_, "TimedOut") == 0) {
+				_ecode = DBUS_GERROR_TIMED_OUT;
+			} else if (strcmp (_tmp128_, "MatchRuleNotFound") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
+			} else if (strcmp (_tmp128_, "MatchRuleInvalid") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
+			} else if (strcmp (_tmp128_, "Spawn.ExecFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
+			} else if (strcmp (_tmp128_, "Spawn.ForkFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
+			} else if (strcmp (_tmp128_, "Spawn.ChildExited") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
+			} else if (strcmp (_tmp128_, "Spawn.ChildSignaled") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
+			} else if (strcmp (_tmp128_, "Spawn.Failed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FAILED;
+			} else if (strcmp (_tmp128_, "UnixProcessIdUnknown") == 0) {
+				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
+			} else if (strcmp (_tmp128_, "InvalidSignature") == 0) {
+				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
+			} else if (strcmp (_tmp128_, "InvalidFileContent") == 0) {
+				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
+			} else if (strcmp (_tmp128_, "SELinuxSecurityContextUnknown") == 0) {
+				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
+			} else if (strcmp (_tmp128_, "RemoteException") == 0) {
+				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
+			}
+		}
+		g_set_error (error, _edomain, _ecode, "%s", _dbus_error.message);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_SIGNATURE, "Invalid signature, expected \"%s\", got \"%s\"", "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static void mpris_player_dbus_proxy_PlayPause (MprisPlayer* self, GError** error) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.mpris.MediaPlayer2.Player", "PlayPause");
+	dbus_message_iter_init_append (_message, &_iter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		GQuark _edomain;
+		gint _ecode;
+		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
+			const char* _tmp129_;
+			_edomain = DBUS_GERROR;
+			_tmp129_ = _dbus_error.name + 27;
+			if (strcmp (_tmp129_, "Failed") == 0) {
+				_ecode = DBUS_GERROR_FAILED;
+			} else if (strcmp (_tmp129_, "NoMemory") == 0) {
+				_ecode = DBUS_GERROR_NO_MEMORY;
+			} else if (strcmp (_tmp129_, "ServiceUnknown") == 0) {
+				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
+			} else if (strcmp (_tmp129_, "NameHasNoOwner") == 0) {
+				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
+			} else if (strcmp (_tmp129_, "NoReply") == 0) {
+				_ecode = DBUS_GERROR_NO_REPLY;
+			} else if (strcmp (_tmp129_, "IOError") == 0) {
+				_ecode = DBUS_GERROR_IO_ERROR;
+			} else if (strcmp (_tmp129_, "BadAddress") == 0) {
+				_ecode = DBUS_GERROR_BAD_ADDRESS;
+			} else if (strcmp (_tmp129_, "NotSupported") == 0) {
+				_ecode = DBUS_GERROR_NOT_SUPPORTED;
+			} else if (strcmp (_tmp129_, "LimitsExceeded") == 0) {
+				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
+			} else if (strcmp (_tmp129_, "AccessDenied") == 0) {
+				_ecode = DBUS_GERROR_ACCESS_DENIED;
+			} else if (strcmp (_tmp129_, "AuthFailed") == 0) {
+				_ecode = DBUS_GERROR_AUTH_FAILED;
+			} else if (strcmp (_tmp129_, "NoServer") == 0) {
+				_ecode = DBUS_GERROR_NO_SERVER;
+			} else if (strcmp (_tmp129_, "Timeout") == 0) {
+				_ecode = DBUS_GERROR_TIMEOUT;
+			} else if (strcmp (_tmp129_, "NoNetwork") == 0) {
+				_ecode = DBUS_GERROR_NO_NETWORK;
+			} else if (strcmp (_tmp129_, "AddressInUse") == 0) {
+				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
+			} else if (strcmp (_tmp129_, "Disconnected") == 0) {
+				_ecode = DBUS_GERROR_DISCONNECTED;
+			} else if (strcmp (_tmp129_, "InvalidArgs") == 0) {
+				_ecode = DBUS_GERROR_INVALID_ARGS;
+			} else if (strcmp (_tmp129_, "FileNotFound") == 0) {
+				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
+			} else if (strcmp (_tmp129_, "FileExists") == 0) {
+				_ecode = DBUS_GERROR_FILE_EXISTS;
+			} else if (strcmp (_tmp129_, "UnknownMethod") == 0) {
+				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
+			} else if (strcmp (_tmp129_, "TimedOut") == 0) {
+				_ecode = DBUS_GERROR_TIMED_OUT;
+			} else if (strcmp (_tmp129_, "MatchRuleNotFound") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
+			} else if (strcmp (_tmp129_, "MatchRuleInvalid") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
+			} else if (strcmp (_tmp129_, "Spawn.ExecFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
+			} else if (strcmp (_tmp129_, "Spawn.ForkFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
+			} else if (strcmp (_tmp129_, "Spawn.ChildExited") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
+			} else if (strcmp (_tmp129_, "Spawn.ChildSignaled") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
+			} else if (strcmp (_tmp129_, "Spawn.Failed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FAILED;
+			} else if (strcmp (_tmp129_, "UnixProcessIdUnknown") == 0) {
+				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
+			} else if (strcmp (_tmp129_, "InvalidSignature") == 0) {
+				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
+			} else if (strcmp (_tmp129_, "InvalidFileContent") == 0) {
+				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
+			} else if (strcmp (_tmp129_, "SELinuxSecurityContextUnknown") == 0) {
+				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
+			} else if (strcmp (_tmp129_, "RemoteException") == 0) {
+				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
+			}
+		}
+		g_set_error (error, _edomain, _ecode, "%s", _dbus_error.message);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_SIGNATURE, "Invalid signature, expected \"%s\", got \"%s\"", "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static void mpris_player_dbus_proxy_Pause (MprisPlayer* self, GError** error) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.mpris.MediaPlayer2.Player", "Pause");
+	dbus_message_iter_init_append (_message, &_iter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		GQuark _edomain;
+		gint _ecode;
+		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
+			const char* _tmp130_;
+			_edomain = DBUS_GERROR;
+			_tmp130_ = _dbus_error.name + 27;
+			if (strcmp (_tmp130_, "Failed") == 0) {
+				_ecode = DBUS_GERROR_FAILED;
+			} else if (strcmp (_tmp130_, "NoMemory") == 0) {
+				_ecode = DBUS_GERROR_NO_MEMORY;
+			} else if (strcmp (_tmp130_, "ServiceUnknown") == 0) {
+				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
+			} else if (strcmp (_tmp130_, "NameHasNoOwner") == 0) {
+				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
+			} else if (strcmp (_tmp130_, "NoReply") == 0) {
+				_ecode = DBUS_GERROR_NO_REPLY;
+			} else if (strcmp (_tmp130_, "IOError") == 0) {
+				_ecode = DBUS_GERROR_IO_ERROR;
+			} else if (strcmp (_tmp130_, "BadAddress") == 0) {
+				_ecode = DBUS_GERROR_BAD_ADDRESS;
+			} else if (strcmp (_tmp130_, "NotSupported") == 0) {
+				_ecode = DBUS_GERROR_NOT_SUPPORTED;
+			} else if (strcmp (_tmp130_, "LimitsExceeded") == 0) {
+				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
+			} else if (strcmp (_tmp130_, "AccessDenied") == 0) {
+				_ecode = DBUS_GERROR_ACCESS_DENIED;
+			} else if (strcmp (_tmp130_, "AuthFailed") == 0) {
+				_ecode = DBUS_GERROR_AUTH_FAILED;
+			} else if (strcmp (_tmp130_, "NoServer") == 0) {
+				_ecode = DBUS_GERROR_NO_SERVER;
+			} else if (strcmp (_tmp130_, "Timeout") == 0) {
+				_ecode = DBUS_GERROR_TIMEOUT;
+			} else if (strcmp (_tmp130_, "NoNetwork") == 0) {
+				_ecode = DBUS_GERROR_NO_NETWORK;
+			} else if (strcmp (_tmp130_, "AddressInUse") == 0) {
+				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
+			} else if (strcmp (_tmp130_, "Disconnected") == 0) {
+				_ecode = DBUS_GERROR_DISCONNECTED;
+			} else if (strcmp (_tmp130_, "InvalidArgs") == 0) {
+				_ecode = DBUS_GERROR_INVALID_ARGS;
+			} else if (strcmp (_tmp130_, "FileNotFound") == 0) {
+				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
+			} else if (strcmp (_tmp130_, "FileExists") == 0) {
+				_ecode = DBUS_GERROR_FILE_EXISTS;
+			} else if (strcmp (_tmp130_, "UnknownMethod") == 0) {
+				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
+			} else if (strcmp (_tmp130_, "TimedOut") == 0) {
+				_ecode = DBUS_GERROR_TIMED_OUT;
+			} else if (strcmp (_tmp130_, "MatchRuleNotFound") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
+			} else if (strcmp (_tmp130_, "MatchRuleInvalid") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
+			} else if (strcmp (_tmp130_, "Spawn.ExecFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
+			} else if (strcmp (_tmp130_, "Spawn.ForkFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
+			} else if (strcmp (_tmp130_, "Spawn.ChildExited") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
+			} else if (strcmp (_tmp130_, "Spawn.ChildSignaled") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
+			} else if (strcmp (_tmp130_, "Spawn.Failed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FAILED;
+			} else if (strcmp (_tmp130_, "UnixProcessIdUnknown") == 0) {
+				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
+			} else if (strcmp (_tmp130_, "InvalidSignature") == 0) {
+				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
+			} else if (strcmp (_tmp130_, "InvalidFileContent") == 0) {
+				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
+			} else if (strcmp (_tmp130_, "SELinuxSecurityContextUnknown") == 0) {
+				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
+			} else if (strcmp (_tmp130_, "RemoteException") == 0) {
+				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
+			}
+		}
+		g_set_error (error, _edomain, _ecode, "%s", _dbus_error.message);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_SIGNATURE, "Invalid signature, expected \"%s\", got \"%s\"", "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static void mpris_player_dbus_proxy_Next (MprisPlayer* self, GError** error) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.mpris.MediaPlayer2.Player", "Next");
+	dbus_message_iter_init_append (_message, &_iter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		GQuark _edomain;
+		gint _ecode;
+		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
+			const char* _tmp131_;
+			_edomain = DBUS_GERROR;
+			_tmp131_ = _dbus_error.name + 27;
+			if (strcmp (_tmp131_, "Failed") == 0) {
+				_ecode = DBUS_GERROR_FAILED;
+			} else if (strcmp (_tmp131_, "NoMemory") == 0) {
+				_ecode = DBUS_GERROR_NO_MEMORY;
+			} else if (strcmp (_tmp131_, "ServiceUnknown") == 0) {
+				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
+			} else if (strcmp (_tmp131_, "NameHasNoOwner") == 0) {
+				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
+			} else if (strcmp (_tmp131_, "NoReply") == 0) {
+				_ecode = DBUS_GERROR_NO_REPLY;
+			} else if (strcmp (_tmp131_, "IOError") == 0) {
+				_ecode = DBUS_GERROR_IO_ERROR;
+			} else if (strcmp (_tmp131_, "BadAddress") == 0) {
+				_ecode = DBUS_GERROR_BAD_ADDRESS;
+			} else if (strcmp (_tmp131_, "NotSupported") == 0) {
+				_ecode = DBUS_GERROR_NOT_SUPPORTED;
+			} else if (strcmp (_tmp131_, "LimitsExceeded") == 0) {
+				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
+			} else if (strcmp (_tmp131_, "AccessDenied") == 0) {
+				_ecode = DBUS_GERROR_ACCESS_DENIED;
+			} else if (strcmp (_tmp131_, "AuthFailed") == 0) {
+				_ecode = DBUS_GERROR_AUTH_FAILED;
+			} else if (strcmp (_tmp131_, "NoServer") == 0) {
+				_ecode = DBUS_GERROR_NO_SERVER;
+			} else if (strcmp (_tmp131_, "Timeout") == 0) {
+				_ecode = DBUS_GERROR_TIMEOUT;
+			} else if (strcmp (_tmp131_, "NoNetwork") == 0) {
+				_ecode = DBUS_GERROR_NO_NETWORK;
+			} else if (strcmp (_tmp131_, "AddressInUse") == 0) {
+				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
+			} else if (strcmp (_tmp131_, "Disconnected") == 0) {
+				_ecode = DBUS_GERROR_DISCONNECTED;
+			} else if (strcmp (_tmp131_, "InvalidArgs") == 0) {
+				_ecode = DBUS_GERROR_INVALID_ARGS;
+			} else if (strcmp (_tmp131_, "FileNotFound") == 0) {
+				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
+			} else if (strcmp (_tmp131_, "FileExists") == 0) {
+				_ecode = DBUS_GERROR_FILE_EXISTS;
+			} else if (strcmp (_tmp131_, "UnknownMethod") == 0) {
+				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
+			} else if (strcmp (_tmp131_, "TimedOut") == 0) {
+				_ecode = DBUS_GERROR_TIMED_OUT;
+			} else if (strcmp (_tmp131_, "MatchRuleNotFound") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
+			} else if (strcmp (_tmp131_, "MatchRuleInvalid") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
+			} else if (strcmp (_tmp131_, "Spawn.ExecFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
+			} else if (strcmp (_tmp131_, "Spawn.ForkFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
+			} else if (strcmp (_tmp131_, "Spawn.ChildExited") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
+			} else if (strcmp (_tmp131_, "Spawn.ChildSignaled") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
+			} else if (strcmp (_tmp131_, "Spawn.Failed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FAILED;
+			} else if (strcmp (_tmp131_, "UnixProcessIdUnknown") == 0) {
+				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
+			} else if (strcmp (_tmp131_, "InvalidSignature") == 0) {
+				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
+			} else if (strcmp (_tmp131_, "InvalidFileContent") == 0) {
+				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
+			} else if (strcmp (_tmp131_, "SELinuxSecurityContextUnknown") == 0) {
+				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
+			} else if (strcmp (_tmp131_, "RemoteException") == 0) {
+				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
+			}
+		}
+		g_set_error (error, _edomain, _ecode, "%s", _dbus_error.message);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_SIGNATURE, "Invalid signature, expected \"%s\", got \"%s\"", "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static void mpris_player_dbus_proxy_Previous (MprisPlayer* self, GError** error) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_DISCONNECTED, "%s", "Connection is closed");
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.mpris.MediaPlayer2.Player", "Previous");
+	dbus_message_iter_init_append (_message, &_iter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		GQuark _edomain;
+		gint _ecode;
+		if (strstr (_dbus_error.name, "org.freedesktop.DBus.Error") == _dbus_error.name) {
+			const char* _tmp132_;
+			_edomain = DBUS_GERROR;
+			_tmp132_ = _dbus_error.name + 27;
+			if (strcmp (_tmp132_, "Failed") == 0) {
+				_ecode = DBUS_GERROR_FAILED;
+			} else if (strcmp (_tmp132_, "NoMemory") == 0) {
+				_ecode = DBUS_GERROR_NO_MEMORY;
+			} else if (strcmp (_tmp132_, "ServiceUnknown") == 0) {
+				_ecode = DBUS_GERROR_SERVICE_UNKNOWN;
+			} else if (strcmp (_tmp132_, "NameHasNoOwner") == 0) {
+				_ecode = DBUS_GERROR_NAME_HAS_NO_OWNER;
+			} else if (strcmp (_tmp132_, "NoReply") == 0) {
+				_ecode = DBUS_GERROR_NO_REPLY;
+			} else if (strcmp (_tmp132_, "IOError") == 0) {
+				_ecode = DBUS_GERROR_IO_ERROR;
+			} else if (strcmp (_tmp132_, "BadAddress") == 0) {
+				_ecode = DBUS_GERROR_BAD_ADDRESS;
+			} else if (strcmp (_tmp132_, "NotSupported") == 0) {
+				_ecode = DBUS_GERROR_NOT_SUPPORTED;
+			} else if (strcmp (_tmp132_, "LimitsExceeded") == 0) {
+				_ecode = DBUS_GERROR_LIMITS_EXCEEDED;
+			} else if (strcmp (_tmp132_, "AccessDenied") == 0) {
+				_ecode = DBUS_GERROR_ACCESS_DENIED;
+			} else if (strcmp (_tmp132_, "AuthFailed") == 0) {
+				_ecode = DBUS_GERROR_AUTH_FAILED;
+			} else if (strcmp (_tmp132_, "NoServer") == 0) {
+				_ecode = DBUS_GERROR_NO_SERVER;
+			} else if (strcmp (_tmp132_, "Timeout") == 0) {
+				_ecode = DBUS_GERROR_TIMEOUT;
+			} else if (strcmp (_tmp132_, "NoNetwork") == 0) {
+				_ecode = DBUS_GERROR_NO_NETWORK;
+			} else if (strcmp (_tmp132_, "AddressInUse") == 0) {
+				_ecode = DBUS_GERROR_ADDRESS_IN_USE;
+			} else if (strcmp (_tmp132_, "Disconnected") == 0) {
+				_ecode = DBUS_GERROR_DISCONNECTED;
+			} else if (strcmp (_tmp132_, "InvalidArgs") == 0) {
+				_ecode = DBUS_GERROR_INVALID_ARGS;
+			} else if (strcmp (_tmp132_, "FileNotFound") == 0) {
+				_ecode = DBUS_GERROR_FILE_NOT_FOUND;
+			} else if (strcmp (_tmp132_, "FileExists") == 0) {
+				_ecode = DBUS_GERROR_FILE_EXISTS;
+			} else if (strcmp (_tmp132_, "UnknownMethod") == 0) {
+				_ecode = DBUS_GERROR_UNKNOWN_METHOD;
+			} else if (strcmp (_tmp132_, "TimedOut") == 0) {
+				_ecode = DBUS_GERROR_TIMED_OUT;
+			} else if (strcmp (_tmp132_, "MatchRuleNotFound") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_NOT_FOUND;
+			} else if (strcmp (_tmp132_, "MatchRuleInvalid") == 0) {
+				_ecode = DBUS_GERROR_MATCH_RULE_INVALID;
+			} else if (strcmp (_tmp132_, "Spawn.ExecFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_EXEC_FAILED;
+			} else if (strcmp (_tmp132_, "Spawn.ForkFailed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FORK_FAILED;
+			} else if (strcmp (_tmp132_, "Spawn.ChildExited") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_EXITED;
+			} else if (strcmp (_tmp132_, "Spawn.ChildSignaled") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_CHILD_SIGNALED;
+			} else if (strcmp (_tmp132_, "Spawn.Failed") == 0) {
+				_ecode = DBUS_GERROR_SPAWN_FAILED;
+			} else if (strcmp (_tmp132_, "UnixProcessIdUnknown") == 0) {
+				_ecode = DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN;
+			} else if (strcmp (_tmp132_, "InvalidSignature") == 0) {
+				_ecode = DBUS_GERROR_INVALID_SIGNATURE;
+			} else if (strcmp (_tmp132_, "InvalidFileContent") == 0) {
+				_ecode = DBUS_GERROR_INVALID_FILE_CONTENT;
+			} else if (strcmp (_tmp132_, "SELinuxSecurityContextUnknown") == 0) {
+				_ecode = DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
+			} else if (strcmp (_tmp132_, "RemoteException") == 0) {
+				_ecode = DBUS_GERROR_REMOTE_EXCEPTION;
+			}
+		}
+		g_set_error (error, _edomain, _ecode, "%s", _dbus_error.message);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_set_error (error, DBUS_GERROR, DBUS_GERROR_INVALID_SIGNATURE, "Invalid signature, expected \"%s\", got \"%s\"", "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static GHashTable* mpris_player_dbus_proxy_get_Metadata (MprisPlayer* self) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp133_;
+	const char* _tmp134_;
+	GHashTable* _result;
+	GHashTable* _tmp135_;
+	DBusMessageIter _tmp136_;
+	DBusMessageIter _tmp137_;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		return NULL;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp133_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp133_);
+	_tmp134_ = "Metadata";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp134_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return NULL;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "v")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "v", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return NULL;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_iter_recurse (&_iter, &_subiter);
+	if (strcmp (dbus_message_iter_get_signature (&_subiter), "a{sv}")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "a{sv}", dbus_message_iter_get_signature (&_subiter));
+		dbus_message_unref (_reply);
+		return NULL;
+	}
+	_tmp135_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	dbus_message_iter_recurse (&_subiter, &_tmp136_);
+	while (dbus_message_iter_get_arg_type (&_tmp136_)) {
+		char* _key;
+		GValue* _value;
+		const char* _tmp138_;
+		GValue _tmp139_ = {0};
+		DBusMessageIter _tmp140_;
+		dbus_message_iter_recurse (&_tmp136_, &_tmp137_);
+		dbus_message_iter_get_basic (&_tmp137_, &_tmp138_);
+		dbus_message_iter_next (&_tmp137_);
+		_key = g_strdup (_tmp138_);
+		dbus_message_iter_recurse (&_tmp137_, &_tmp140_);
+		if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_BYTE) {
+			guint8 _tmp141_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp141_);
+			g_value_init (&_tmp139_, G_TYPE_UCHAR);
+			g_value_set_uchar (&_tmp139_, _tmp141_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_BOOLEAN) {
+			dbus_bool_t _tmp142_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp142_);
+			g_value_init (&_tmp139_, G_TYPE_BOOLEAN);
+			g_value_set_boolean (&_tmp139_, _tmp142_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_INT16) {
+			dbus_int16_t _tmp143_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp143_);
+			g_value_init (&_tmp139_, G_TYPE_INT);
+			g_value_set_int (&_tmp139_, _tmp143_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_UINT16) {
+			dbus_uint16_t _tmp144_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp144_);
+			g_value_init (&_tmp139_, G_TYPE_UINT);
+			g_value_set_uint (&_tmp139_, _tmp144_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_INT32) {
+			dbus_int32_t _tmp145_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp145_);
+			g_value_init (&_tmp139_, G_TYPE_INT);
+			g_value_set_int (&_tmp139_, _tmp145_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_UINT32) {
+			dbus_uint32_t _tmp146_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp146_);
+			g_value_init (&_tmp139_, G_TYPE_UINT);
+			g_value_set_uint (&_tmp139_, _tmp146_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_INT64) {
+			dbus_int64_t _tmp147_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp147_);
+			g_value_init (&_tmp139_, G_TYPE_INT64);
+			g_value_set_int64 (&_tmp139_, _tmp147_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_UINT64) {
+			dbus_uint64_t _tmp148_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp148_);
+			g_value_init (&_tmp139_, G_TYPE_UINT64);
+			g_value_set_uint64 (&_tmp139_, _tmp148_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_DOUBLE) {
+			double _tmp149_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp149_);
+			g_value_init (&_tmp139_, G_TYPE_DOUBLE);
+			g_value_set_double (&_tmp139_, _tmp149_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_STRING) {
+			const char* _tmp150_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp150_);
+			g_value_init (&_tmp139_, G_TYPE_STRING);
+			g_value_take_string (&_tmp139_, g_strdup (_tmp150_));
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_OBJECT_PATH) {
+			const char* _tmp151_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp151_);
+			g_value_init (&_tmp139_, G_TYPE_STRING);
+			g_value_take_string (&_tmp139_, g_strdup (_tmp151_));
+		} else if (dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_SIGNATURE) {
+			const char* _tmp152_;
+			dbus_message_iter_get_basic (&_tmp140_, &_tmp152_);
+			g_value_init (&_tmp139_, G_TYPE_STRING);
+			g_value_take_string (&_tmp139_, g_strdup (_tmp152_));
+		} else if ((dbus_message_iter_get_arg_type (&_tmp140_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp140_) == DBUS_TYPE_STRING)) {
+			const char** _tmp153_;
+			int _tmp153__length;
+			int _tmp153__size;
+			int _tmp153__length1;
+			DBusMessageIter _tmp154_;
+			_tmp153_ = g_new (const char*, 5);
+			_tmp153__length = 0;
+			_tmp153__size = 4;
+			_tmp153__length1 = 0;
+			dbus_message_iter_recurse (&_tmp140_, &_tmp154_);
+			for (; dbus_message_iter_get_arg_type (&_tmp154_); _tmp153__length1++) {
+				const char* _tmp155_;
+				if (_tmp153__size == _tmp153__length) {
+					_tmp153__size = 2 * _tmp153__size;
+					_tmp153_ = g_renew (const char*, _tmp153_, _tmp153__size + 1);
+				}
+				dbus_message_iter_get_basic (&_tmp154_, &_tmp155_);
+				dbus_message_iter_next (&_tmp154_);
+				_tmp153_[_tmp153__length++] = g_strdup (_tmp155_);
+			}
+			_tmp153_[_tmp153__length] = NULL;
+			g_value_init (&_tmp139_, G_TYPE_STRV);
+			g_value_take_boxed (&_tmp139_, _tmp153_);
+		}
+		dbus_message_iter_next (&_tmp137_);
+		_value = g_memdup (&_tmp139_, sizeof (GValue));
+		g_hash_table_insert (_tmp135_, _key, _value);
+		dbus_message_iter_next (&_tmp136_);
+	}
+	dbus_message_iter_next (&_subiter);
+	_result = _tmp135_;
+	dbus_message_unref (_reply);
+	return _result;
+}
+
+
+static void mpris_player_dbus_proxy_set_Metadata (MprisPlayer* self, GHashTable* value) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp156_;
+	const char* _tmp157_;
+	DBusMessageIter _tmp158_, _tmp159_;
+	GHashTableIter _tmp160_;
+	gpointer _tmp161_, _tmp162_;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp156_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp156_);
+	_tmp157_ = "Metadata";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp157_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "a{sv}", &_subiter);
+	dbus_message_iter_open_container (&_subiter, DBUS_TYPE_ARRAY, "{sv}", &_tmp158_);
+	g_hash_table_iter_init (&_tmp160_, value);
+	while (g_hash_table_iter_next (&_tmp160_, &_tmp161_, &_tmp162_)) {
+		char* _key;
+		GValue* _value;
+		const char* _tmp163_;
+		DBusMessageIter _tmp164_;
+		dbus_message_iter_open_container (&_tmp158_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp159_);
+		_key = (char*) _tmp161_;
+		_value = (GValue*) _tmp162_;
+		_tmp163_ = _key;
+		dbus_message_iter_append_basic (&_tmp159_, DBUS_TYPE_STRING, &_tmp163_);
+		if (G_VALUE_TYPE (_value) == G_TYPE_UCHAR) {
+			guint8 _tmp165_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "y", &_tmp164_);
+			_tmp165_ = g_value_get_uchar (_value);
+			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_BYTE, &_tmp165_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_BOOLEAN) {
+			dbus_bool_t _tmp166_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "b", &_tmp164_);
+			_tmp166_ = g_value_get_boolean (_value);
+			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_BOOLEAN, &_tmp166_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_INT) {
+			dbus_int32_t _tmp167_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "i", &_tmp164_);
+			_tmp167_ = g_value_get_int (_value);
+			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_INT32, &_tmp167_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT) {
+			dbus_uint32_t _tmp168_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "u", &_tmp164_);
+			_tmp168_ = g_value_get_uint (_value);
+			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_UINT32, &_tmp168_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_INT64) {
+			dbus_int64_t _tmp169_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "x", &_tmp164_);
+			_tmp169_ = g_value_get_int64 (_value);
+			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_INT64, &_tmp169_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT64) {
+			dbus_uint64_t _tmp170_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "t", &_tmp164_);
+			_tmp170_ = g_value_get_uint64 (_value);
+			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_UINT64, &_tmp170_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_DOUBLE) {
+			double _tmp171_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "d", &_tmp164_);
+			_tmp171_ = g_value_get_double (_value);
+			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_DOUBLE, &_tmp171_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_STRING) {
+			const char* _tmp172_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "s", &_tmp164_);
+			_tmp172_ = g_value_get_string (_value);
+			dbus_message_iter_append_basic (&_tmp164_, DBUS_TYPE_STRING, &_tmp172_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_STRV) {
+			const char** _tmp173_;
+			DBusMessageIter _tmp174_;
+			int _tmp175_;
+			dbus_message_iter_open_container (&_tmp159_, DBUS_TYPE_VARIANT, "as", &_tmp164_);
+			_tmp173_ = g_value_get_boxed (_value);
+			dbus_message_iter_open_container (&_tmp164_, DBUS_TYPE_ARRAY, "s", &_tmp174_);
+			for (_tmp175_ = 0; _tmp175_ < g_strv_length (g_value_get_boxed (_value)); _tmp175_++) {
+				const char* _tmp176_;
+				_tmp176_ = *_tmp173_;
+				dbus_message_iter_append_basic (&_tmp174_, DBUS_TYPE_STRING, &_tmp176_);
+				_tmp173_++;
+			}
+			dbus_message_iter_close_container (&_tmp164_, &_tmp174_);
+			dbus_message_iter_close_container (&_tmp159_, &_tmp164_);
+		}
+		dbus_message_iter_close_container (&_tmp158_, &_tmp159_);
+	}
+	dbus_message_iter_close_container (&_subiter, &_tmp158_);
+	dbus_message_iter_close_container (&_iter, &_subiter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static gint32 mpris_player_dbus_proxy_get_Position (MprisPlayer* self) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp177_;
+	const char* _tmp178_;
+	gint32 _result;
+	dbus_int32_t _tmp179_;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		return 0;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp177_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp177_);
+	_tmp178_ = "Position";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp178_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return 0;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "v")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "v", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return 0;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_iter_recurse (&_iter, &_subiter);
+	if (strcmp (dbus_message_iter_get_signature (&_subiter), "i")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "i", dbus_message_iter_get_signature (&_subiter));
+		dbus_message_unref (_reply);
+		return 0;
+	}
+	dbus_message_iter_get_basic (&_subiter, &_tmp179_);
+	dbus_message_iter_next (&_subiter);
+	_result = _tmp179_;
+	dbus_message_unref (_reply);
+	return _result;
+}
+
+
+static void mpris_player_dbus_proxy_set_Position (MprisPlayer* self, gint32 value) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp180_;
+	const char* _tmp181_;
+	dbus_int32_t _tmp182_;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp180_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp180_);
+	_tmp181_ = "Position";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp181_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "i", &_subiter);
+	_tmp182_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_INT32, &_tmp182_);
+	dbus_message_iter_close_container (&_iter, &_subiter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static char* mpris_player_dbus_proxy_get_PlaybackStatus (MprisPlayer* self) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp183_;
+	const char* _tmp184_;
+	char* _result;
+	const char* _tmp185_;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		return NULL;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Get");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp183_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp183_);
+	_tmp184_ = "PlaybackStatus";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp184_);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return NULL;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "v")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "v", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return NULL;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_iter_recurse (&_iter, &_subiter);
+	if (strcmp (dbus_message_iter_get_signature (&_subiter), "s")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "s", dbus_message_iter_get_signature (&_subiter));
+		dbus_message_unref (_reply);
+		return NULL;
+	}
+	dbus_message_iter_get_basic (&_subiter, &_tmp185_);
+	dbus_message_iter_next (&_subiter);
+	_result = g_strdup (_tmp185_);
+	dbus_message_unref (_reply);
+	return _result;
+}
+
+
+static void mpris_player_dbus_proxy_set_PlaybackStatus (MprisPlayer* self, const char* value) {
+	DBusError _dbus_error;
+	DBusGConnection *_connection;
+	DBusMessage *_message, *_reply;
+	DBusMessageIter _iter, _subiter;
+	const char* _tmp186_;
+	const char* _tmp187_;
+	const char* _tmp188_;
+	if (((MprisPlayerDBusProxy*) self)->disposed) {
+		return;
+	}
+	_message = dbus_message_new_method_call (dbus_g_proxy_get_bus_name ((DBusGProxy*) self), dbus_g_proxy_get_path ((DBusGProxy*) self), "org.freedesktop.DBus.Properties", "Set");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp186_ = "org.mpris.MediaPlayer2.Player";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp186_);
+	_tmp187_ = "PlaybackStatus";
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp187_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_VARIANT, "s", &_subiter);
+	_tmp188_ = value;
+	dbus_message_iter_append_basic (&_subiter, DBUS_TYPE_STRING, &_tmp188_);
+	dbus_message_iter_close_container (&_iter, &_subiter);
+	g_object_get (self, "connection", &_connection, NULL);
+	dbus_error_init (&_dbus_error);
+	_reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (_connection), _message, -1, &_dbus_error);
+	dbus_g_connection_unref (_connection);
+	dbus_message_unref (_message);
+	if (dbus_error_is_set (&_dbus_error)) {
+		g_critical ("file %s: line %d: uncaught error: %s (%s)", __FILE__, __LINE__, _dbus_error.message, _dbus_error.name);
+		dbus_error_free (&_dbus_error);
+		return;
+	}
+	if (strcmp (dbus_message_get_signature (_reply), "")) {
+		g_critical ("file %s: line %d: Invalid signature, expected \"%s\", got \"%s\"", __FILE__, __LINE__, "", dbus_message_get_signature (_reply));
+		dbus_message_unref (_reply);
+		return;
+	}
+	dbus_message_iter_init (_reply, &_iter);
+	dbus_message_unref (_reply);
+}
+
+
+static void mpris_player_dbus_proxy_mpris_player__interface_init (MprisPlayerIface* iface) {
+	iface->SetPosition = mpris_player_dbus_proxy_SetPosition;
+	iface->PlayPause = mpris_player_dbus_proxy_PlayPause;
+	iface->Pause = mpris_player_dbus_proxy_Pause;
+	iface->Next = mpris_player_dbus_proxy_Next;
+	iface->Previous = mpris_player_dbus_proxy_Previous;
+	iface->get_Metadata = mpris_player_dbus_proxy_get_Metadata;
+	iface->set_Metadata = mpris_player_dbus_proxy_set_Metadata;
+	iface->get_Position = mpris_player_dbus_proxy_get_Position;
+	iface->set_Position = mpris_player_dbus_proxy_set_Position;
+	iface->get_PlaybackStatus = mpris_player_dbus_proxy_get_PlaybackStatus;
+	iface->set_PlaybackStatus = mpris_player_dbus_proxy_set_PlaybackStatus;
+}
+
+
+static void mpris_player_dbus_proxy_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+}
+
+
+static void mpris_player_dbus_proxy_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+}
+
+
+void _free_desktop_properties_dbus_unregister (DBusConnection* connection, void* _user_data_) {
+}
+
+
+static DBusHandlerResult _dbus_free_desktop_properties_introspect (FreeDesktopProperties* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter;
+	GString* xml_data;
+	char** children;
+	int i;
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &iter);
+	xml_data = g_string_new ("<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" \"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n");
+	g_string_append (xml_data, "<node>\n<interface name=\"org.freedesktop.DBus.Introspectable\">\n  <method name=\"Introspect\">\n    <arg name=\"data\" direction=\"out\" type=\"s\"/>\n  </method>\n</interface>\n<interface name=\"org.freedesktop.DBus.Properties\">\n  <method name=\"Get\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"propname\" direction=\"in\" type=\"s\"/>\n    <arg name=\"value\" direction=\"out\" type=\"v\"/>\n  </method>\n  <method name=\"Set\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"propname\" direction=\"in\" type=\"s\"/>\n    <arg name=\"value\" direction=\"in\" type=\"v\"/>\n  </method>\n  <method name=\"GetAll\">\n    <arg name=\"interface\" direction=\"in\" type=\"s\"/>\n    <arg name=\"props\" direction=\"out\" type=\"a{sv}\"/>\n  </method>\n</interface>\n<interface name=\"org.freedesktop.DBus.Properties\">\n  <signal name=\"PropertiesChanged\">\n    <arg name=\"source\" type=\"s\"/>\n    <arg name=\"changed_properties\" type=\"a{sv}\"/>\n    <arg name=\"invalid\" type=\"as\"/>\n  </signal>\n</interface>\n");
+	dbus_connection_list_registered (connection, g_object_get_data ((GObject *) self, "dbus_object_path"), &children);
+	for (i = 0; children[i]; i++) {
+		g_string_append_printf (xml_data, "<node name=\"%s\"/>\n", children[i]);
+	}
+	dbus_free_string_array (children);
+	g_string_append (xml_data, "</node>\n");
+	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &xml_data->str);
+	g_string_free (xml_data, TRUE);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static DBusHandlerResult _dbus_free_desktop_properties_property_get_all (FreeDesktopProperties* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessage* reply;
+	DBusMessageIter iter, reply_iter, subiter;
+	char* interface_name;
+	const char* _tmp189_;
+	if (strcmp (dbus_message_get_signature (message), "s")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+	dbus_message_iter_init (message, &iter);
+	reply = dbus_message_new_method_return (message);
+	dbus_message_iter_init_append (reply, &reply_iter);
+	dbus_message_iter_get_basic (&iter, &_tmp189_);
+	dbus_message_iter_next (&iter);
+	interface_name = g_strdup (_tmp189_);
+	if (strcmp (interface_name, "org.freedesktop.DBus.Properties") == 0) {
+		dbus_message_iter_open_container (&reply_iter, DBUS_TYPE_ARRAY, "{sv}", &subiter);
+		dbus_message_iter_close_container (&reply_iter, &subiter);
+	} else {
+		dbus_message_unref (reply);
+		reply = NULL;
+	}
+	g_free (interface_name);
+	if (reply) {
+		dbus_connection_send (connection, reply, NULL);
+		dbus_message_unref (reply);
+		return DBUS_HANDLER_RESULT_HANDLED;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+DBusHandlerResult free_desktop_properties_dbus_message (DBusConnection* connection, DBusMessage* message, void* object) {
+	DBusHandlerResult result;
+	result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) {
+		result = _dbus_free_desktop_properties_introspect (object, connection, message);
+	} else if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Properties", "GetAll")) {
+		result = _dbus_free_desktop_properties_property_get_all (object, connection, message);
+	}
+	if (result == DBUS_HANDLER_RESULT_HANDLED) {
+		return result;
+	} else {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+}
+
+
+static void _dbus_free_desktop_properties_properties_changed (GObject* _sender, const char* source, GHashTable* changed_properties, char** invalid, int invalid_length1, DBusConnection* _connection) {
+	const char * _path;
+	DBusMessage *_message;
+	DBusMessageIter _iter;
+	const char* _tmp190_;
+	DBusMessageIter _tmp191_, _tmp192_;
+	GHashTableIter _tmp193_;
+	gpointer _tmp194_, _tmp195_;
+	char** _tmp210_;
+	DBusMessageIter _tmp211_;
+	int _tmp212_;
+	_path = g_object_get_data (_sender, "dbus_object_path");
+	_message = dbus_message_new_signal (_path, "org.freedesktop.DBus.Properties", "PropertiesChanged");
+	dbus_message_iter_init_append (_message, &_iter);
+	_tmp190_ = source;
+	dbus_message_iter_append_basic (&_iter, DBUS_TYPE_STRING, &_tmp190_);
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_ARRAY, "{sv}", &_tmp191_);
+	g_hash_table_iter_init (&_tmp193_, changed_properties);
+	while (g_hash_table_iter_next (&_tmp193_, &_tmp194_, &_tmp195_)) {
+		char* _key;
+		GValue* _value;
+		const char* _tmp196_;
+		DBusMessageIter _tmp197_;
+		dbus_message_iter_open_container (&_tmp191_, DBUS_TYPE_DICT_ENTRY, NULL, &_tmp192_);
+		_key = (char*) _tmp194_;
+		_value = (GValue*) _tmp195_;
+		_tmp196_ = _key;
+		dbus_message_iter_append_basic (&_tmp192_, DBUS_TYPE_STRING, &_tmp196_);
+		if (G_VALUE_TYPE (_value) == G_TYPE_UCHAR) {
+			guint8 _tmp198_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "y", &_tmp197_);
+			_tmp198_ = g_value_get_uchar (_value);
+			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_BYTE, &_tmp198_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_BOOLEAN) {
+			dbus_bool_t _tmp199_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "b", &_tmp197_);
+			_tmp199_ = g_value_get_boolean (_value);
+			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_BOOLEAN, &_tmp199_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_INT) {
+			dbus_int32_t _tmp200_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "i", &_tmp197_);
+			_tmp200_ = g_value_get_int (_value);
+			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_INT32, &_tmp200_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT) {
+			dbus_uint32_t _tmp201_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "u", &_tmp197_);
+			_tmp201_ = g_value_get_uint (_value);
+			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_UINT32, &_tmp201_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_INT64) {
+			dbus_int64_t _tmp202_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "x", &_tmp197_);
+			_tmp202_ = g_value_get_int64 (_value);
+			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_INT64, &_tmp202_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_UINT64) {
+			dbus_uint64_t _tmp203_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "t", &_tmp197_);
+			_tmp203_ = g_value_get_uint64 (_value);
+			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_UINT64, &_tmp203_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_DOUBLE) {
+			double _tmp204_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "d", &_tmp197_);
+			_tmp204_ = g_value_get_double (_value);
+			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_DOUBLE, &_tmp204_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_STRING) {
+			const char* _tmp205_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "s", &_tmp197_);
+			_tmp205_ = g_value_get_string (_value);
+			dbus_message_iter_append_basic (&_tmp197_, DBUS_TYPE_STRING, &_tmp205_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		} else if (G_VALUE_TYPE (_value) == G_TYPE_STRV) {
+			const char** _tmp206_;
+			DBusMessageIter _tmp207_;
+			int _tmp208_;
+			dbus_message_iter_open_container (&_tmp192_, DBUS_TYPE_VARIANT, "as", &_tmp197_);
+			_tmp206_ = g_value_get_boxed (_value);
+			dbus_message_iter_open_container (&_tmp197_, DBUS_TYPE_ARRAY, "s", &_tmp207_);
+			for (_tmp208_ = 0; _tmp208_ < g_strv_length (g_value_get_boxed (_value)); _tmp208_++) {
+				const char* _tmp209_;
+				_tmp209_ = *_tmp206_;
+				dbus_message_iter_append_basic (&_tmp207_, DBUS_TYPE_STRING, &_tmp209_);
+				_tmp206_++;
+			}
+			dbus_message_iter_close_container (&_tmp197_, &_tmp207_);
+			dbus_message_iter_close_container (&_tmp192_, &_tmp197_);
+		}
+		dbus_message_iter_close_container (&_tmp191_, &_tmp192_);
+	}
+	dbus_message_iter_close_container (&_iter, &_tmp191_);
+	_tmp210_ = invalid;
+	dbus_message_iter_open_container (&_iter, DBUS_TYPE_ARRAY, "s", &_tmp211_);
+	for (_tmp212_ = 0; _tmp212_ < invalid_length1; _tmp212_++) {
+		const char* _tmp213_;
+		_tmp213_ = *_tmp210_;
+		dbus_message_iter_append_basic (&_tmp211_, DBUS_TYPE_STRING, &_tmp213_);
+		_tmp210_++;
+	}
+	dbus_message_iter_close_container (&_iter, &_tmp211_);
+	dbus_connection_send (_connection, _message, NULL);
+	dbus_message_unref (_message);
+}
+
+
+void free_desktop_properties_dbus_register_object (DBusConnection* connection, const char* path, void* object) {
+	if (!g_object_get_data (object, "dbus_object_path")) {
+		g_object_set_data (object, "dbus_object_path", g_strdup (path));
+		dbus_connection_register_object_path (connection, path, &_free_desktop_properties_dbus_path_vtable, object);
+		g_object_weak_ref (object, _vala_dbus_unregister_object, connection);
+	}
+	g_signal_connect (object, "properties-changed", (GCallback) _dbus_free_desktop_properties_properties_changed, connection);
+}
+
+
+static void free_desktop_properties_base_init (FreeDesktopPropertiesIface * iface) {
+	static gboolean initialized = FALSE;
+	if (!initialized) {
+		initialized = TRUE;
+		g_signal_new ("properties_changed", TYPE_FREE_DESKTOP_PROPERTIES, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED_INT, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_HASH_TABLE, G_TYPE_STRV, G_TYPE_INT);
+		g_type_set_qdata (TYPE_FREE_DESKTOP_PROPERTIES, g_quark_from_static_string ("DBusObjectVTable"), (void*) (&_free_desktop_properties_dbus_vtable));
+	}
+}
+
+
+GType free_desktop_properties_get_type (void) {
+	static volatile gsize free_desktop_properties_type_id__volatile = 0;
+	if (g_once_init_enter (&free_desktop_properties_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (FreeDesktopPropertiesIface), (GBaseInitFunc) free_desktop_properties_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType free_desktop_properties_type_id;
+		free_desktop_properties_type_id = g_type_register_static (G_TYPE_INTERFACE, "FreeDesktopProperties", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (free_desktop_properties_type_id, DBUS_TYPE_G_PROXY);
+		g_type_set_qdata (free_desktop_properties_type_id, g_quark_from_string ("ValaDBusInterfaceProxyType"), &free_desktop_properties_dbus_proxy_get_type);
+		g_once_init_leave (&free_desktop_properties_type_id__volatile, free_desktop_properties_type_id);
+	}
+	return free_desktop_properties_type_id__volatile;
+}
+
+
+G_DEFINE_TYPE_EXTENDED (FreeDesktopPropertiesDBusProxy, free_desktop_properties_dbus_proxy, DBUS_TYPE_G_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_FREE_DESKTOP_PROPERTIES, free_desktop_properties_dbus_proxy_free_desktop_properties__interface_init) );
+FreeDesktopProperties* free_desktop_properties_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path) {
+	FreeDesktopProperties* self;
+	self = g_object_new (free_desktop_properties_dbus_proxy_get_type (), "connection", connection, "name", name, "path", path, "interface", "org.freedesktop.DBus.Properties", NULL);
+	return self;
+}
+
+
+static GObject* free_desktop_properties_dbus_proxy_construct (GType gtype, guint n_properties, GObjectConstructParam* properties) {
+	GObject* self;
+	DBusGConnection *connection;
+	char* path;
+	char* filter;
+	self = G_OBJECT_CLASS (free_desktop_properties_dbus_proxy_parent_class)->constructor (gtype, n_properties, properties);
+	g_object_get (self, "connection", &connection, NULL);
+	g_object_get (self, "path", &path, NULL);
+	dbus_connection_add_filter (dbus_g_connection_get_connection (connection), free_desktop_properties_dbus_proxy_filter, self, NULL);
+	filter = g_strdup_printf ("type='signal',path='%s'", path);
+	dbus_bus_add_match (dbus_g_connection_get_connection (connection), filter, NULL);
+	dbus_g_connection_unref (connection);
+	g_free (path);
+	g_free (filter);
+	return self;
+}
+
+
+static void _dbus_handle_free_desktop_properties_properties_changed (FreeDesktopProperties* self, DBusConnection* connection, DBusMessage* message) {
+	DBusMessageIter iter;
+	char* source = NULL;
+	const char* _tmp214_;
+	GHashTable* changed_properties = NULL;
+	GHashTable* _tmp215_;
+	DBusMessageIter _tmp216_;
+	DBusMessageIter _tmp217_;
+	char** invalid = NULL;
+	int invalid_length1;
+	char** _tmp236_;
+	int _tmp236__length;
+	int _tmp236__size;
+	int _tmp236__length1;
+	DBusMessageIter _tmp237_;
+	DBusMessage* reply;
+	if (strcmp (dbus_message_get_signature (message), "sa{sv}as")) {
+		return;
+	}
+	dbus_message_iter_init (message, &iter);
+	dbus_message_iter_get_basic (&iter, &_tmp214_);
+	dbus_message_iter_next (&iter);
+	source = g_strdup (_tmp214_);
+	_tmp215_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+	dbus_message_iter_recurse (&iter, &_tmp216_);
+	while (dbus_message_iter_get_arg_type (&_tmp216_)) {
+		char* _key;
+		GValue* _value;
+		const char* _tmp218_;
+		GValue _tmp219_ = {0};
+		DBusMessageIter _tmp220_;
+		dbus_message_iter_recurse (&_tmp216_, &_tmp217_);
+		dbus_message_iter_get_basic (&_tmp217_, &_tmp218_);
+		dbus_message_iter_next (&_tmp217_);
+		_key = g_strdup (_tmp218_);
+		dbus_message_iter_recurse (&_tmp217_, &_tmp220_);
+		if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_BYTE) {
+			guint8 _tmp221_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp221_);
+			g_value_init (&_tmp219_, G_TYPE_UCHAR);
+			g_value_set_uchar (&_tmp219_, _tmp221_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_BOOLEAN) {
+			dbus_bool_t _tmp222_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp222_);
+			g_value_init (&_tmp219_, G_TYPE_BOOLEAN);
+			g_value_set_boolean (&_tmp219_, _tmp222_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_INT16) {
+			dbus_int16_t _tmp223_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp223_);
+			g_value_init (&_tmp219_, G_TYPE_INT);
+			g_value_set_int (&_tmp219_, _tmp223_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_UINT16) {
+			dbus_uint16_t _tmp224_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp224_);
+			g_value_init (&_tmp219_, G_TYPE_UINT);
+			g_value_set_uint (&_tmp219_, _tmp224_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_INT32) {
+			dbus_int32_t _tmp225_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp225_);
+			g_value_init (&_tmp219_, G_TYPE_INT);
+			g_value_set_int (&_tmp219_, _tmp225_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_UINT32) {
+			dbus_uint32_t _tmp226_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp226_);
+			g_value_init (&_tmp219_, G_TYPE_UINT);
+			g_value_set_uint (&_tmp219_, _tmp226_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_INT64) {
+			dbus_int64_t _tmp227_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp227_);
+			g_value_init (&_tmp219_, G_TYPE_INT64);
+			g_value_set_int64 (&_tmp219_, _tmp227_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_UINT64) {
+			dbus_uint64_t _tmp228_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp228_);
+			g_value_init (&_tmp219_, G_TYPE_UINT64);
+			g_value_set_uint64 (&_tmp219_, _tmp228_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_DOUBLE) {
+			double _tmp229_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp229_);
+			g_value_init (&_tmp219_, G_TYPE_DOUBLE);
+			g_value_set_double (&_tmp219_, _tmp229_);
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_STRING) {
+			const char* _tmp230_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp230_);
+			g_value_init (&_tmp219_, G_TYPE_STRING);
+			g_value_take_string (&_tmp219_, g_strdup (_tmp230_));
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_OBJECT_PATH) {
+			const char* _tmp231_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp231_);
+			g_value_init (&_tmp219_, G_TYPE_STRING);
+			g_value_take_string (&_tmp219_, g_strdup (_tmp231_));
+		} else if (dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_SIGNATURE) {
+			const char* _tmp232_;
+			dbus_message_iter_get_basic (&_tmp220_, &_tmp232_);
+			g_value_init (&_tmp219_, G_TYPE_STRING);
+			g_value_take_string (&_tmp219_, g_strdup (_tmp232_));
+		} else if ((dbus_message_iter_get_arg_type (&_tmp220_) == DBUS_TYPE_ARRAY) && (dbus_message_iter_get_element_type (&_tmp220_) == DBUS_TYPE_STRING)) {
+			const char** _tmp233_;
+			int _tmp233__length;
+			int _tmp233__size;
+			int _tmp233__length1;
+			DBusMessageIter _tmp234_;
+			_tmp233_ = g_new (const char*, 5);
+			_tmp233__length = 0;
+			_tmp233__size = 4;
+			_tmp233__length1 = 0;
+			dbus_message_iter_recurse (&_tmp220_, &_tmp234_);
+			for (; dbus_message_iter_get_arg_type (&_tmp234_); _tmp233__length1++) {
+				const char* _tmp235_;
+				if (_tmp233__size == _tmp233__length) {
+					_tmp233__size = 2 * _tmp233__size;
+					_tmp233_ = g_renew (const char*, _tmp233_, _tmp233__size + 1);
+				}
+				dbus_message_iter_get_basic (&_tmp234_, &_tmp235_);
+				dbus_message_iter_next (&_tmp234_);
+				_tmp233_[_tmp233__length++] = g_strdup (_tmp235_);
+			}
+			_tmp233_[_tmp233__length] = NULL;
+			g_value_init (&_tmp219_, G_TYPE_STRV);
+			g_value_take_boxed (&_tmp219_, _tmp233_);
+		}
+		dbus_message_iter_next (&_tmp217_);
+		_value = g_memdup (&_tmp219_, sizeof (GValue));
+		g_hash_table_insert (_tmp215_, _key, _value);
+		dbus_message_iter_next (&_tmp216_);
+	}
+	dbus_message_iter_next (&iter);
+	changed_properties = _tmp215_;
+	invalid_length1 = 0;
+	_tmp236_ = g_new (char*, 5);
+	_tmp236__length = 0;
+	_tmp236__size = 4;
+	_tmp236__length1 = 0;
+	dbus_message_iter_recurse (&iter, &_tmp237_);
+	for (; dbus_message_iter_get_arg_type (&_tmp237_); _tmp236__length1++) {
+		const char* _tmp238_;
+		if (_tmp236__size == _tmp236__length) {
+			_tmp236__size = 2 * _tmp236__size;
+			_tmp236_ = g_renew (char*, _tmp236_, _tmp236__size + 1);
+		}
+		dbus_message_iter_get_basic (&_tmp237_, &_tmp238_);
+		dbus_message_iter_next (&_tmp237_);
+		_tmp236_[_tmp236__length++] = g_strdup (_tmp238_);
+	}
+	invalid_length1 = _tmp236__length1;
+	_tmp236_[_tmp236__length] = NULL;
+	dbus_message_iter_next (&iter);
+	invalid = _tmp236_;
+	g_signal_emit_by_name (self, "properties-changed", source, changed_properties, invalid, invalid_length1);
+	_g_free0 (source);
+	_g_hash_table_unref0 (changed_properties);
+	invalid = (_vala_array_free (invalid, invalid_length1, (GDestroyNotify) g_free), NULL);
+}
+
+
+DBusHandlerResult free_desktop_properties_dbus_proxy_filter (DBusConnection* connection, DBusMessage* message, void* user_data) {
+	if (dbus_message_has_path (message, dbus_g_proxy_get_path (user_data))) {
+		if (dbus_message_is_signal (message, "org.freedesktop.DBus.Properties", "PropertiesChanged")) {
+			_dbus_handle_free_desktop_properties_properties_changed (user_data, connection, message);
+		}
+	}
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+
+static void free_desktop_properties_dbus_proxy_dispose (GObject* self) {
+	DBusGConnection *connection;
+	if (((FreeDesktopPropertiesDBusProxy*) self)->disposed) {
+		return;
+	}
+	((FreeDesktopPropertiesDBusProxy*) self)->disposed = TRUE;
+	g_object_get (self, "connection", &connection, NULL);
+	dbus_connection_remove_filter (dbus_g_connection_get_connection (connection), free_desktop_properties_dbus_proxy_filter, self);
+	G_OBJECT_CLASS (free_desktop_properties_dbus_proxy_parent_class)->dispose (self);
+}
+
+
+static void free_desktop_properties_dbus_proxy_class_init (FreeDesktopPropertiesDBusProxyClass* klass) {
+	G_OBJECT_CLASS (klass)->constructor = free_desktop_properties_dbus_proxy_construct;
+	G_OBJECT_CLASS (klass)->dispose = free_desktop_properties_dbus_proxy_dispose;
+	G_OBJECT_CLASS (klass)->get_property = free_desktop_properties_dbus_proxy_get_property;
+	G_OBJECT_CLASS (klass)->set_property = free_desktop_properties_dbus_proxy_set_property;
+}
+
+
+static void free_desktop_properties_dbus_proxy_init (FreeDesktopPropertiesDBusProxy* self) {
+}
+
+
+static void free_desktop_properties_dbus_proxy_free_desktop_properties__interface_init (FreeDesktopPropertiesIface* iface) {
+}
+
+
+static void free_desktop_properties_dbus_proxy_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+}
+
+
+static void free_desktop_properties_dbus_proxy_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+}
+
+
+Mpris2Controller* mpris2_controller_construct (GType object_type, PlayerController* ctrl) {
+	Mpris2Controller * self;
+	g_return_val_if_fail (ctrl != NULL, NULL);
+	self = (Mpris2Controller*) g_object_new (object_type, "owner", ctrl, NULL);
+	return self;
+}
+
+
+Mpris2Controller* mpris2_controller_new (PlayerController* ctrl) {
+	return mpris2_controller_construct (TYPE_MPRIS2_CONTROLLER, ctrl);
+}
+
+
+static GValue* _g_value_dup (GValue* self) {
+	return g_boxed_copy (G_TYPE_VALUE, self);
+}
+
+
+static gpointer __g_value_dup0 (gpointer self) {
+	return self ? _g_value_dup (self) : NULL;
+}
+
+
+void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char* interface_source, GHashTable* changed_properties, char** invalid, int invalid_length1) {
+	gboolean _tmp0_ = FALSE;
+	GValue* play_v;
+	GValue* pos_v;
+	GValue* meta_v;
+	g_return_if_fail (self != NULL);
+	g_return_if_fail (interface_source != NULL);
+	g_return_if_fail (changed_properties != NULL);
+	g_debug ("mpris2-controller.vala:98: properties-changed for interface %s", interface_source);
+	if (changed_properties == NULL) {
+		_tmp0_ = TRUE;
+	} else {
+		_tmp0_ = g_str_has_prefix (interface_source, MPRIS2_CONTROLLER_root_interface) == FALSE;
+	}
+	if (_tmp0_) {
+		g_warning ("mpris2-controller.vala:100: Property-changed hash is null or this is a" \
+"n interface that concerns us");
+		return;
+	}
+	play_v = __g_value_dup0 ((GValue*) g_hash_table_lookup (changed_properties, "PlaybackStatus"));
+	if (play_v != NULL) {
+		char* state;
+		gint p;
+		TransportMenuitem* _tmp2_;
+		PlayerItem* _tmp1_;
+		ScrubMenuitem* _tmp4_;
+		PlayerItem* _tmp3_;
+		state = g_strdup (g_value_get_string (play_v));
+		g_debug ("mpris2-controller.vala:106: new playback state = %s", state);
+		p = mpris2_controller_determine_play_state (self, state);
+		transport_menuitem_change_play_state (_tmp2_ = (_tmp1_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT), IS_TRANSPORT_MENUITEM (_tmp1_) ? ((TransportMenuitem*) _tmp1_) : NULL), p);
+		_g_object_unref0 (_tmp2_);
+		scrub_menuitem_update_playstate (_tmp4_ = (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp3_) ? ((ScrubMenuitem*) _tmp3_) : NULL), p);
+		_g_object_unref0 (_tmp4_);
+		_g_free0 (state);
+	}
+	pos_v = __g_value_dup0 ((GValue*) g_hash_table_lookup (changed_properties, "Position"));
+	if (pos_v != NULL) {
+		gint64 pos;
+		ScrubMenuitem* _tmp6_;
+		PlayerItem* _tmp5_;
+		pos = g_value_get_int64 (pos_v);
+		g_debug ("mpris2-controller.vala:115: new position = %i", (gint) pos);
+		scrub_menuitem_update_position (_tmp6_ = (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp5_) ? ((ScrubMenuitem*) _tmp5_) : NULL), (gint32) pos);
+		_g_object_unref0 (_tmp6_);
+	}
+	meta_v = __g_value_dup0 ((GValue*) g_hash_table_lookup (changed_properties, "Metadata"));
+	if (meta_v != NULL) {
+		GHashTable* _tmp7_;
+		GeeHashSet* _tmp9_;
+		PlayerItem* _tmp8_;
+		GeeHashSet* _tmp12_;
+		GHashTable* _tmp11_;
+		PlayerItem* _tmp10_;
+		GeeHashSet* _tmp14_;
+		PlayerItem* _tmp13_;
+		gboolean _tmp15_ = FALSE;
+		GHashTable* _tmp16_;
+		gboolean _tmp17_;
+		char* _tmp24_;
+		ScrubMenuitem* _tmp23_;
+		PlayerItem* _tmp22_;
+		g_debug ("mpris2-controller.vala:121: metadata is not empty");
+		g_debug ("mpris2-controller.vala:122: artist : %s", g_value_get_string ((GValue*) g_hash_table_lookup (_tmp7_ = mpris_player_get_Metadata (self->priv->_player), "artist")));
+		_g_hash_table_unref0 (_tmp7_);
+		player_item_reset (_tmp8_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp9_ = metadata_menuitem_attributes_format ());
+		_g_object_unref0 (_tmp9_);
+		_g_object_unref0 (_tmp8_);
+		player_item_update (_tmp10_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp11_ = mpris_player_get_Metadata (self->priv->_player), _tmp12_ = metadata_menuitem_attributes_format ());
+		_g_object_unref0 (_tmp12_);
+		_g_hash_table_unref0 (_tmp11_);
+		_g_object_unref0 (_tmp10_);
+		player_item_reset (_tmp13_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp14_ = scrub_menuitem_attributes_format ());
+		_g_object_unref0 (_tmp14_);
+		_g_object_unref0 (_tmp13_);
+		if ((_tmp17_ = ((gint) g_utf8_strlen (g_value_get_string ((GValue*) g_hash_table_lookup (_tmp16_ = mpris_player_get_Metadata (self->priv->_player), "artist")), -1)) > 0, _g_hash_table_unref0 (_tmp16_), _tmp17_)) {
+			_tmp15_ = TRUE;
+		} else {
+			GHashTable* _tmp18_;
+			_tmp15_ = ((gint) g_utf8_strlen (g_value_get_string ((GValue*) g_hash_table_lookup (_tmp18_ = mpris_player_get_Metadata (self->priv->_player), "artist")), -1)) > 0;
+			_g_hash_table_unref0 (_tmp18_);
+		}
+		if (_tmp15_) {
+			GeeHashSet* _tmp21_;
+			GHashTable* _tmp20_;
+			PlayerItem* _tmp19_;
+			player_item_update (_tmp19_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp20_ = mpris_player_get_Metadata (self->priv->_player), _tmp21_ = scrub_menuitem_attributes_format ());
+			_g_object_unref0 (_tmp21_);
+			_g_hash_table_unref0 (_tmp20_);
+			_g_object_unref0 (_tmp19_);
+		}
+		scrub_menuitem_update_playstate (_tmp23_ = (_tmp22_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp22_) ? ((ScrubMenuitem*) _tmp22_) : NULL), mpris2_controller_determine_play_state (self, _tmp24_ = mpris_player_get_PlaybackStatus (self->priv->_player)));
+		_g_free0 (_tmp24_);
+		_g_object_unref0 (_tmp23_);
+	}
+	_g_free0 (meta_v);
+	_g_free0 (pos_v);
+	_g_free0 (play_v);
+}
+
+
+static gint mpris2_controller_determine_play_state (Mpris2Controller* self, const char* status) {
+	gint result = 0;
+	gboolean _tmp0_ = FALSE;
+	g_return_val_if_fail (self != NULL, 0);
+	g_return_val_if_fail (status != NULL, 0);
+	if (status == NULL) {
+		result = 1;
+		return result;
+	}
+	if (status != NULL) {
+		_tmp0_ = _vala_strcmp0 (status, "Playing") == 0;
+	} else {
+		_tmp0_ = FALSE;
+	}
+	if (_tmp0_) {
+		g_debug ("mpris2-controller.vala:142: determine play state - state = %s", status);
+		result = 0;
+		return result;
+	}
+	result = 1;
+	return result;
+}
+
+
+void mpris2_controller_initial_update (Mpris2Controller* self) {
+	gint32 status = 0;
+	char* _tmp0_;
+	gboolean _tmp1_;
+	TransportMenuitem* _tmp4_;
+	PlayerItem* _tmp3_;
+	GeeHashSet* _tmp7_;
+	GHashTable* _tmp6_;
+	PlayerItem* _tmp5_;
+	GeeHashSet* _tmp10_;
+	GHashTable* _tmp9_;
+	PlayerItem* _tmp8_;
+	g_return_if_fail (self != NULL);
+	if ((_tmp1_ = (_tmp0_ = mpris_player_get_PlaybackStatus (self->priv->_player)) == NULL, _g_free0 (_tmp0_), _tmp1_)) {
+		status = (gint32) 1;
+	} else {
+		char* _tmp2_;
+		status = (gint32) mpris2_controller_determine_play_state (self, _tmp2_ = mpris_player_get_PlaybackStatus (self->priv->_player));
+		_g_free0 (_tmp2_);
+	}
+	g_debug ("mpris2-controller.vala:157: initial update - play state %i", (gint) status);
+	transport_menuitem_change_play_state (_tmp4_ = (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT), IS_TRANSPORT_MENUITEM (_tmp3_) ? ((TransportMenuitem*) _tmp3_) : NULL), (gint) status);
+	_g_object_unref0 (_tmp4_);
+	player_item_update (_tmp5_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp6_ = mpris_player_get_Metadata (self->priv->_player), _tmp7_ = metadata_menuitem_attributes_format ());
+	_g_object_unref0 (_tmp7_);
+	_g_hash_table_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp5_);
+	player_item_update (_tmp8_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp9_ = mpris_player_get_Metadata (self->priv->_player), _tmp10_ = scrub_menuitem_attributes_format ());
+	_g_object_unref0 (_tmp10_);
+	_g_hash_table_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
+}
+
+
+void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuitemaction command) {
+	GError * _inner_error_;
+	g_return_if_fail (self != NULL);
+	_inner_error_ = NULL;
+	g_debug ("mpris2-controller.vala:168: transport_event input = %i", (gint) command);
+	if (command == TRANSPORT_MENUITEM_ACTION_PLAY_PAUSE) {
+		g_debug ("mpris2-controller.vala:170: transport_event PLAY_PAUSE");
+		{
+			mpris_player_PlayPause (self->priv->_player, &_inner_error_);
+			if (_inner_error_ != NULL) {
+				if (_inner_error_->domain == DBUS_GERROR) {
+					goto __catch2_dbus_gerror;
+				}
+				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+				return;
+			}
+		}
+		goto __finally2;
+		__catch2_dbus_gerror:
+		{
+			GError * _error_;
+			_error_ = _inner_error_;
+			_inner_error_ = NULL;
+			{
+				g_warning ("mpris2-controller.vala:175: DBus Error calling the player objects Play" \
+"Pause method %s", _error_->message);
+				_g_error_free0 (_error_);
+			}
+		}
+		__finally2:
+		if (_inner_error_ != NULL) {
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+			g_clear_error (&_inner_error_);
+			return;
+		}
+	} else {
+		if (command == TRANSPORT_MENUITEM_ACTION_PREVIOUS) {
+			{
+				mpris_player_Previous (self->priv->_player, &_inner_error_);
+				if (_inner_error_ != NULL) {
+					if (_inner_error_->domain == DBUS_GERROR) {
+						goto __catch3_dbus_gerror;
+					}
+					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+					g_clear_error (&_inner_error_);
+					return;
+				}
+			}
+			goto __finally3;
+			__catch3_dbus_gerror:
+			{
+				GError * _error_;
+				_error_ = _inner_error_;
+				_inner_error_ = NULL;
+				{
+					g_warning ("mpris2-controller.vala:184: DBus Error calling the player objects Prev" \
+"ious method %s", _error_->message);
+					_g_error_free0 (_error_);
+				}
+			}
+			__finally3:
+			if (_inner_error_ != NULL) {
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+				return;
+			}
+		} else {
+			if (command == TRANSPORT_MENUITEM_ACTION_NEXT) {
+				{
+					mpris_player_Next (self->priv->_player, &_inner_error_);
+					if (_inner_error_ != NULL) {
+						if (_inner_error_->domain == DBUS_GERROR) {
+							goto __catch4_dbus_gerror;
+						}
+						g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+						g_clear_error (&_inner_error_);
+						return;
+					}
+				}
+				goto __finally4;
+				__catch4_dbus_gerror:
+				{
+					GError * _error_;
+					_error_ = _inner_error_;
+					_inner_error_ = NULL;
+					{
+						g_warning ("mpris2-controller.vala:193: DBus Error calling the player objects Next" \
+" method %s", _error_->message);
+						_g_error_free0 (_error_);
+					}
+				}
+				__finally4:
+				if (_inner_error_ != NULL) {
+					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+					g_clear_error (&_inner_error_);
+					return;
+				}
+			}
+		}
+	}
+}
+
+
+/**
+TODO: SetPosition on the player object is not working with rhythmbox,
+  runtime error - "dbus function not supported"
+ */
+void mpris2_controller_set_position (Mpris2Controller* self, double position) {
+	GError * _inner_error_;
+	GHashTable* data;
+	GValue* time_value;
+	guint32 total_time;
+	double new_time_position;
+	GHashTable* _tmp0_;
+	GValue* _tmp1_;
+	GValue* v;
+	g_return_if_fail (self != NULL);
+	_inner_error_ = NULL;
+	g_debug ("mpris2-controller.vala:204: Set position with pos (0-100) %f", position);
+	data = mpris_player_get_Metadata (self->priv->_player);
+	time_value = __g_value_dup0 ((GValue*) g_hash_table_lookup (data, "time"));
+	if (time_value == NULL) {
+		g_warning ("mpris2-controller.vala:208: Can't fetch the duration of the track ther" \
+"efore cant set the position");
+		_g_free0 (time_value);
+		_g_hash_table_unref0 (data);
+		return;
+	}
+	total_time = (guint32) (g_value_get_uint (time_value) * 1000);
+	g_debug ("mpris2-controller.vala:213: total time of track = %i", (gint) total_time);
+	new_time_position = (total_time * position) / 100.0;
+	g_debug ("mpris2-controller.vala:215: new position = %f", new_time_position);
+	v = (_tmp1_ = __g_value_dup0 ((GValue*) g_hash_table_lookup (_tmp0_ = mpris_player_get_Metadata (self->priv->_player), "trackid")), _g_hash_table_unref0 (_tmp0_), _tmp1_);
+	if (v != NULL) {
+		if (G_VALUE_HOLDS (v, G_TYPE_STRING)) {
+			char* path;
+			g_debug ("mpris2-controller.vala:220: the trackid = %s", g_value_get_string (v));
+			path = g_strdup (g_value_get_string (v));
+			{
+			}
+			goto __finally5;
+			__catch5_dbus_gerror:
+			{
+				GError * e;
+				e = _inner_error_;
+				_inner_error_ = NULL;
+				{
+					g_error ("mpris2-controller.vala:226: DBus Error calling the player objects SetP" \
+"osition method %s", e->message);
+					_g_error_free0 (e);
+				}
+			}
+			__finally5:
+			if (_inner_error_ != NULL) {
+				_g_free0 (path);
+				_g_free0 (v);
+				_g_free0 (time_value);
+				_g_hash_table_unref0 (data);
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+				return;
+			}
+			_g_free0 (path);
+		}
+	}
+	_g_free0 (v);
+	_g_free0 (time_value);
+	_g_hash_table_unref0 (data);
+}
+
+
+void mpris2_controller_onSeeked (Mpris2Controller* self, gint64 position) {
+	PlayerItem* _tmp0_;
+	ScrubMenuitem* scrub;
+	g_return_if_fail (self != NULL);
+	g_debug ("mpris2-controller.vala:234: Seeked signal callback with pos = %i", ((gint) position) / 1000);
+	scrub = (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->priv->_owner->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), IS_SCRUB_MENUITEM (_tmp0_) ? ((ScrubMenuitem*) _tmp0_) : NULL);
+	scrub_menuitem_update_position (scrub, ((gint32) position) / 1000);
+	_g_object_unref0 (scrub);
+}
+
+
+gboolean mpris2_controller_connected (Mpris2Controller* self) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	g_return_val_if_fail (self != NULL, FALSE);
+	if (self->priv->_player != NULL) {
+		_tmp0_ = self->priv->_mpris2_root != NULL;
+	} else {
+		_tmp0_ = FALSE;
+	}
+	result = _tmp0_;
+	return result;
+}
+
+
+gboolean mpris2_controller_was_successfull (Mpris2Controller* self) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	g_return_val_if_fail (self != NULL, FALSE);
+	if (self->priv->_mpris2_root == NULL) {
+		_tmp0_ = TRUE;
+	} else {
+		_tmp0_ = self->priv->_player == NULL;
+	}
+	if (_tmp0_) {
+		result = FALSE;
+		return result;
+	}
+	result = TRUE;
+	return result;
+}
+
+
+void mpris2_controller_expose (Mpris2Controller* self) {
+	GError * _inner_error_;
+	g_return_if_fail (self != NULL);
+	_inner_error_ = NULL;
+	if (mpris2_controller_connected (self) == TRUE) {
+		{
+			mpris_root_Raise (self->priv->_mpris2_root, &_inner_error_);
+			if (_inner_error_ != NULL) {
+				if (_inner_error_->domain == DBUS_GERROR) {
+					goto __catch6_dbus_gerror;
+				}
+				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+				return;
+			}
+		}
+		goto __finally6;
+		__catch6_dbus_gerror:
+		{
+			GError * e;
+			e = _inner_error_;
+			_inner_error_ = NULL;
+			{
+				g_error ("mpris2-controller.vala:259: Exception thrown while calling root functi" \
+"on Raise - %s", e->message);
+				_g_error_free0 (e);
+			}
+		}
+		__finally6:
+		if (_inner_error_ != NULL) {
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+			g_clear_error (&_inner_error_);
+			return;
+		}
+	}
+}
+
+
+MprisRoot* mpris2_controller_get_mpris2_root (Mpris2Controller* self) {
+	MprisRoot* result;
+	g_return_val_if_fail (self != NULL, NULL);
+	result = self->priv->_mpris2_root;
+	return result;
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+	return self ? g_object_ref (self) : NULL;
+}
+
+
+static void mpris2_controller_set_mpris2_root (Mpris2Controller* self, MprisRoot* value) {
+	MprisRoot* _tmp0_;
+	g_return_if_fail (self != NULL);
+	self->priv->_mpris2_root = (_tmp0_ = _g_object_ref0 (value), _g_object_unref0 (self->priv->_mpris2_root), _tmp0_);
+	g_object_notify ((GObject *) self, "mpris2-root");
+}
+
+
+MprisPlayer* mpris2_controller_get_player (Mpris2Controller* self) {
+	MprisPlayer* result;
+	g_return_val_if_fail (self != NULL, NULL);
+	result = self->priv->_player;
+	return result;
+}
+
+
+static void mpris2_controller_set_player (Mpris2Controller* self, MprisPlayer* value) {
+	MprisPlayer* _tmp0_;
+	g_return_if_fail (self != NULL);
+	self->priv->_player = (_tmp0_ = _g_object_ref0 (value), _g_object_unref0 (self->priv->_player), _tmp0_);
+	g_object_notify ((GObject *) self, "player");
+}
+
+
+PlayerController* mpris2_controller_get_owner (Mpris2Controller* self) {
+	PlayerController* result;
+	g_return_val_if_fail (self != NULL, NULL);
+	result = self->priv->_owner;
+	return result;
+}
+
+
+static void mpris2_controller_set_owner (Mpris2Controller* self, PlayerController* value) {
+	PlayerController* _tmp0_;
+	g_return_if_fail (self != NULL);
+	self->priv->_owner = (_tmp0_ = _g_object_ref0 (value), _g_object_unref0 (self->priv->_owner), _tmp0_);
+	g_object_notify ((GObject *) self, "owner");
+}
+
+
+FreeDesktopProperties* mpris2_controller_get_properties_interface (Mpris2Controller* self) {
+	FreeDesktopProperties* result;
+	g_return_val_if_fail (self != NULL, NULL);
+	result = self->priv->_properties_interface;
+	return result;
+}
+
+
+static void mpris2_controller_set_properties_interface (Mpris2Controller* self, FreeDesktopProperties* value) {
+	FreeDesktopProperties* _tmp0_;
+	g_return_if_fail (self != NULL);
+	self->priv->_properties_interface = (_tmp0_ = _g_object_ref0 (value), _g_object_unref0 (self->priv->_properties_interface), _tmp0_);
+	g_object_notify ((GObject *) self, "properties-interface");
+}
+
+
+static void _mpris2_controller_onSeeked_mpris_player_seeked (MprisPlayer* _sender, gint64 new_position, gpointer self) {
+	mpris2_controller_onSeeked (self, new_position);
+}
+
+
+static void _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed (FreeDesktopProperties* _sender, const char* source, GHashTable* changed_properties, char** invalid, int invalid_length1, gpointer self) {
+	mpris2_controller_property_changed_cb (self, source, changed_properties, invalid, invalid_length1);
+}
+
+
+static GObject * mpris2_controller_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
+	GObject * obj;
+	GObjectClass * parent_class;
+	Mpris2Controller * self;
+	GError * _inner_error_;
+	parent_class = G_OBJECT_CLASS (mpris2_controller_parent_class);
+	obj = parent_class->constructor (type, n_construct_properties, construct_properties);
+	self = MPRIS2_CONTROLLER (obj);
+	_inner_error_ = NULL;
+	{
+		{
+			DBusGConnection* connection;
+			MprisRoot* _tmp245_;
+			char* _tmp244_;
+			char* _tmp243_;
+			char* _tmp242_;
+			char* _tmp241_;
+			char* _tmp240_;
+			char* _tmp239_;
+			MprisPlayer* _tmp253_;
+			char* _tmp252_;
+			char* _tmp251_;
+			char* _tmp250_;
+			char* _tmp249_;
+			char* _tmp248_;
+			char* _tmp247_;
+			char* _tmp246_;
+			FreeDesktopProperties* _tmp260_;
+			char* _tmp259_;
+			char* _tmp258_;
+			char* _tmp257_;
+			char* _tmp256_;
+			char* _tmp255_;
+			char* _tmp254_;
+			connection = dbus_g_bus_get (DBUS_BUS_SESSION, &_inner_error_);
+			if (_inner_error_ != NULL) {
+				if (_inner_error_->domain == DBUS_GERROR) {
+					goto __catch7_dbus_gerror;
+				}
+				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+			}
+			mpris2_controller_set_mpris2_root (self, _tmp245_ = mpris_root_dbus_proxy_new (connection, _tmp244_ = g_strconcat (_tmp242_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp243_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
+			_g_object_unref0 (_tmp245_);
+			_g_free0 (_tmp244_);
+			_g_free0 (_tmp243_);
+			_g_free0 (_tmp242_);
+			_g_free0 (_tmp241_);
+			_g_free0 (_tmp240_);
+			_g_free0 (_tmp239_);
+			mpris2_controller_set_player (self, _tmp253_ = mpris_player_dbus_proxy_new (connection, _tmp252_ = g_strconcat (_tmp250_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp251_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
+			_g_object_unref0 (_tmp253_);
+			_g_free0 (_tmp252_);
+			_g_free0 (_tmp251_);
+			_g_free0 (_tmp250_);
+			_g_free0 (_tmp249_);
+			_g_free0 (_tmp248_);
+			_g_free0 (_tmp247_);
+			_g_free0 (_tmp246_);
+			g_signal_connect_object (self->priv->_player, "seeked", (GCallback) _mpris2_controller_onSeeked_mpris_player_seeked, self, 0);
+			mpris2_controller_set_properties_interface (self, _tmp260_ = free_desktop_properties_dbus_proxy_new (connection, _tmp259_ = g_strconcat (_tmp257_ = g_strconcat (MPRIS2_CONTROLLER_root_interface, ".", NULL), _tmp258_ = g_utf8_strdown (player_controller_get_name (self->priv->_owner), -1), NULL), "/org/mpris/MediaPlayer2"));
+			_g_object_unref0 (_tmp260_);
+			_g_free0 (_tmp259_);
+			_g_free0 (_tmp258_);
+			_g_free0 (_tmp257_);
+			_g_free0 (_tmp256_);
+			_g_free0 (_tmp255_);
+			_g_free0 (_tmp254_);
+			g_signal_connect_object (self->priv->_properties_interface, "properties-changed", (GCallback) _mpris2_controller_property_changed_cb_free_desktop_properties_properties_changed, self, 0);
+			_dbus_g_connection_unref0 (connection);
+		}
+		goto __finally7;
+		__catch7_dbus_gerror:
+		{
+			GError * e;
+			e = _inner_error_;
+			_inner_error_ = NULL;
+			{
+				g_error ("mpris2-controller.vala:92: Problems connecting to the session bus - %s", e->message);
+				_g_error_free0 (e);
+			}
+		}
+		__finally7:
+		if (_inner_error_ != NULL) {
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+			g_clear_error (&_inner_error_);
+		}
+	}
+	return obj;
+}
+
+
+static void mpris2_controller_class_init (Mpris2ControllerClass * klass) {
+	mpris2_controller_parent_class = g_type_class_peek_parent (klass);
+	g_type_class_add_private (klass, sizeof (Mpris2ControllerPrivate));
+	G_OBJECT_CLASS (klass)->get_property = mpris2_controller_get_property;
+	G_OBJECT_CLASS (klass)->set_property = mpris2_controller_set_property;
+	G_OBJECT_CLASS (klass)->constructor = mpris2_controller_constructor;
+	G_OBJECT_CLASS (klass)->finalize = mpris2_controller_finalize;
+	g_object_class_install_property (G_OBJECT_CLASS (klass), MPRIS2_CONTROLLER_MPRIS2_ROOT, g_param_spec_object ("mpris2-root", "mpris2-root", "mpris2-root", TYPE_MPRIS_ROOT, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), MPRIS2_CONTROLLER_PLAYER, g_param_spec_object ("player", "player", "player", TYPE_MPRIS_PLAYER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), MPRIS2_CONTROLLER_OWNER, g_param_spec_object ("owner", "owner", "owner", TYPE_PLAYER_CONTROLLER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), MPRIS2_CONTROLLER_PROPERTIES_INTERFACE, g_param_spec_object ("properties-interface", "properties-interface", "properties-interface", TYPE_FREE_DESKTOP_PROPERTIES, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+}
+
+
+static void mpris2_controller_instance_init (Mpris2Controller * self) {
+	self->priv = MPRIS2_CONTROLLER_GET_PRIVATE (self);
+}
+
+
+static void mpris2_controller_finalize (GObject* obj) {
+	Mpris2Controller * self;
+	self = MPRIS2_CONTROLLER (obj);
+	_g_object_unref0 (self->priv->_mpris2_root);
+	_g_object_unref0 (self->priv->_player);
+	_g_object_unref0 (self->priv->_owner);
+	_g_object_unref0 (self->priv->_properties_interface);
+	G_OBJECT_CLASS (mpris2_controller_parent_class)->finalize (obj);
+}
+
+
+GType mpris2_controller_get_type (void) {
+	static volatile gsize mpris2_controller_type_id__volatile = 0;
+	if (g_once_init_enter (&mpris2_controller_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (Mpris2ControllerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) mpris2_controller_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Mpris2Controller), 0, (GInstanceInitFunc) mpris2_controller_instance_init, NULL };
+		GType mpris2_controller_type_id;
+		mpris2_controller_type_id = g_type_register_static (G_TYPE_OBJECT, "Mpris2Controller", &g_define_type_info, 0);
+		g_once_init_leave (&mpris2_controller_type_id__volatile, mpris2_controller_type_id);
+	}
+	return mpris2_controller_type_id__volatile;
+}
+
+
+static void mpris2_controller_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	Mpris2Controller * self;
+	self = MPRIS2_CONTROLLER (object);
+	switch (property_id) {
+		case MPRIS2_CONTROLLER_MPRIS2_ROOT:
+		g_value_set_object (value, mpris2_controller_get_mpris2_root (self));
+		break;
+		case MPRIS2_CONTROLLER_PLAYER:
+		g_value_set_object (value, mpris2_controller_get_player (self));
+		break;
+		case MPRIS2_CONTROLLER_OWNER:
+		g_value_set_object (value, mpris2_controller_get_owner (self));
+		break;
+		case MPRIS2_CONTROLLER_PROPERTIES_INTERFACE:
+		g_value_set_object (value, mpris2_controller_get_properties_interface (self));
+		break;
+		default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+		break;
+	}
+}
+
+
+static void mpris2_controller_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	Mpris2Controller * self;
+	self = MPRIS2_CONTROLLER (object);
+	switch (property_id) {
+		case MPRIS2_CONTROLLER_MPRIS2_ROOT:
+		mpris2_controller_set_mpris2_root (self, g_value_get_object (value));
+		break;
+		case MPRIS2_CONTROLLER_PLAYER:
+		mpris2_controller_set_player (self, g_value_get_object (value));
+		break;
+		case MPRIS2_CONTROLLER_OWNER:
+		mpris2_controller_set_owner (self, g_value_get_object (value));
+		break;
+		case MPRIS2_CONTROLLER_PROPERTIES_INTERFACE:
+		mpris2_controller_set_properties_interface (self, g_value_get_object (value));
+		break;
+		default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+		break;
+	}
+}
+
+
+static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	if ((array != NULL) && (destroy_func != NULL)) {
+		int i;
+		for (i = 0; i < array_length; i = i + 1) {
+			if (((gpointer*) array)[i] != NULL) {
+				destroy_func (((gpointer*) array)[i]);
+			}
+		}
+	}
+}
+
+
+static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+	_vala_array_destroy (array, array_length, destroy_func);
+	g_free (array);
+}
+
+
+static int _vala_strcmp0 (const char * str1, const char * str2) {
+	if (str1 == NULL) {
+		return -(str1 != str2);
+	}
+	if (str2 == NULL) {
+		return str1 != str2;
+	}
+	return strcmp (str1, str2);
+}
+
+
+
+static void g_cclosure_user_marshal_VOID__INT64 (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+	typedef void (*GMarshalFunc_VOID__INT64) (gpointer data1, gint64 arg_1, gpointer data2);
+	register GMarshalFunc_VOID__INT64 callback;
+	register GCClosure * cc;
+	register gpointer data1, data2;
+	cc = (GCClosure *) closure;
+	g_return_if_fail (n_param_values == 2);
+	if (G_CCLOSURE_SWAP_DATA (closure)) {
+		data1 = closure->data;
+		data2 = param_values->data[0].v_pointer;
+	} else {
+		data1 = param_values->data[0].v_pointer;
+		data2 = closure->data;
+	}
+	callback = (GMarshalFunc_VOID__INT64) (marshal_data ? marshal_data : cc->callback);
+	callback (data1, g_value_get_int64 (param_values + 1), data2);
+}
+
+
+static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+	typedef void (*GMarshalFunc_VOID__STRING_BOXED_BOXED_INT) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gint arg_4, gpointer data2);
+	register GMarshalFunc_VOID__STRING_BOXED_BOXED_INT callback;
+	register GCClosure * cc;
+	register gpointer data1, data2;
+	cc = (GCClosure *) closure;
+	g_return_if_fail (n_param_values == 5);
+	if (G_CCLOSURE_SWAP_DATA (closure)) {
+		data1 = closure->data;
+		data2 = param_values->data[0].v_pointer;
+	} else {
+		data1 = param_values->data[0].v_pointer;
+		data2 = closure->data;
+	}
+	callback = (GMarshalFunc_VOID__STRING_BOXED_BOXED_INT) (marshal_data ? marshal_data : cc->callback);
+	callback (data1, g_value_get_string (param_values + 1), g_value_get_boxed (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_int (param_values + 4), data2);
+}
+
+
+
diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala
new file mode 100644
index 0000000..65d881a
--- /dev/null
+++ b/src/mpris2-controller.vala
@@ -0,0 +1,266 @@
+/*
+This service primarily controls PulseAudio and is driven by the sound indicator menu on the panel.
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+using DBus;
+
+[DBus (name = "org.mpris.MediaPlayer2")]
+public interface MprisRoot : DBus.Object {
+	// properties
+	public abstract bool HasTracklist{owned get; set;}
+	public abstract bool CanQuit{owned get; set;}
+	public abstract bool CanRaise{owned get; set;}
+	public abstract string Identity{owned get; set;}
+	public abstract string DesktopEntry{owned get; set;}	
+	// methods
+	public abstract void Quit() throws DBus.Error;
+	public abstract void Raise() throws DBus.Error;
+}
+
+[DBus (name = "org.mpris.MediaPlayer2.Player")]
+public interface MprisPlayer : DBus.Object {
+
+	// properties
+	public abstract HashTable<string, Value?> Metadata{owned get; set;}
+	public abstract int32 Position{owned get; set;}
+	public abstract string PlaybackStatus{owned get; set;}	
+	// methods
+	public abstract void SetPosition(DBus.ObjectPath path, int64 pos) throws DBus.Error;
+	public abstract void PlayPause() throws DBus.Error;
+	public abstract void Pause() throws DBus.Error;
+	public abstract void Next() throws DBus.Error;
+	public abstract void Previous() throws DBus.Error;
+	// signals
+	public signal void Seeked(int64 new_position);
+}
+
+[DBus (name = "org.freedesktop.DBus.Properties")]
+public interface FreeDesktopProperties : DBus.Object{
+	// signals
+	public signal void PropertiesChanged(string source, HashTable<string, Value?> changed_properties, string[] invalid);
+}
+
+/*
+ This class will entirely replace mpris-controller.vala hence why there is no
+ point in trying to get encorporate both into the same object model. 
+ */
+public class Mpris2Controller : GLib.Object
+{		
+	public static const string root_interface = "org.mpris.MediaPlayer2" ;	
+	public MprisRoot mpris2_root {get; construct;}		
+	public MprisPlayer player {get; construct;}		
+	public PlayerController owner {get; construct;}
+	public FreeDesktopProperties properties_interface {get; construct;}
+	
+	public Mpris2Controller(PlayerController ctrl)
+	{
+		GLib.Object(owner: ctrl);
+	}
+	
+	construct{
+    try {
+      var connection = DBus.Bus.get (DBus.BusType.SESSION);
+			this.mpris2_root = (MprisRoot) connection.get_object (root_interface.concat(".").concat(this.owner.name.down()),
+				                                             "/org/mpris/MediaPlayer2",
+				                                             root_interface);						
+			this.player = (MprisPlayer) connection.get_object (root_interface.concat(".").concat(this.owner.name.down()),
+				                                               "/org/mpris/MediaPlayer2",
+				                                               root_interface.concat(".Player"));						
+			this.player.Seeked += onSeeked;
+
+			this.properties_interface = (FreeDesktopProperties) connection.get_object(root_interface.concat(".").concat(this.owner.name.down()),
+			                                                                          "/org/mpris/MediaPlayer2",
+			                                                                          "org.freedesktop.DBus.Properties");
+			this.properties_interface.PropertiesChanged += property_changed_cb;			
+			
+		} catch (DBus.Error e) {
+      error("Problems connecting to the session bus - %s", e.message);
+    }		
+	}
+
+	public void property_changed_cb(string interface_source, HashTable<string, Value?> changed_properties, string[] invalid )
+	{	
+		debug("properties-changed for interface %s", interface_source);
+		if(changed_properties == null || interface_source.has_prefix(this.root_interface) == false){
+			warning("Property-changed hash is null or this is an interface that concerns us");
+			return;
+		}
+		Value? play_v = changed_properties.lookup("PlaybackStatus");
+		if(play_v != null){
+			string state = play_v.get_string();		
+			debug("new playback state = %s", state);			
+			int p = this.determine_play_state(state);
+			(this.owner.custom_items[PlayerController.widget_order.TRANSPORT] as TransportMenuitem).change_play_state(p);			
+			(this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem).update_playstate(p);			
+		}
+		
+		Value? pos_v = changed_properties.lookup("Position");
+		if(pos_v != null){
+			int64 pos = pos_v.get_int64();
+			debug("new position = %i", (int)pos);
+			(this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem).update_position((int32)pos);						
+		}
+
+		Value? meta_v = changed_properties.lookup("Metadata");
+		if(meta_v != null){
+			debug("metadata is not empty");
+			debug("artist : %s", this.player.Metadata.lookup("artist").get_string());			
+			this.owner.custom_items[PlayerController.widget_order.METADATA].reset(MetadataMenuitem.attributes_format());			
+			this.owner.custom_items[PlayerController.widget_order.METADATA].update(this.player.Metadata,
+			                          																						 MetadataMenuitem.attributes_format());			
+			this.owner.custom_items[PlayerController.widget_order.SCRUB].reset(ScrubMenuitem.attributes_format());	
+			if((int)this.player.Metadata.lookup("artist").get_string().len() > 0 ||
+			   (int)this.player.Metadata.lookup("artist").get_string().len() > 0){
+				this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.player.Metadata,
+					                    																							ScrubMenuitem.attributes_format());			
+			}
+			(this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem).update_playstate(this.determine_play_state(this.player.PlaybackStatus));			
+			
+		}
+	}
+	
+	private int determine_play_state(string status){
+		if(status == null)
+			return 1;
+		
+		if(status != null && status == "Playing"){
+			debug("determine play state - state = %s", status);
+			return 0;
+		}
+		return 1;		
+	}
+	
+	public void initial_update()
+	{
+		int32 status;
+		if(this.player.PlaybackStatus == null){
+			status = 1;
+		}
+		else{
+			status = determine_play_state(this.player.PlaybackStatus);
+		}
+		debug("initial update - play state %i", status);
+		
+		(this.owner.custom_items[PlayerController.widget_order.TRANSPORT] as TransportMenuitem).change_play_state(status);
+		this.owner.custom_items[PlayerController.widget_order.METADATA].update(this.player.Metadata,
+			                          MetadataMenuitem.attributes_format());
+		this.owner.custom_items[PlayerController.widget_order.SCRUB].update(this.player.Metadata,
+			                      ScrubMenuitem.attributes_format());		
+	}
+
+	public void transport_event(TransportMenuitem.action command)
+	{		
+		debug("transport_event input = %i", (int)command);
+		if(command == TransportMenuitem.action.PLAY_PAUSE){
+			debug("transport_event PLAY_PAUSE");
+			try{
+				this.player.PlayPause();							
+			}
+			catch(DBus.Error error){
+				warning("DBus Error calling the player objects PlayPause method %s",
+				        error.message);
+			}			
+		}
+		else if(command == TransportMenuitem.action.PREVIOUS){
+			try{
+				this.player.Previous();
+			}
+			catch(DBus.Error error){
+				warning("DBus Error calling the player objects Previous method %s",
+				        error.message);
+			}							
+		}
+		else if(command == TransportMenuitem.action.NEXT){
+			try{
+				this.player.Next();
+			}
+			catch(DBus.Error error){
+				warning("DBus Error calling the player objects Next method %s",
+				      	error.message);
+			}								
+		}	
+	}
+	/**
+		TODO: SetPosition on the player object is not working with rhythmbox,
+	  runtime error - "dbus function not supported"
+	 */
+	public void set_position(double position)
+	{			
+		debug("Set position with pos (0-100) %f", position);
+		HashTable<string, Value?> data = this.player.Metadata;
+		Value? time_value = data.lookup("time");
+		if(time_value == null){
+			warning("Can't fetch the duration of the track therefore cant set the position");
+			return;
+		}
+		// work in microseconds (scale up by 10 TTP-of 3)
+		uint32 total_time = time_value.get_uint() * 1000;
+		debug("total time of track = %i", (int)total_time);				
+		double new_time_position = total_time * position/100.0;
+		debug("new position = %f", (new_time_position));		
+
+		Value? v = this.player.Metadata.lookup("trackid");
+		if(v != null){
+			if(v.holds (typeof (string))){
+				debug("the trackid = %s", v.get_string());
+				DBus.ObjectPath path = new ObjectPath(v.get_string());
+				try{
+					//this.player.SetPosition(path, (int64)(new_time_position));
+				}
+				catch(DBus.Error e){
+					error("DBus Error calling the player objects SetPosition method %s",
+						     e.message);
+				}							
+			}
+		}			        
+	}
+
+	public void onSeeked(int64 position){
+		debug("Seeked signal callback with pos = %i", (int)position/1000);
+		ScrubMenuitem scrub = this.owner.custom_items[PlayerController.widget_order.SCRUB] as ScrubMenuitem;
+		scrub.update_position((int32)position/1000);			
+	}
+	
+	public bool connected()
+	{
+		return (this.player != null && this.mpris2_root != null);
+	}
+
+		
+	public bool was_successfull(){
+		if(this.mpris2_root == null ||this.player == null){
+			return false;
+		}
+		return true;
+	}
+
+	public void expose()
+	{
+		if(this.connected() == true){
+			try{
+				this.mpris2_root.Raise();
+			}
+			catch(DBus.Error e){
+				error("Exception thrown while calling root function Raise - %s", e.message);
+			}
+		}
+	}
+}
+
+
+
diff --git a/src/music-player-bridge.c b/src/music-player-bridge.c
index 6579e17..3e83e7c 100644
--- a/src/music-player-bridge.c
+++ b/src/music-player-bridge.c
@@ -1,4 +1,4 @@
-/* music-player-bridge.c generated by valac, the Vala compiler
+/* music-player-bridge.c generated by valac 0.9.5, the Vala compiler
  * generated from music-player-bridge.vala, do not modify */
 
 /*
@@ -129,13 +129,13 @@ GType player_controller_state_get_type (void) G_GNUC_CONST;
 PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
 PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
 static void music_player_bridge_try_to_add_inactive_familiar_clients (MusicPlayerBridge* self);
-#define PLAYER_CONTROLLER_WIDGET_QUANTITY 6
+#define PLAYER_CONTROLLER_WIDGET_QUANTITY 5
 static gboolean music_player_bridge_server_is_not_of_interest (MusicPlayerBridge* self, const char* type);
 void player_controller_update_state (PlayerController* self, PlayerControllerstate new_state);
 void player_controller_activate (PlayerController* self);
 GAppInfo* player_controller_get_app_info (PlayerController* self);
 static void music_player_bridge_desktop_info_callback (MusicPlayerBridge* self, IndicateListenerServer* server, char* path, void* data);
-void player_controller_vanish (PlayerController* self);
+void player_controller_hibernate (PlayerController* self);
 gboolean familiar_players_db_already_familiar (FamiliarPlayersDB* self, const char* desktop);
 void familiar_players_db_insert (FamiliarPlayersDB* self, const char* desktop);
 GAppInfo* music_player_bridge_create_app_info (const char* path);
@@ -365,11 +365,9 @@ void music_player_bridge_on_server_removed (MusicPlayerBridge* self, IndicateLis
 	}
 	if (_tmp3_) {
 		PlayerController* _tmp4_;
-		player_controller_vanish (_tmp4_ = (PlayerController*) gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, client_name));
+		player_controller_hibernate (_tmp4_ = (PlayerController*) gee_abstract_map_get ((GeeAbstractMap*) self->priv->registered_clients, client_name));
 		_g_object_unref0 (_tmp4_);
-		gee_map_remove ((GeeMap*) self->priv->registered_clients, client_name, NULL);
-		g_debug ("music-player-bridge.vala:121: Successively removed menu_item for clien" \
-"t %s from registered_clients", client_name);
+		g_debug ("music-player-bridge.vala:120: Successively offlined client %s", client_name);
 	}
 	_g_free0 (client_name);
 }
@@ -393,7 +391,7 @@ static gboolean music_player_bridge_server_is_not_of_interest (MusicPlayerBridge
 		return result;
 	}
 	if (string_contains (type, "music") == FALSE) {
-		g_debug ("music-player-bridge.vala:129: server is of no interest,  it is not an " \
+		g_debug ("music-player-bridge.vala:127: server is of no interest,  it is not an " \
 "music server");
 		result = TRUE;
 		return result;
@@ -417,7 +415,7 @@ static void music_player_bridge_desktop_info_callback (MusicPlayerBridge* self,
 	}
 	if (_tmp1_) {
 		GAppInfo* app_info;
-		g_debug ("music-player-bridge.vala:140: About to store desktop file path: %s", path);
+		g_debug ("music-player-bridge.vala:138: About to store desktop file path: %s", path);
 		familiar_players_db_insert (bridge->priv->playersDB, path);
 		app_info = music_player_bridge_create_app_info (path);
 		if (app_info != NULL) {
@@ -427,13 +425,13 @@ static void music_player_bridge_desktop_info_callback (MusicPlayerBridge* self,
 			PlayerController* ctrl;
 			ctrl = (_tmp4_ = (PlayerController*) gee_abstract_map_get ((GeeAbstractMap*) bridge->priv->registered_clients, _tmp3_ = string_strip (_tmp2_ = g_utf8_strdown (g_app_info_get_name (app_info), -1))), _g_free0 (_tmp3_), _g_free0 (_tmp2_), _tmp4_);
 			g_object_set ((GObject*) ctrl, "app_info", app_info, NULL);
-			g_debug ("music-player-bridge.vala:146: successfully created appinfo from path a" \
+			g_debug ("music-player-bridge.vala:144: successfully created appinfo from path a" \
 "nd set it on the respective instance");
 			_g_object_unref0 (ctrl);
 		}
 		_g_object_unref0 (app_info);
 	} else {
-		g_debug ("music-player-bridge.vala:150: Ignoring desktop file path because its e" \
+		g_debug ("music-player-bridge.vala:148: Ignoring desktop file path because its e" \
 "ither invalid of the db cache file has it already: %s", path);
 	}
 	_g_object_unref0 (bridge);
@@ -452,20 +450,20 @@ void music_player_bridge_set_root_menu_item (MusicPlayerBridge* self, DbusmenuMe
 
 void music_player_bridge_on_server_count_changed (MusicPlayerBridge* self, IndicateListenerServer* object, guint i) {
 	g_return_if_fail (self != NULL);
-	g_debug ("music-player-bridge.vala:162: MusicPlayerBridge-> on_server_count_chan" \
+	g_debug ("music-player-bridge.vala:160: MusicPlayerBridge-> on_server_count_chan" \
 "ged with value %u", i);
 }
 
 
 void music_player_bridge_on_indicator_added (MusicPlayerBridge* self, IndicateListenerServer* object, IndicateListenerIndicator* p0) {
 	g_return_if_fail (self != NULL);
-	g_debug ("music-player-bridge.vala:166: MusicPlayerBridge-> on_indicator_added");
+	g_debug ("music-player-bridge.vala:164: MusicPlayerBridge-> on_indicator_added");
 }
 
 
 void music_player_bridge_on_indicator_removed (MusicPlayerBridge* self, IndicateListenerServer* object, IndicateListenerIndicator* p0) {
 	g_return_if_fail (self != NULL);
-	g_debug ("music-player-bridge.vala:171: MusicPlayerBridge -> on_indicator_remove" \
+	g_debug ("music-player-bridge.vala:169: MusicPlayerBridge -> on_indicator_remove" \
 "d");
 }
 
@@ -473,7 +471,7 @@ void music_player_bridge_on_indicator_removed (MusicPlayerBridge* self, Indicate
 void music_player_bridge_on_indicator_modified (MusicPlayerBridge* self, IndicateListenerServer* object, IndicateListenerIndicator* p0, const char* s) {
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (s != NULL);
-	g_debug ("music-player-bridge.vala:176: MusicPlayerBridge -> indicator_modified " \
+	g_debug ("music-player-bridge.vala:174: MusicPlayerBridge -> indicator_modified " \
 "with vale %s", s);
 }
 
@@ -486,7 +484,7 @@ GAppInfo* music_player_bridge_create_app_info (const char* path) {
 	g_return_val_if_fail (path != NULL, NULL);
 	info = g_desktop_app_info_new_from_filename (path);
 	if (path == NULL) {
-		g_warning ("music-player-bridge.vala:183: Could not create a desktopappinfo instan" \
+		g_warning ("music-player-bridge.vala:181: Could not create a desktopappinfo instan" \
 "ce from app: %s", path);
 		result = NULL;
 		_g_object_unref0 (info);
diff --git a/src/music-player-bridge.h b/src/music-player-bridge.h
index 6f08b8e..1670d28 100644
--- a/src/music-player-bridge.h
+++ b/src/music-player-bridge.h
@@ -1,4 +1,4 @@
-/* music-player-bridge.h generated by valac, the Vala compiler, do not modify */
+/* music-player-bridge.h generated by valac 0.9.5, the Vala compiler, do not modify */
 
 
 #ifndef __MUSIC_PLAYER_BRIDGE_H__
@@ -106,6 +106,21 @@ typedef struct _TitleMenuitemClass TitleMenuitemClass;
 typedef struct _TitleMenuitemPrivate TitleMenuitemPrivate;
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
+
+#define PLAYER_CONTROLLER_TYPE_WIDGET_ORDER (player_controller_widget_order_get_type ())
+
+#define PLAYER_CONTROLLER_TYPE_STATE (player_controller_state_get_type ())
+typedef struct _MprisBridgePrivate MprisBridgePrivate;
+
 #define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
 #define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
 #define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
@@ -115,22 +130,42 @@ typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
 typedef struct _MprisController MprisController;
 typedef struct _MprisControllerClass MprisControllerClass;
+typedef struct _MprisControllerPrivate MprisControllerPrivate;
 
-#define PLAYER_CONTROLLER_TYPE_WIDGET_ORDER (player_controller_widget_order_get_type ())
+#define TYPE_MPRIS_ROOT (mpris_root_get_type ())
+#define MPRIS_ROOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_ROOT, MprisRoot))
+#define IS_MPRIS_ROOT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_ROOT))
+#define MPRIS_ROOT_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_MPRIS_ROOT, MprisRootIface))
 
-#define PLAYER_CONTROLLER_TYPE_STATE (player_controller_state_get_type ())
-typedef struct _MprisControllerPrivate MprisControllerPrivate;
+typedef struct _MprisRoot MprisRoot;
+typedef struct _MprisRootIface MprisRootIface;
+
+#define TYPE_MPRIS_PLAYER (mpris_player_get_type ())
+#define MPRIS_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_PLAYER, MprisPlayer))
+#define IS_MPRIS_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_PLAYER))
+#define MPRIS_PLAYER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_MPRIS_PLAYER, MprisPlayerIface))
+
+typedef struct _MprisPlayer MprisPlayer;
+typedef struct _MprisPlayerIface MprisPlayerIface;
 
-#define TYPE_MPRIS_CONTROLLER_V2 (mpris_controller_v2_get_type ())
-#define MPRIS_CONTROLLER_V2(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER_V2, MprisControllerV2))
-#define MPRIS_CONTROLLER_V2_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER_V2, MprisControllerV2Class))
-#define IS_MPRIS_CONTROLLER_V2(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER_V2))
-#define IS_MPRIS_CONTROLLER_V2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER_V2))
-#define MPRIS_CONTROLLER_V2_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER_V2, MprisControllerV2Class))
+#define TYPE_FREE_DESKTOP_PROPERTIES (free_desktop_properties_get_type ())
+#define FREE_DESKTOP_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FREE_DESKTOP_PROPERTIES, FreeDesktopProperties))
+#define IS_FREE_DESKTOP_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FREE_DESKTOP_PROPERTIES))
+#define FREE_DESKTOP_PROPERTIES_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_FREE_DESKTOP_PROPERTIES, FreeDesktopPropertiesIface))
 
-typedef struct _MprisControllerV2 MprisControllerV2;
-typedef struct _MprisControllerV2Class MprisControllerV2Class;
-typedef struct _MprisControllerV2Private MprisControllerV2Private;
+typedef struct _FreeDesktopProperties FreeDesktopProperties;
+typedef struct _FreeDesktopPropertiesIface FreeDesktopPropertiesIface;
+
+#define TYPE_MPRIS2_CONTROLLER (mpris2_controller_get_type ())
+#define MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2Controller))
+#define MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
+#define IS_MPRIS2_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS2_CONTROLLER))
+#define IS_MPRIS2_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS2_CONTROLLER))
+#define MPRIS2_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS2_CONTROLLER, Mpris2ControllerClass))
+
+typedef struct _Mpris2Controller Mpris2Controller;
+typedef struct _Mpris2ControllerClass Mpris2ControllerClass;
+typedef struct _Mpris2ControllerPrivate Mpris2ControllerPrivate;
 
 #define TYPE_FAMILIAR_PLAYERS_DB (familiar_players_db_get_type ())
 #define FAMILIAR_PLAYERS_DB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FAMILIAR_PLAYERS_DB, FamiliarPlayersDB))
@@ -208,7 +243,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisController* mpris_adaptor;
+	MprisBridge* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -220,8 +255,7 @@ typedef enum  {
 	PLAYER_CONTROLLER_WIDGET_ORDER_TITLE,
 	PLAYER_CONTROLLER_WIDGET_ORDER_METADATA,
 	PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB,
-	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT,
-	PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLIST
+	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT
 } PlayerControllerwidget_order;
 
 typedef enum  {
@@ -232,6 +266,15 @@ typedef enum  {
 	PLAYER_CONTROLLER_STATE_DISCONNECTED
 } PlayerControllerstate;
 
+struct _MprisBridge {
+	GObject parent_instance;
+	MprisBridgePrivate * priv;
+};
+
+struct _MprisBridgeClass {
+	GObjectClass parent_class;
+};
+
 struct _MprisController {
 	GObject parent_instance;
 	MprisControllerPrivate * priv;
@@ -241,13 +284,48 @@ struct _MprisControllerClass {
 	GObjectClass parent_class;
 };
 
-struct _MprisControllerV2 {
-	MprisController parent_instance;
-	MprisControllerV2Private * priv;
+struct _MprisRootIface {
+	GTypeInterface parent_iface;
+	void (*Quit) (MprisRoot* self, GError** error);
+	void (*Raise) (MprisRoot* self, GError** error);
+	gboolean (*get_HasTracklist) (MprisRoot* self);
+	void (*set_HasTracklist) (MprisRoot* self, gboolean value);
+	gboolean (*get_CanQuit) (MprisRoot* self);
+	void (*set_CanQuit) (MprisRoot* self, gboolean value);
+	gboolean (*get_CanRaise) (MprisRoot* self);
+	void (*set_CanRaise) (MprisRoot* self, gboolean value);
+	char* (*get_Identity) (MprisRoot* self);
+	void (*set_Identity) (MprisRoot* self, const char* value);
+	char* (*get_DesktopEntry) (MprisRoot* self);
+	void (*set_DesktopEntry) (MprisRoot* self, const char* value);
+};
+
+struct _MprisPlayerIface {
+	GTypeInterface parent_iface;
+	void (*SetPosition) (MprisPlayer* self, const char* path, gint64 pos, GError** error);
+	void (*PlayPause) (MprisPlayer* self, GError** error);
+	void (*Pause) (MprisPlayer* self, GError** error);
+	void (*Next) (MprisPlayer* self, GError** error);
+	void (*Previous) (MprisPlayer* self, GError** error);
+	GHashTable* (*get_Metadata) (MprisPlayer* self);
+	void (*set_Metadata) (MprisPlayer* self, GHashTable* value);
+	gint32 (*get_Position) (MprisPlayer* self);
+	void (*set_Position) (MprisPlayer* self, gint32 value);
+	char* (*get_PlaybackStatus) (MprisPlayer* self);
+	void (*set_PlaybackStatus) (MprisPlayer* self, const char* value);
 };
 
-struct _MprisControllerV2Class {
-	MprisControllerClass parent_class;
+struct _FreeDesktopPropertiesIface {
+	GTypeInterface parent_iface;
+};
+
+struct _Mpris2Controller {
+	GObject parent_instance;
+	Mpris2ControllerPrivate * priv;
+};
+
+struct _Mpris2ControllerClass {
+	GObjectClass parent_class;
 };
 
 struct _FamiliarPlayersDB {
@@ -287,31 +365,38 @@ GType scrub_menuitem_get_type (void) G_GNUC_CONST;
 ScrubMenuitem* scrub_menuitem_new (PlayerController* parent);
 ScrubMenuitem* scrub_menuitem_construct (GType object_type, PlayerController* parent);
 void scrub_menuitem_update_position (ScrubMenuitem* self, gint32 new_position);
+void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state);
 GeeHashSet* scrub_menuitem_attributes_format (void);
 GType title_menuitem_get_type (void) G_GNUC_CONST;
 TitleMenuitem* title_menuitem_new (PlayerController* parent);
 TitleMenuitem* title_menuitem_construct (GType object_type, PlayerController* parent);
 GeeHashSet* title_menuitem_attributes_format (void);
-GType mpris_controller_get_type (void) G_GNUC_CONST;
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
 GType player_controller_widget_order_get_type (void) G_GNUC_CONST;
 GType player_controller_state_get_type (void) G_GNUC_CONST;
-#define PLAYER_CONTROLLER_WIDGET_QUANTITY 6
+#define PLAYER_CONTROLLER_WIDGET_QUANTITY 5
 PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
 PlayerController* player_controller_construct (GType object_type, DbusmenuMenuitem* root, const char* client_name, gint offset, PlayerControllerstate initial_state);
 void player_controller_update_state (PlayerController* self, PlayerControllerstate new_state);
 void player_controller_activate (PlayerController* self);
 void player_controller_instantiate (PlayerController* self);
 void player_controller_vanish (PlayerController* self);
+void player_controller_hibernate (PlayerController* self);
 void player_controller_update_layout (PlayerController* self);
+void player_controller_determine_state (PlayerController* self);
 const char* player_controller_get_name (PlayerController* self);
 void player_controller_set_name (PlayerController* self, const char* value);
 GAppInfo* player_controller_get_app_info (PlayerController* self);
 void player_controller_set_app_info (PlayerController* self, GAppInfo* value);
 gint player_controller_get_menu_offset (PlayerController* self);
 void player_controller_set_menu_offset (PlayerController* self, gint value);
-GType mpris_controller_v2_get_type (void) G_GNUC_CONST;
-MprisControllerV2* mpris_controller_v2_new (PlayerController* ctrl, const char* inter);
-MprisControllerV2* mpris_controller_v2_construct (GType object_type, PlayerController* ctrl, const char* inter);
+MprisBridge* mpris_bridge_new (PlayerController* ctrl);
+MprisBridge* mpris_bridge_construct (GType object_type, PlayerController* ctrl);
+gboolean mpris_bridge_connected (MprisBridge* self);
+void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update);
+void mpris_bridge_expose (MprisBridge* self);
+void mpris_bridge_set_track_position (MprisBridge* self, double pos);
+GType mpris_controller_get_type (void) G_GNUC_CONST;
 MprisController* mpris_controller_new (PlayerController* ctrl, const char* inter);
 MprisController* mpris_controller_construct (GType object_type, PlayerController* ctrl, const char* inter);
 void mpris_controller_transport_event (MprisController* self, TransportMenuitemaction command);
@@ -320,6 +405,51 @@ gboolean mpris_controller_connected (MprisController* self);
 DBusGProxy* mpris_controller_get_mpris_player (MprisController* self);
 PlayerController* mpris_controller_get_owner (MprisController* self);
 const char* mpris_controller_get_mpris_interface (MprisController* self);
+MprisRoot* mpris_root_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path);
+GType mpris_root_get_type (void) G_GNUC_CONST;
+void mpris_root_Quit (MprisRoot* self, GError** error);
+void mpris_root_Raise (MprisRoot* self, GError** error);
+gboolean mpris_root_get_HasTracklist (MprisRoot* self);
+void mpris_root_set_HasTracklist (MprisRoot* self, gboolean value);
+gboolean mpris_root_get_CanQuit (MprisRoot* self);
+void mpris_root_set_CanQuit (MprisRoot* self, gboolean value);
+gboolean mpris_root_get_CanRaise (MprisRoot* self);
+void mpris_root_set_CanRaise (MprisRoot* self, gboolean value);
+char* mpris_root_get_Identity (MprisRoot* self);
+void mpris_root_set_Identity (MprisRoot* self, const char* value);
+char* mpris_root_get_DesktopEntry (MprisRoot* self);
+void mpris_root_set_DesktopEntry (MprisRoot* self, const char* value);
+MprisPlayer* mpris_player_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path);
+GType mpris_player_get_type (void) G_GNUC_CONST;
+void mpris_player_SetPosition (MprisPlayer* self, const char* path, gint64 pos, GError** error);
+void mpris_player_PlayPause (MprisPlayer* self, GError** error);
+void mpris_player_Pause (MprisPlayer* self, GError** error);
+void mpris_player_Next (MprisPlayer* self, GError** error);
+void mpris_player_Previous (MprisPlayer* self, GError** error);
+GHashTable* mpris_player_get_Metadata (MprisPlayer* self);
+void mpris_player_set_Metadata (MprisPlayer* self, GHashTable* value);
+gint32 mpris_player_get_Position (MprisPlayer* self);
+void mpris_player_set_Position (MprisPlayer* self, gint32 value);
+char* mpris_player_get_PlaybackStatus (MprisPlayer* self);
+void mpris_player_set_PlaybackStatus (MprisPlayer* self, const char* value);
+GType free_desktop_properties_get_type (void) G_GNUC_CONST;
+FreeDesktopProperties* free_desktop_properties_dbus_proxy_new (DBusGConnection* connection, const char* name, const char* path);
+GType mpris2_controller_get_type (void) G_GNUC_CONST;
+#define MPRIS2_CONTROLLER_root_interface "org.mpris.MediaPlayer2"
+Mpris2Controller* mpris2_controller_new (PlayerController* ctrl);
+Mpris2Controller* mpris2_controller_construct (GType object_type, PlayerController* ctrl);
+void mpris2_controller_property_changed_cb (Mpris2Controller* self, const char* interface_source, GHashTable* changed_properties, char** invalid, int invalid_length1);
+void mpris2_controller_initial_update (Mpris2Controller* self);
+void mpris2_controller_transport_event (Mpris2Controller* self, TransportMenuitemaction command);
+void mpris2_controller_set_position (Mpris2Controller* self, double position);
+void mpris2_controller_onSeeked (Mpris2Controller* self, gint64 position);
+gboolean mpris2_controller_connected (Mpris2Controller* self);
+gboolean mpris2_controller_was_successfull (Mpris2Controller* self);
+void mpris2_controller_expose (Mpris2Controller* self);
+MprisRoot* mpris2_controller_get_mpris2_root (Mpris2Controller* self);
+MprisPlayer* mpris2_controller_get_player (Mpris2Controller* self);
+PlayerController* mpris2_controller_get_owner (Mpris2Controller* self);
+FreeDesktopProperties* mpris2_controller_get_properties_interface (Mpris2Controller* self);
 PlayerItem* player_item_new (const char* type);
 PlayerItem* player_item_construct (GType object_type, const char* type);
 void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala
index 352ea7f..daad42f 100644
--- a/src/music-player-bridge.vala
+++ b/src/music-player-bridge.vala
@@ -116,10 +116,8 @@ public class MusicPlayerBridge : GLib.Object
 		if(server_is_not_of_interest(type)) return;
 		string client_name = type.split(".")[1];
 		if (root_menu != null && client_name != null){
-			registered_clients[client_name].vanish();
-			registered_clients.remove(client_name);
-			debug("Successively removed menu_item for client %s from registered_clients",
-			      client_name);
+			registered_clients[client_name].hibernate();
+			debug("Successively offlined client %s", client_name);
 		}
 	}
 	
diff --git a/src/play-button.c b/src/play-button.c
index 94e6f98..2f3a553 100644
--- a/src/play-button.c
+++ b/src/play-button.c
@@ -28,7 +28,7 @@ Uses code from ctk
 #include "play-button.h"
 
 #define RECT_WIDTH 130.0f
-#define Y 5.0f
+#define Y 7.0f
 #define X	37.0f
 #define INNER_RADIUS 12.5
 #define	MIDDLE_RADIUS 13.5f
@@ -42,16 +42,16 @@ Uses code from ctk
 #define TRI_HEIGHT 13.0f
 #define TRI_OFFSET  6.0f
 #define PREV_X 35.0f
-#define PREV_Y 11.0f
+#define PREV_Y 13.0f
 #define NEXT_X 113.0f
-#define NEXT_Y 11.0f //prev_y
+#define NEXT_Y 13.0f //prev_y
 #define PAUSE_WIDTH 21.0f
 #define PAUSE_HEIGHT 27.0f
 #define BAR_WIDTH 4.5f
 #define BAR_HEIGHT 24.0f
 #define BAR_OFFSET 10.0f
 #define PAUSE_X 78.0f
-#define	PAUSE_Y 5.0f
+#define	PAUSE_Y 7.0f
 #define PLAY_WIDTH 28.0f
 #define PLAY_HEIGHT 29.0f
 #define PLAY_PADDING 5.0f
diff --git a/src/player-controller.c b/src/player-controller.c
index 55b097f..39189f3 100644
--- a/src/player-controller.c
+++ b/src/player-controller.c
@@ -1,4 +1,4 @@
-/* player-controller.c generated by valac, the Vala compiler
+/* player-controller.c generated by valac 0.9.5, the Vala compiler
  * generated from player-controller.vala, do not modify */
 
 /*
@@ -54,15 +54,15 @@ typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 typedef struct _PlayerItem PlayerItem;
 typedef struct _PlayerItemClass PlayerItemClass;
 
-#define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
-#define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
-#define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-#define IS_MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER))
-#define IS_MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER))
-#define MPRIS_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
 
-typedef struct _MprisController MprisController;
-typedef struct _MprisControllerClass MprisControllerClass;
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
 
 #define PLAYER_CONTROLLER_TYPE_WIDGET_ORDER (player_controller_widget_order_get_type ())
 
@@ -116,7 +116,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisController* mpris_adaptor;
+	MprisBridge* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -135,8 +135,7 @@ typedef enum  {
 	PLAYER_CONTROLLER_WIDGET_ORDER_TITLE,
 	PLAYER_CONTROLLER_WIDGET_ORDER_METADATA,
 	PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB,
-	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT,
-	PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLIST
+	PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT
 } PlayerControllerwidget_order;
 
 typedef enum  {
@@ -152,7 +151,7 @@ static gpointer player_controller_parent_class = NULL;
 
 GType player_controller_get_type (void) G_GNUC_CONST;
 GType player_item_get_type (void) G_GNUC_CONST;
-GType mpris_controller_get_type (void) G_GNUC_CONST;
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
 #define PLAYER_CONTROLLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PLAYER_CONTROLLER, PlayerControllerPrivate))
 enum  {
 	PLAYER_CONTROLLER_DUMMY_PROPERTY,
@@ -162,7 +161,7 @@ enum  {
 };
 GType player_controller_widget_order_get_type (void) G_GNUC_CONST;
 GType player_controller_state_get_type (void) G_GNUC_CONST;
-#define PLAYER_CONTROLLER_WIDGET_QUANTITY 6
+#define PLAYER_CONTROLLER_WIDGET_QUANTITY 5
 static char* player_controller_format_client_name (const char* client_name);
 void player_controller_set_name (PlayerController* self, const char* value);
 void player_controller_set_menu_offset (PlayerController* self, gint value);
@@ -176,13 +175,16 @@ void player_controller_update_state (PlayerController* self, PlayerControllersta
 void player_controller_activate (PlayerController* self);
 GAppInfo* player_controller_get_app_info (PlayerController* self);
 void player_controller_instantiate (PlayerController* self);
-MprisController* mpris_controller_new (PlayerController* ctrl, const char* inter);
-MprisController* mpris_controller_construct (GType object_type, PlayerController* ctrl, const char* inter);
-gboolean mpris_controller_connected (MprisController* self);
+MprisBridge* mpris_bridge_new (PlayerController* ctrl);
+MprisBridge* mpris_bridge_construct (GType object_type, PlayerController* ctrl);
+void player_controller_determine_state (PlayerController* self);
 void player_controller_vanish (PlayerController* self);
-gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs);
+void player_item_reset (PlayerItem* self, GeeHashSet* attrs);
+GeeHashSet* transport_menuitem_attributes_format (void);
 GeeHashSet* metadata_menuitem_attributes_format (void);
 GeeHashSet* scrub_menuitem_attributes_format (void);
+void player_controller_hibernate (PlayerController* self);
+gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs);
 PlayerItem* player_item_new (const char* type);
 PlayerItem* player_item_construct (GType object_type, const char* type);
 TitleMenuitem* title_menuitem_new (PlayerController* parent);
@@ -197,20 +199,19 @@ GType scrub_menuitem_get_type (void) G_GNUC_CONST;
 TransportMenuitem* transport_menuitem_new (PlayerController* parent);
 TransportMenuitem* transport_menuitem_construct (GType object_type, PlayerController* parent);
 GType transport_menuitem_get_type (void) G_GNUC_CONST;
-static PlayerItem* player_controller_create_playlist (PlayerController* self);
 gint player_controller_get_menu_offset (PlayerController* self);
+gboolean mpris_bridge_connected (MprisBridge* self);
 void player_controller_set_app_info (PlayerController* self, GAppInfo* value);
 static void player_controller_finalize (GObject* obj);
 static void player_controller_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void player_controller_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-static int _vala_strcmp0 (const char * str1, const char * str2);
 
 
 
 GType player_controller_widget_order_get_type (void) {
 	static volatile gsize player_controller_widget_order_type_id__volatile = 0;
 	if (g_once_init_enter (&player_controller_widget_order_type_id__volatile)) {
-		static const GEnumValue values[] = {{PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR, "PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR", "separator"}, {PLAYER_CONTROLLER_WIDGET_ORDER_TITLE, "PLAYER_CONTROLLER_WIDGET_ORDER_TITLE", "title"}, {PLAYER_CONTROLLER_WIDGET_ORDER_METADATA, "PLAYER_CONTROLLER_WIDGET_ORDER_METADATA", "metadata"}, {PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB, "PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB", "scrub"}, {PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT, "PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT", "transport"}, {PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLIST, "PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLIST", "playlist"}, {0, NULL, NULL}};
+		static const GEnumValue values[] = {{PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR, "PLAYER_CONTROLLER_WIDGET_ORDER_SEPARATOR", "separator"}, {PLAYER_CONTROLLER_WIDGET_ORDER_TITLE, "PLAYER_CONTROLLER_WIDGET_ORDER_TITLE", "title"}, {PLAYER_CONTROLLER_WIDGET_ORDER_METADATA, "PLAYER_CONTROLLER_WIDGET_ORDER_METADATA", "metadata"}, {PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB, "PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB", "scrub"}, {PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT, "PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT", "transport"}, {0, NULL, NULL}};
 		GType player_controller_widget_order_type_id;
 		player_controller_widget_order_type_id = g_enum_register_static ("PlayerControllerwidget_order", values);
 		g_once_init_leave (&player_controller_widget_order_type_id__volatile, player_controller_widget_order_type_id);
@@ -277,7 +278,7 @@ PlayerController* player_controller_new (DbusmenuMenuitem* root, const char* cli
 
 void player_controller_update_state (PlayerController* self, PlayerControllerstate new_state) {
 	g_return_if_fail (self != NULL);
-	g_debug ("player-controller.vala:69: update_state - player controller %s : new s" \
+	g_debug ("player-controller.vala:67: update_state - player controller %s : new s" \
 "tate %i", self->priv->_name, (gint) new_state);
 	self->current_state = (gint) new_state;
 	player_controller_update_layout (self);
@@ -285,11 +286,8 @@ void player_controller_update_state (PlayerController* self, PlayerControllersta
 
 
 void player_controller_activate (PlayerController* self) {
-	PlayerItem* _tmp0_;
 	g_return_if_fail (self != NULL);
 	player_controller_establish_mpris_connection (self);
-	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA)), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-	_g_object_unref0 (_tmp0_);
 }
 
 
@@ -297,7 +295,7 @@ void player_controller_instantiate (PlayerController* self) {
 	GError * _inner_error_;
 	g_return_if_fail (self != NULL);
 	_inner_error_ = NULL;
-	g_debug ("player-controller.vala:88: instantiate in player controller for %s", self->priv->_name);
+	g_debug ("player-controller.vala:85: instantiate in player controller for %s", self->priv->_name);
 	{
 		g_app_info_launch (self->priv->_app_info, NULL, NULL, &_inner_error_);
 		if (_inner_error_ != NULL) {
@@ -312,7 +310,7 @@ void player_controller_instantiate (PlayerController* self) {
 		_error_ = _inner_error_;
 		_inner_error_ = NULL;
 		{
-			g_warning ("player-controller.vala:94: Failed to launch app %s with error message:" \
+			g_warning ("player-controller.vala:91: Failed to launch app %s with error message:" \
 " %s", self->priv->_name, _error_->message);
 			_g_error_free0 (_error_);
 		}
@@ -327,26 +325,15 @@ void player_controller_instantiate (PlayerController* self) {
 
 
 static void player_controller_establish_mpris_connection (PlayerController* self) {
+	MprisBridge* _tmp0_;
 	g_return_if_fail (self != NULL);
 	if (self->current_state != PLAYER_CONTROLLER_STATE_READY) {
-		g_debug ("player-controller.vala:101: establish_mpris_connection - Not ready to " \
-"connect");
+		g_debug ("player-controller.vala:98: establish_mpris_connection - Not ready to c" \
+"onnect");
 		return;
 	}
-	if (_vala_strcmp0 (self->priv->_name, "Vlc") == 0) {
-		MprisController* _tmp0_;
-		g_debug ("player-controller.vala:106: establishing a vlc mpris controller");
-		self->mpris_adaptor = (_tmp0_ = mpris_controller_new (self, "org.mpris.MediaPlayer.Player"), _g_object_unref0 (self->mpris_adaptor), _tmp0_);
-	} else {
-		MprisController* _tmp1_;
-		self->mpris_adaptor = (_tmp1_ = mpris_controller_new (self, "org.freedesktop.MediaPlayer"), _g_object_unref0 (self->mpris_adaptor), _tmp1_);
-	}
-	if (mpris_controller_connected (self->mpris_adaptor) == TRUE) {
-		g_debug ("player-controller.vala:114: yup I'm connected");
-		player_controller_update_state (self, PLAYER_CONTROLLER_STATE_CONNECTED);
-	} else {
-		player_controller_update_state (self, PLAYER_CONTROLLER_STATE_DISCONNECTED);
-	}
+	self->mpris_bridge = (_tmp0_ = mpris_bridge_new (self), _g_object_unref0 (self->mpris_bridge), _tmp0_);
+	player_controller_determine_state (self);
 }
 
 
@@ -369,69 +356,58 @@ void player_controller_vanish (PlayerController* self) {
 }
 
 
-static char* bool_to_string (gboolean self) {
-	char* result = NULL;
-	if (self) {
-		result = g_strdup ("true");
-		return result;
-	} else {
-		result = g_strdup ("false");
-		return result;
-	}
+void player_controller_hibernate (PlayerController* self) {
+	GeeHashSet* _tmp1_;
+	PlayerItem* _tmp0_;
+	GeeHashSet* _tmp3_;
+	PlayerItem* _tmp2_;
+	GeeHashSet* _tmp5_;
+	PlayerItem* _tmp4_;
+	g_return_if_fail (self != NULL);
+	player_controller_update_state (self, PLAYER_CONTROLLER_STATE_OFFLINE);
+	player_item_reset (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT), _tmp1_ = transport_menuitem_attributes_format ());
+	_g_object_unref0 (_tmp1_);
+	_g_object_unref0 (_tmp0_);
+	player_item_reset (_tmp2_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp3_ = metadata_menuitem_attributes_format ());
+	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
+	player_item_reset (_tmp4_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp5_ = scrub_menuitem_attributes_format ());
+	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp4_);
 }
 
 
 void player_controller_update_layout (PlayerController* self) {
-	char* _tmp6_;
 	GeeHashSet* _tmp5_;
 	PlayerItem* _tmp4_;
-	GeeHashSet* _tmp9_;
-	PlayerItem* _tmp8_;
+	PlayerItem* _tmp3_;
+	GeeHashSet* _tmp8_;
 	PlayerItem* _tmp7_;
-	char* _tmp12_;
-	GeeHashSet* _tmp11_;
-	PlayerItem* _tmp10_;
-	GeeHashSet* _tmp15_;
-	PlayerItem* _tmp14_;
-	PlayerItem* _tmp13_;
-	PlayerItem* _tmp16_;
-	PlayerItem* _tmp17_;
+	PlayerItem* _tmp6_;
+	PlayerItem* _tmp9_;
 	g_return_if_fail (self != NULL);
 	if (self->current_state != PLAYER_CONTROLLER_STATE_CONNECTED) {
 		PlayerItem* _tmp0_;
 		PlayerItem* _tmp1_;
 		PlayerItem* _tmp2_;
-		PlayerItem* _tmp3_;
 		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp0_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT)), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
 		_g_object_unref0 (_tmp0_);
 		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp1_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB)), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
 		_g_object_unref0 (_tmp1_);
 		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp2_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA)), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
 		_g_object_unref0 (_tmp2_);
-		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLIST)), DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-		_g_object_unref0 (_tmp3_);
 		return;
 	}
-	g_debug ("player-controller.vala:143: update layout - metadata %s", _tmp6_ = bool_to_string (player_item_populated (_tmp4_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp5_ = metadata_menuitem_attributes_format ())));
-	_g_free0 (_tmp6_);
+	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp3_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA)), DBUSMENU_MENUITEM_PROP_VISIBLE, player_item_populated (_tmp4_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp5_ = metadata_menuitem_attributes_format ()));
 	_g_object_unref0 (_tmp5_);
 	_g_object_unref0 (_tmp4_);
-	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp7_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA)), DBUSMENU_MENUITEM_PROP_VISIBLE, player_item_populated (_tmp8_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_METADATA), _tmp9_ = metadata_menuitem_attributes_format ()));
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp3_);
+	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp6_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB)), DBUSMENU_MENUITEM_PROP_VISIBLE, player_item_populated (_tmp7_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp8_ = scrub_menuitem_attributes_format ()));
 	_g_object_unref0 (_tmp8_);
 	_g_object_unref0 (_tmp7_);
-	g_debug ("player-controller.vala:146: update layout - scrub %s", _tmp12_ = bool_to_string (player_item_populated (_tmp10_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp11_ = scrub_menuitem_attributes_format ())));
-	_g_free0 (_tmp12_);
-	_g_object_unref0 (_tmp11_);
-	_g_object_unref0 (_tmp10_);
-	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp13_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB)), DBUSMENU_MENUITEM_PROP_VISIBLE, player_item_populated (_tmp14_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_SCRUB), _tmp15_ = scrub_menuitem_attributes_format ()));
-	_g_object_unref0 (_tmp15_);
-	_g_object_unref0 (_tmp14_);
-	_g_object_unref0 (_tmp13_);
-	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp16_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT)), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-	_g_object_unref0 (_tmp16_);
-	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp17_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_PLAYLIST)), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-	_g_object_unref0 (_tmp17_);
+	_g_object_unref0 (_tmp6_);
+	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) (_tmp9_ = (PlayerItem*) gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT)), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+	_g_object_unref0 (_tmp9_);
 }
 
 
@@ -441,7 +417,6 @@ static void player_controller_construct_widgets (PlayerController* self) {
 	MetadataMenuitem* metadata_item;
 	ScrubMenuitem* scrub_item;
 	TransportMenuitem* transport_item;
-	PlayerItem* _tmp1_;
 	g_return_if_fail (self != NULL);
 	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, _tmp0_ = player_item_new (DBUSMENU_CLIENT_TYPES_SEPARATOR));
 	_g_object_unref0 (_tmp0_);
@@ -453,8 +428,6 @@ static void player_controller_construct_widgets (PlayerController* self) {
 	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, (PlayerItem*) scrub_item);
 	transport_item = transport_menuitem_new (self);
 	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, (PlayerItem*) transport_item);
-	gee_abstract_collection_add ((GeeAbstractCollection*) self->custom_items, _tmp1_ = player_controller_create_playlist (self));
-	_g_object_unref0 (_tmp1_);
 	{
 		GeeIterator* _item_it;
 		_item_it = gee_abstract_collection_iterator ((GeeAbstractCollection*) self->custom_items);
@@ -476,32 +449,6 @@ static void player_controller_construct_widgets (PlayerController* self) {
 }
 
 
-static PlayerItem* player_controller_create_playlist (PlayerController* self) {
-	PlayerItem* result = NULL;
-	PlayerItem* playlist_root;
-	PlayerItem* subentry_1;
-	PlayerItem* subentry_2;
-	PlayerItem* subentry_3;
-	g_return_val_if_fail (self != NULL, NULL);
-	playlist_root = player_item_new (DBUSMENU_CLIENT_TYPES_DEFAULT);
-	dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) playlist_root, DBUSMENU_MENUITEM_PROP_LABEL, "Choose Playlist");
-	subentry_1 = player_item_new (DBUSMENU_CLIENT_TYPES_DEFAULT);
-	dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) subentry_1, DBUSMENU_MENUITEM_PROP_LABEL, "Raster-noton selection");
-	subentry_2 = player_item_new (DBUSMENU_CLIENT_TYPES_DEFAULT);
-	dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) subentry_2, DBUSMENU_MENUITEM_PROP_LABEL, "Rune Grammofon selection");
-	subentry_3 = player_item_new (DBUSMENU_CLIENT_TYPES_DEFAULT);
-	dbusmenu_menuitem_property_set ((DbusmenuMenuitem*) subentry_3, DBUSMENU_MENUITEM_PROP_LABEL, "Kranky selection");
-	dbusmenu_menuitem_child_append ((DbusmenuMenuitem*) playlist_root, (DbusmenuMenuitem*) subentry_1);
-	dbusmenu_menuitem_child_append ((DbusmenuMenuitem*) playlist_root, (DbusmenuMenuitem*) subentry_2);
-	dbusmenu_menuitem_child_append ((DbusmenuMenuitem*) playlist_root, (DbusmenuMenuitem*) subentry_3);
-	result = playlist_root;
-	_g_object_unref0 (subentry_3);
-	_g_object_unref0 (subentry_2);
-	_g_object_unref0 (subentry_1);
-	return result;
-}
-
-
 static char* string_slice (const char* self, glong start, glong end) {
 	char* result = NULL;
 	glong string_length;
@@ -547,7 +494,7 @@ static char* player_controller_format_client_name (const char* client_name) {
 		formatted = (_tmp2_ = g_strconcat (_tmp0_ = g_utf8_strup (client_name, (gssize) 1), _tmp1_ = string_slice (client_name, (glong) 1, g_utf8_strlen (client_name, -1)), NULL), _g_free0 (formatted), _tmp2_);
 		_g_free0 (_tmp1_);
 		_g_free0 (_tmp0_);
-		g_debug ("player-controller.vala:212: PlayerController->format_client_name - : %" \
+		g_debug ("player-controller.vala:171: PlayerController->format_client_name - : %" \
 "s", formatted);
 	}
 	result = formatted;
@@ -555,6 +502,16 @@ static char* player_controller_format_client_name (const char* client_name) {
 }
 
 
+void player_controller_determine_state (PlayerController* self) {
+	g_return_if_fail (self != NULL);
+	if (mpris_bridge_connected (self->mpris_bridge) == TRUE) {
+		player_controller_update_state (self, PLAYER_CONTROLLER_STATE_CONNECTED);
+	} else {
+		player_controller_update_state (self, PLAYER_CONTROLLER_STATE_DISCONNECTED);
+	}
+}
+
+
 const char* player_controller_get_name (PlayerController* self) {
 	const char* result;
 	g_return_val_if_fail (self != NULL, NULL);
@@ -626,7 +583,7 @@ static void player_controller_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->root_menu);
 	_g_free0 (self->priv->_name);
 	_g_object_unref0 (self->custom_items);
-	_g_object_unref0 (self->mpris_adaptor);
+	_g_object_unref0 (self->mpris_bridge);
 	_g_object_unref0 (self->priv->_app_info);
 	G_OBJECT_CLASS (player_controller_parent_class)->finalize (obj);
 }
@@ -684,16 +641,5 @@ static void player_controller_set_property (GObject * object, guint property_id,
 }
 
 
-static int _vala_strcmp0 (const char * str1, const char * str2) {
-	if (str1 == NULL) {
-		return -(str1 != str2);
-	}
-	if (str2 == NULL) {
-		return str1 != str2;
-	}
-	return strcmp (str1, str2);
-}
-
-
 
 
diff --git a/src/player-controller.vala b/src/player-controller.vala
index fc5ca9b..2aa4382 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -23,7 +23,7 @@ using Gee;
 
 public class PlayerController : GLib.Object
 {
-	public const int WIDGET_QUANTITY = 6;
+	public const int WIDGET_QUANTITY = 5;
 
 	public static enum widget_order{
 		SEPARATOR,
@@ -31,7 +31,6 @@ public class PlayerController : GLib.Object
 		METADATA,
 		SCRUB,
 		TRANSPORT,
-		PLAYLIST
 	}
 
 	public enum state{
@@ -43,12 +42,11 @@ public class PlayerController : GLib.Object
 	}
 	
 	public int current_state = state.OFFLINE;
-	
-	
+		
 	private Dbusmenu.Menuitem root_menu;
 	public string name { get; set;}	
 	public ArrayList<PlayerItem> custom_items;	
-	public MprisController mpris_adaptor;
+	public MprisBridge mpris_bridge;
 	public AppInfo? app_info { get; set;}
 	public int menu_offset { get; set;}
 		
@@ -74,7 +72,6 @@ public class PlayerController : GLib.Object
 	public void activate()
 	{
 		this.establish_mpris_connection();	
-		this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE, true);		
 	}
 
 	/*
@@ -100,23 +97,9 @@ public class PlayerController : GLib.Object
 		if(this.current_state != state.READY){
 			debug("establish_mpris_connection - Not ready to connect");
 			return;
-		}
-
-		if(this.name == "Vlc"){
-			debug("establishing a vlc mpris controller");
-			this.mpris_adaptor = new MprisController(this, "org.mpris.MediaPlayer.Player");
-		}
-		else{
-			this.mpris_adaptor = new MprisController(this);
-		}
-		// TODO refactor
-		if(this.mpris_adaptor.connected() == true){
-			debug("yup I'm connected");
-			this.update_state(state.CONNECTED);
-		}
-		else{
-			this.update_state(state.DISCONNECTED);
-		}
+		}		
+		this.mpris_bridge = new MprisBridge(this); 
+		this.determine_state();
 	}
 	
 	public void vanish()
@@ -126,8 +109,17 @@ public class PlayerController : GLib.Object
 		}
 	}
 
+	public void hibernate()
+	{
+		update_state(PlayerController.state.OFFLINE);
+		this.custom_items[widget_order.TRANSPORT].reset(TransportMenuitem.attributes_format());
+		this.custom_items[widget_order.METADATA].reset(MetadataMenuitem.attributes_format());
+		this.custom_items[widget_order.SCRUB].reset(ScrubMenuitem.attributes_format());			
+	}
+
 	public void update_layout()
-	{		
+	{	
+		
 		if(this.current_state != state.CONNECTED){
 			this.custom_items[widget_order.TRANSPORT].property_set_bool(MENUITEM_PROP_VISIBLE,
 			                                                            false);
@@ -135,24 +127,14 @@ public class PlayerController : GLib.Object
 			                                                        false);
 			this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE,
 			                                                           false);
-	  	this.custom_items[widget_order.PLAYLIST].property_set_bool(MENUITEM_PROP_VISIBLE,
-			                                                           false);		
-			return;			
+			return;	
 		}
-		
-		debug("update layout - metadata %s", this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()).to_string());
 		this.custom_items[widget_order.METADATA].property_set_bool(MENUITEM_PROP_VISIBLE,
-			                                                        this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));
-		debug("update layout - scrub %s", this.custom_items[widget_order.SCRUB].populated(ScrubMenuitem.attributes_format()).to_string());
+			                                                        this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));		
 		this.custom_items[widget_order.SCRUB].property_set_bool(MENUITEM_PROP_VISIBLE,
 		                                                        this.custom_items[widget_order.SCRUB].populated(ScrubMenuitem.attributes_format()));
-
-
 		this.custom_items[widget_order.TRANSPORT].property_set_bool(MENUITEM_PROP_VISIBLE,
 		                                                            true);
-
-	  this.custom_items[widget_order.PLAYLIST].property_set_bool(MENUITEM_PROP_VISIBLE,
-		                                                            true);
 	}
 		
 	private void construct_widgets()
@@ -175,34 +157,11 @@ public class PlayerController : GLib.Object
 		// Transport item
 		TransportMenuitem transport_item = new TransportMenuitem(this);
 		this.custom_items.add(transport_item);
-		
-		this.custom_items.add(create_playlist());		
-		
+				
 		foreach(PlayerItem item in this.custom_items){
 			root_menu.child_add_position(item, this.menu_offset + this.custom_items.index_of(item));			
 		}
 	}	
-
-	private PlayerItem create_playlist()
-	{
-		PlayerItem playlist_root = new PlayerItem(CLIENT_TYPES_DEFAULT);
-		playlist_root.property_set(MENUITEM_PROP_LABEL, "Choose Playlist");
-
-		PlayerItem subentry_1 = new PlayerItem(CLIENT_TYPES_DEFAULT);
-		subentry_1.property_set(MENUITEM_PROP_LABEL, "Raster-noton selection");
-
-		PlayerItem subentry_2 = new PlayerItem(CLIENT_TYPES_DEFAULT);
-		subentry_2.property_set(MENUITEM_PROP_LABEL, "Rune Grammofon selection");
-
-		PlayerItem subentry_3 = new PlayerItem(CLIENT_TYPES_DEFAULT);
-		subentry_3.property_set(MENUITEM_PROP_LABEL, "Kranky selection");
-		
-		playlist_root.child_append(subentry_1);
-		playlist_root.child_append(subentry_2);
-		playlist_root.child_append(subentry_3);
-
-		return playlist_root;
-	}
 	
 	private static string format_client_name(string client_name)
 	{
@@ -214,4 +173,16 @@ public class PlayerController : GLib.Object
 		return formatted;
 	}
 
+	// Temporarily we will need to handle to different mpris implemenations
+	// Do it for now - a couple of weeks should see this messy carry on out of
+	// the codebase.
+	public void determine_state()
+	{
+		if(this.mpris_bridge.connected() == true){
+			this.update_state(state.CONNECTED);
+		}
+		else{
+			this.update_state(state.DISCONNECTED);
+		}
+	}
 }
 \ No newline at end of file
diff --git a/src/player-item.c b/src/player-item.c
index 301fb33..74d3e2f 100644
--- a/src/player-item.c
+++ b/src/player-item.c
@@ -1,4 +1,4 @@
-/* player-item.c generated by valac, the Vala compiler
+/* player-item.c generated by valac 0.9.5, the Vala compiler
  * generated from player-item.vala, do not modify */
 
 /*
@@ -165,6 +165,18 @@ static gboolean string_contains (const char* self, const char* needle) {
 }
 
 
+static char* bool_to_string (gboolean self) {
+	char* result = NULL;
+	if (self) {
+		result = g_strdup ("true");
+		return result;
+	} else {
+		result = g_strdup ("false");
+		return result;
+	}
+}
+
+
 void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attributes) {
 	GError * _inner_error_;
 	g_return_if_fail (self != NULL);
@@ -212,7 +224,7 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu
 						_tmp6_ = (_tmp5_ = g_filename_from_uri (_tmp4_ = string_strip (update), NULL, &_inner_error_), _g_free0 (_tmp4_), _tmp5_);
 						if (_inner_error_ != NULL) {
 							if (_inner_error_->domain == G_CONVERT_ERROR) {
-								goto __catch2_g_convert_error;
+								goto __catch8_g_convert_error;
 							}
 							_g_free0 (update);
 							_g_free0 (v);
@@ -226,8 +238,8 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu
 						}
 						update = (_tmp7_ = _tmp6_, _g_free0 (update), _tmp7_);
 					}
-					goto __finally2;
-					__catch2_g_convert_error:
+					goto __finally8;
+					__catch8_g_convert_error:
 					{
 						GError * e;
 						e = _inner_error_;
@@ -237,7 +249,7 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu
 							_g_error_free0 (e);
 						}
 					}
-					__finally2:
+					__finally8:
 					if (_inner_error_ != NULL) {
 						_g_free0 (update);
 						_g_free0 (v);
@@ -262,6 +274,9 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu
 						dbusmenu_menuitem_property_set_int ((DbusmenuMenuitem*) self, property, (gint) g_value_get_uint (v));
 					} else {
 						if (G_VALUE_HOLDS (v, G_TYPE_BOOLEAN)) {
+							char* _tmp8_;
+							g_debug ("player-item.vala:82: with value : %s", _tmp8_ = bool_to_string (g_value_get_boolean (v)));
+							_g_free0 (_tmp8_);
 							dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) self, property, g_value_get_boolean (v));
 						}
 					}
@@ -295,7 +310,7 @@ gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs) {
 			}
 			prop = (char*) gee_iterator_get (_prop_it);
 			value_int = dbusmenu_menuitem_property_get_int ((DbusmenuMenuitem*) self, prop);
-			g_debug ("player-item.vala:94: populate - prop %s and value %i", prop, value_int);
+			g_debug ("player-item.vala:96: populate - prop %s and value %i", prop, value_int);
 			if (dbusmenu_menuitem_property_get_int ((DbusmenuMenuitem*) self, prop) != PLAYER_ITEM_EMPTY) {
 				result = TRUE;
 				_g_free0 (prop);
diff --git a/src/player-item.vala b/src/player-item.vala
index 288ac47..e5d8bfc 100644
--- a/src/player-item.vala
+++ b/src/player-item.vala
@@ -79,9 +79,11 @@ public class PlayerItem : Dbusmenu.Menuitem
 				this.property_set_int(property, (int)v.get_uint());
 			}
 			else if(v.holds (typeof (bool))){
+				debug("with value : %s", v.get_boolean().to_string());				
 				this.property_set_bool(property, v.get_boolean());
 			}
 		}
+
 		if(this.property_get_bool(MENUITEM_PROP_VISIBLE) == false){
 			this.property_set_bool(MENUITEM_PROP_VISIBLE, true);
 		}
diff --git a/src/pulse-manager.c b/src/pulse-manager.c
index a9a47e4..4ff9e1d 100644
--- a/src/pulse-manager.c
+++ b/src/pulse-manager.c
@@ -211,7 +211,8 @@ static void mute_each_sink(gpointer key, gpointer value, gpointer user_data)
   if (GPOINTER_TO_INT(user_data) == 1) {
     sound_service_dbus_update_sink_mute(dbus_service, TRUE);
   } else {
-    sound_service_dbus_update_sink_volume(dbus_service, get_default_sink_volume());
+    //sound_service_dbus_update_sink_volume(dbus_service, get_default_sink_volume());
+		dbus_menu_manager_update_volume(get_default_sink_volume());
   }
 
   /*    g_debug("in the pulse manager: mute each sink %i", GPOINTER_TO_INT(user_data));*/
@@ -288,7 +289,7 @@ static void context_success_callback(pa_context *c, int success, void *userdata)
 /**
 On Service startup this callback will be called multiple times resulting our sinks_hash container to be filled with the
 available sinks.
-For now this callback it assumes it only used at startup. It may be necessary to use if sinks become available after startup.
+For now this callback assumes it only used at startup. It may be necessary to use if sinks become available after startup.
 Major candidate for refactoring.
 **/
 static void pulse_sink_info_callback(pa_context *c, const pa_sink_info *sink, int eol, void *userdata)
@@ -399,7 +400,7 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
         pa_volume_t vol = pa_cvolume_max(&s->volume);
         gdouble volume_percent = ((gdouble) vol * 100) / PA_VOLUME_NORM;
         /*                g_debug("Updating volume from PA manager with volume = %f", volume_percent);*/
-        sound_service_dbus_update_sink_volume(dbus_service, volume_percent);
+        dbus_menu_manager_update_volume(volume_percent);
       }
 
       if (mute_changed == TRUE) {
@@ -410,7 +411,8 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
           pa_volume_t vol = pa_cvolume_max(&s->volume);
           gdouble volume_percent = ((gdouble) vol * 100) / PA_VOLUME_NORM;
           /*                    g_debug("Updating volume from PA manager with volume = %f", volume_percent);*/
-          sound_service_dbus_update_sink_volume(dbus_service, volume_percent);
+          //sound_service_dbus_update_sink_volume(dbus_service, volume_percent);
+	        dbus_menu_manager_update_volume(volume_percent);
         }
       }
     }
diff --git a/src/scrub-menu-item.c b/src/scrub-menu-item.c
index 4cb0f02..f31b24e 100644
--- a/src/scrub-menu-item.c
+++ b/src/scrub-menu-item.c
@@ -1,4 +1,4 @@
-/* scrub-menu-item.c generated by valac, the Vala compiler
+/* scrub-menu-item.c generated by valac 0.9.5, the Vala compiler
  * generated from scrub-menu-item.vala, do not modify */
 
 /*
@@ -68,15 +68,15 @@ typedef struct _PlayerController PlayerController;
 typedef struct _PlayerControllerClass PlayerControllerClass;
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
-#define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
-#define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
-#define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-#define IS_MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER))
-#define IS_MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER))
-#define MPRIS_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
 
-typedef struct _MprisController MprisController;
-typedef struct _MprisControllerClass MprisControllerClass;
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
 
 struct _PlayerItem {
 	DbusmenuMenuitem parent_instance;
@@ -101,7 +101,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisController* mpris_adaptor;
+	MprisBridge* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -123,10 +123,11 @@ ScrubMenuitem* scrub_menuitem_new (PlayerController* parent);
 ScrubMenuitem* scrub_menuitem_construct (GType object_type, PlayerController* parent);
 PlayerController* player_item_get_owner (PlayerItem* self);
 const char* player_controller_get_name (PlayerController* self);
-GType mpris_controller_get_type (void) G_GNUC_CONST;
-void mpris_controller_set_position (MprisController* self, double position);
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
+void mpris_bridge_set_track_position (MprisBridge* self, double pos);
 static void scrub_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 void scrub_menuitem_update_position (ScrubMenuitem* self, gint32 new_position);
+void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state);
 
 
 
@@ -151,7 +152,7 @@ static void scrub_menuitem_real_handle_event (DbusmenuMenuitem* base, const char
 	self = (ScrubMenuitem*) base;
 	g_return_if_fail (name != NULL);
 	g_debug ("scrub-menu-item.vala:34: handle_event for owner %s with value: %f", player_controller_get_name (player_item_get_owner ((PlayerItem*) self)), g_value_get_double (input_value));
-	mpris_controller_set_position (player_item_get_owner ((PlayerItem*) self)->mpris_adaptor, g_value_get_double (input_value));
+	mpris_bridge_set_track_position (player_item_get_owner ((PlayerItem*) self)->mpris_bridge, g_value_get_double (input_value));
 }
 
 
@@ -161,6 +162,12 @@ void scrub_menuitem_update_position (ScrubMenuitem* self, gint32 new_position) {
 }
 
 
+void scrub_menuitem_update_playstate (ScrubMenuitem* self, gint state) {
+	g_return_if_fail (self != NULL);
+	dbusmenu_menuitem_property_set_int ((DbusmenuMenuitem*) self, DBUSMENU_SCRUB_MENUITEM_PLAY_STATE, state);
+}
+
+
 GeeHashSet* scrub_menuitem_attributes_format (void) {
 	GeeHashSet* result = NULL;
 	GeeHashSet* attrs;
diff --git a/src/scrub-menu-item.vala b/src/scrub-menu-item.vala
index ca81c38..7368a0c 100644
--- a/src/scrub-menu-item.vala
+++ b/src/scrub-menu-item.vala
@@ -32,13 +32,18 @@ public class ScrubMenuitem : PlayerItem
 	public override void handle_event(string name, GLib.Value input_value, uint timestamp)
 	{
 		debug("handle_event for owner %s with value: %f", this.owner.name, input_value.get_double());		
-		this.owner.mpris_adaptor.set_position(input_value.get_double());		
+		this.owner.mpris_bridge.set_track_position(input_value.get_double());		
 	}
 
 	public void update_position(int32 new_position)
 	{
 		this.property_set_int(MENUITEM_POSITION, new_position);
 	}		
+
+	public void update_playstate(int state)
+	{
+		this.property_set_int(MENUITEM_PLAY_STATE, state);		
+	}
 	
 	public static HashSet<string> attributes_format()
 	{
diff --git a/src/scrub-widget.c b/src/scrub-widget.c
index 52d7b83..a1d45d5 100644
--- a/src/scrub-widget.c
+++ b/src/scrub-widget.c
@@ -174,7 +174,7 @@ scrub_widget_check_play_state(ScrubWidget* self)
 	ScrubWidgetPrivate * priv = SCRUB_WIDGET_GET_PRIVATE(self);
 	gint play_state = dbusmenu_menuitem_property_get_int(priv->twin_item,
 	                                                     DBUSMENU_SCRUB_MENUITEM_PLAY_STATE);
-	
+	g_debug("play-state = %i", play_state);
 	if(play_state == 0){
 		g_debug("START TIMELINE");
 		ido_timeline_start(priv->time_line);
diff --git a/src/scrub-widget.h b/src/scrub-widget.h
index cebe890..e518a80 100644
--- a/src/scrub-widget.h
+++ b/src/scrub-widget.h
@@ -21,7 +21,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <glib.h>
 #include <glib-object.h>
-#include <libdbusmenu-gtk/menu.h>
+#include <libdbusmenu-gtk/menuitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/slider-menu-item.c b/src/slider-menu-item.c
index d56422a..77c8635 100644
--- a/src/slider-menu-item.c
+++ b/src/slider-menu-item.c
@@ -79,7 +79,6 @@ slider_menu_item_finalize (GObject *object)
 static void
 handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
 {
-  g_debug("in the handle event method of slider_menu_item");
   gdouble volume_input = 0;
   volume_input = g_value_get_double(value);
   if (value != NULL)
@@ -90,9 +89,11 @@ handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, g
 
 SliderMenuItem* slider_menu_item_new(gboolean sinks_available, gdouble start_volume)
 {
+	
   SliderMenuItem *self = g_object_new(SLIDER_MENU_ITEM_TYPE, NULL);
-  dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_SLIDER_MENUITEM_TYPE);
-  dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ENABLED, sinks_available);
+  dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_VOLUME_MENUITEM_TYPE);
+
+	dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ENABLED, sinks_available);
   dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_VISIBLE, sinks_available);
   return self;
 }
diff --git a/src/sound-service-client.h b/src/sound-service-client.h
index b3d50da..ab1acd1 100644
--- a/src/sound-service-client.h
+++ b/src/sound-service-client.h
@@ -26,81 +26,6 @@ static
 inline
 #endif
 gboolean
-org_ayatana_indicator_sound_set_sink_volume (DBusGProxy *proxy, const guint IN_volume_percent, GError **error)
-
-{
-  return dbus_g_proxy_call (proxy, "SetSinkVolume", error, G_TYPE_UINT, IN_volume_percent, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*org_ayatana_indicator_sound_set_sink_volume_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-org_ayatana_indicator_sound_set_sink_volume_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
-  DBusGAsyncData *data = (DBusGAsyncData*) user_data;
-  GError *error = NULL;
-  dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
-  (*(org_ayatana_indicator_sound_set_sink_volume_reply)data->cb) (proxy, error, data->userdata);
-  return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-org_ayatana_indicator_sound_set_sink_volume_async (DBusGProxy *proxy, const guint IN_volume_percent, org_ayatana_indicator_sound_set_sink_volume_reply callback, gpointer userdata)
-
-{
-  DBusGAsyncData *stuff;
-  stuff = g_slice_new (DBusGAsyncData);
-  stuff->cb = G_CALLBACK (callback);
-  stuff->userdata = userdata;
-  return dbus_g_proxy_begin_call (proxy, "SetSinkVolume", org_ayatana_indicator_sound_set_sink_volume_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_UINT, IN_volume_percent, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-org_ayatana_indicator_sound_get_sink_volume (DBusGProxy *proxy, gdouble* OUT_volume_percent_input, GError **error)
-
-{
-  return dbus_g_proxy_call (proxy, "GetSinkVolume", error, G_TYPE_INVALID, G_TYPE_DOUBLE, OUT_volume_percent_input, G_TYPE_INVALID);
-}
-
-typedef void (*org_ayatana_indicator_sound_get_sink_volume_reply) (DBusGProxy *proxy, gdouble OUT_volume_percent_input, GError *error, gpointer userdata);
-
-static void
-org_ayatana_indicator_sound_get_sink_volume_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
-  DBusGAsyncData *data = (DBusGAsyncData*) user_data;
-  GError *error = NULL;
-  gdouble OUT_volume_percent_input;
-  dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_DOUBLE, &OUT_volume_percent_input, G_TYPE_INVALID);
-  (*(org_ayatana_indicator_sound_get_sink_volume_reply)data->cb) (proxy, OUT_volume_percent_input, error, data->userdata);
-  return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-org_ayatana_indicator_sound_get_sink_volume_async (DBusGProxy *proxy, org_ayatana_indicator_sound_get_sink_volume_reply callback, gpointer userdata)
-
-{
-  DBusGAsyncData *stuff;
-  stuff = g_slice_new (DBusGAsyncData);
-  stuff->cb = G_CALLBACK (callback);
-  stuff->userdata = userdata;
-  return dbus_g_proxy_begin_call (proxy, "GetSinkVolume", org_ayatana_indicator_sound_get_sink_volume_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
 org_ayatana_indicator_sound_get_sink_mute (DBusGProxy *proxy, gboolean* OUT_mute_input, GError **error)
 
 {
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 85945d0..d553285 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -29,10 +29,8 @@
 #include "pulse-manager.h"
 
 // DBUS methods
-static gboolean sound_service_dbus_get_sink_volume(SoundServiceDbus* service, gdouble* volume_percent_input, GError** gerror);
 static gboolean sound_service_dbus_get_sink_mute(SoundServiceDbus* service, gboolean* mute_input, GError** gerror);
 static gboolean sound_service_dbus_get_sink_availability(SoundServiceDbus* service, gboolean* availability_input, GError** gerror);
-static void sound_service_dbus_set_sink_volume(SoundServiceDbus* service, const guint volume_percent, GError** gerror);
 
 #include "sound-service-server.h"
 
@@ -40,7 +38,6 @@ typedef struct _SoundServiceDbusPrivate SoundServiceDbusPrivate;
 
 struct _SoundServiceDbusPrivate {
   DBusGConnection *connection;
-  gdouble         volume_percent;
   gboolean        mute;
   gboolean        sink_availability;
 };
@@ -49,7 +46,6 @@ struct _SoundServiceDbusPrivate {
 /* Signals */
 enum {
   SINK_INPUT_WHILE_MUTED,
-  SINK_VOLUME_UPDATE,
   SINK_MUTE_UPDATE,
   SINK_AVAILABLE_UPDATE,
   LAST_SIGNAL
@@ -65,7 +61,6 @@ static void sound_service_dbus_init       (SoundServiceDbus *self);
 static void sound_service_dbus_dispose    (GObject *object);
 static void sound_service_dbus_finalize   (GObject *object);
 
-
 /* GObject Boilerplate */
 G_DEFINE_TYPE (SoundServiceDbus, sound_service_dbus, G_TYPE_OBJECT);
 
@@ -91,14 +86,6 @@ sound_service_dbus_class_init (SoundServiceDbusClass *klass)
                                      g_cclosure_marshal_VOID__BOOLEAN,
                                      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
-  signals[SINK_VOLUME_UPDATE] =  g_signal_new("sink-volume-update",
-                                 G_TYPE_FROM_CLASS (klass),
-                                 G_SIGNAL_RUN_LAST,
-                                 0,
-                                 NULL, NULL,
-                                 g_cclosure_marshal_VOID__DOUBLE,
-                                 G_TYPE_NONE, 1, G_TYPE_DOUBLE);
-
   signals[SINK_MUTE_UPDATE] =  g_signal_new("sink-mute-update",
                                G_TYPE_FROM_CLASS (klass),
                                G_SIGNAL_RUN_LAST,
@@ -113,9 +100,6 @@ sound_service_dbus_class_init (SoundServiceDbusClass *klass)
                                     NULL, NULL,
                                     g_cclosure_marshal_VOID__BOOLEAN,
                                     G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-
-
-
 }
 
 static void
@@ -125,7 +109,6 @@ sound_service_dbus_init (SoundServiceDbus *self)
   SoundServiceDbusPrivate * priv = SOUND_SERVICE_DBUS_GET_PRIVATE(self);
 
   priv->connection = NULL;
-  priv->volume_percent = 0;
   priv->mute = FALSE;
   priv->sink_availability = FALSE;
 
@@ -159,23 +142,6 @@ sound_service_dbus_finalize (GObject *object)
 }
 
 
-/**
-DBUS Method Callbacks
-**/
-static void sound_service_dbus_set_sink_volume(SoundServiceDbus* service, const guint volume_percent, GError** gerror)
-{
-  g_debug("in the set sink volume method in the sound service dbus!, with volume_percent of %i", volume_percent);
-  set_sink_volume(volume_percent);
-}
-
-static gboolean sound_service_dbus_get_sink_volume (SoundServiceDbus *self, gdouble *volume_percent_input, GError** gerror)
-{
-  SoundServiceDbusPrivate *priv = SOUND_SERVICE_DBUS_GET_PRIVATE (self);
-  g_debug("Get sink volume method in the sound service dbus!, about to send over volume percent of  %f", priv->volume_percent);
-  *volume_percent_input = priv->volume_percent;
-  return TRUE;
-}
-
 static gboolean sound_service_dbus_get_sink_mute (SoundServiceDbus *self, gboolean *mute_input, GError** gerror)
 {
   SoundServiceDbusPrivate *priv = SOUND_SERVICE_DBUS_GET_PRIVATE (self);
@@ -205,18 +171,6 @@ void sound_service_dbus_sink_input_while_muted(SoundServiceDbus* obj,  gboolean
                 block_value);
 }
 
-void sound_service_dbus_update_sink_volume(SoundServiceDbus* obj, gdouble sink_volume)
-{
-  SoundServiceDbusPrivate *priv = SOUND_SERVICE_DBUS_GET_PRIVATE (obj);
-  priv->volume_percent = sink_volume;
-
-  /*    g_debug("Emitting signal: SINK_VOLUME_UPDATE, with sink_volme %f", priv->volume_percent);*/
-  g_signal_emit(obj,
-                signals[SINK_VOLUME_UPDATE],
-                0,
-                priv->volume_percent);
-}
-
 void sound_service_dbus_update_sink_mute(SoundServiceDbus* obj, gboolean sink_mute)
 {
   /*    g_debug("Emitting signal: SINK_MUTE_UPDATE, with sink mute %i", sink_mute);*/
diff --git a/src/sound-service-dbus.h b/src/sound-service-dbus.h
index 72556ad..b6e8193 100644
--- a/src/sound-service-dbus.h
+++ b/src/sound-service-dbus.h
@@ -52,7 +52,6 @@ GType sound_service_dbus_get_type  (void) G_GNUC_CONST;
 
 // Utility methods to get the SIGNAL messages across into the sound-service-dbus
 void sound_service_dbus_sink_input_while_muted (SoundServiceDbus* obj, gboolean block_value);
-void sound_service_dbus_update_sink_volume(SoundServiceDbus* obj, gdouble sink_volume);
 void sound_service_dbus_update_sink_mute(SoundServiceDbus* obj, gboolean sink_mute);
 void sound_service_dbus_update_sink_availability(SoundServiceDbus* obj, gboolean sink_availibity);
 
diff --git a/src/sound-service-server.h b/src/sound-service-server.h
index e889c2d..0431d64 100644
--- a/src/sound-service-server.h
+++ b/src/sound-service-server.h
@@ -55,53 +55,6 @@ G_BEGIN_DECLS
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* BOOLEAN:UINT,POINTER */
-extern void dbus_glib_marshal__sound_service_server_BOOLEAN__UINT_POINTER (GClosure     *closure,
-                                                                           GValue       *return_value,
-                                                                           guint         n_param_values,
-                                                                           const GValue *param_values,
-                                                                           gpointer      invocation_hint,
-                                                                           gpointer      marshal_data);
-void
-dbus_glib_marshal__sound_service_server_BOOLEAN__UINT_POINTER (GClosure     *closure,
-                                                               GValue       *return_value G_GNUC_UNUSED,
-                                                               guint         n_param_values,
-                                                               const GValue *param_values,
-                                                               gpointer      invocation_hint G_GNUC_UNUSED,
-                                                               gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__UINT_POINTER) (gpointer     data1,
-                                                          guint        arg_1,
-                                                          gpointer     arg_2,
-                                                          gpointer     data2);
-  register GMarshalFunc_BOOLEAN__UINT_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_uint (param_values + 1),
-                       g_marshal_value_peek_pointer (param_values + 2),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
 /* BOOLEAN:POINTER,POINTER */
 extern void dbus_glib_marshal__sound_service_server_BOOLEAN__POINTER_POINTER (GClosure     *closure,
                                                                               GValue       *return_value,
@@ -155,18 +108,16 @@ G_END_DECLS
 
 #include <dbus/dbus-glib.h>
 static const DBusGMethodInfo dbus_glib__sound_service_server_methods[] = {
-  { (GCallback) sound_service_dbus_set_sink_volume, dbus_glib_marshal__sound_service_server_BOOLEAN__UINT_POINTER, 0 },
-  { (GCallback) sound_service_dbus_get_sink_volume, dbus_glib_marshal__sound_service_server_BOOLEAN__POINTER_POINTER, 64 },
-  { (GCallback) sound_service_dbus_get_sink_mute, dbus_glib_marshal__sound_service_server_BOOLEAN__POINTER_POINTER, 138 },
-  { (GCallback) sound_service_dbus_get_sink_availability, dbus_glib_marshal__sound_service_server_BOOLEAN__POINTER_POINTER, 200 },
+  { (GCallback) sound_service_dbus_get_sink_mute, dbus_glib_marshal__sound_service_server_BOOLEAN__POINTER_POINTER, 0 },
+  { (GCallback) sound_service_dbus_get_sink_availability, dbus_glib_marshal__sound_service_server_BOOLEAN__POINTER_POINTER, 62 },
 };
 
 const DBusGObjectInfo dbus_glib__sound_service_server_object_info = {
   0,
   dbus_glib__sound_service_server_methods,
-  4,
-"org.ayatana.indicator.sound\0SetSinkVolume\0S\0volume_percent\0I\0u\0\0org.ayatana.indicator.sound\0GetSinkVolume\0S\0volume_percent_input\0O\0F\0N\0d\0\0org.ayatana.indicator.sound\0GetSinkMute\0S\0mute_input\0O\0F\0N\0b\0\0org.ayatana.indicator.sound\0GetSinkAvailability\0S\0availability_input\0O\0F\0N\0b\0\0\0",
-"org.ayatana.indicator.sound\0SinkInputWhileMuted\0org.ayatana.indicator.sound\0SinkVolumeUpdate\0org.ayatana.indicator.sound\0SinkMuteUpdate\0org.ayatana.indicator.sound\0SinkAvailableUpdate\0\0",
+  2,
+"org.ayatana.indicator.sound\0GetSinkMute\0S\0mute_input\0O\0F\0N\0b\0\0org.ayatana.indicator.sound\0GetSinkAvailability\0S\0availability_input\0O\0F\0N\0b\0\0\0",
+"org.ayatana.indicator.sound\0SinkInputWhileMuted\0org.ayatana.indicator.sound\0SinkMuteUpdate\0org.ayatana.indicator.sound\0SinkAvailableUpdate\0\0",
 "\0"
 };
 
diff --git a/src/sound-service.c b/src/sound-service.c
index 8768cd3..12f067e 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -25,7 +25,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static GMainLoop *mainloop = NULL;
 
-
 /**********************************************************************************************************************/
 //    Init and exit functions
 /**********************************************************************************************************************/
diff --git a/src/sound-service.xml b/src/sound-service.xml
index 12ed03e..ee19ceb 100644
--- a/src/sound-service.xml
+++ b/src/sound-service.xml
@@ -1,16 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node name="/org/ayatana/indicator/sound">
   <interface name="org.ayatana.indicator.sound">
-    <method name = "SetSinkVolume">
-        <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="sound_service_dbus_set_sink_volume"/>
-        <arg type='u' name='volume_percent' direction="in"/>
-    </method>
-
-    <method name = "GetSinkVolume">
-        <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="sound_service_dbus_get_sink_volume"/>
-        <arg type='d' name='volume_percent_input' direction="out"/>
-    </method>
-
     <method name = "GetSinkMute">
         <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="sound_service_dbus_get_sink_mute"/>
         <arg type='b' name='mute_input' direction="out"/>
@@ -28,10 +18,6 @@ Our respective UI element should listen to this and therefore will be updated wi
       <arg name="block_value" type="b" direction="out"/>
     </signal>
     
-    <signal name="SinkVolumeUpdate">
-      <arg name="volume_percent" type="u" direction="out"/>
-    </signal>
-
     <signal name="SinkMuteUpdate">
       <arg name="mute_value" type="b" direction="out"/>
     </signal>
diff --git a/src/title-menu-item.c b/src/title-menu-item.c
index 70ddc74..a81e2ce 100644
--- a/src/title-menu-item.c
+++ b/src/title-menu-item.c
@@ -1,4 +1,4 @@
-/* title-menu-item.c generated by valac, the Vala compiler
+/* title-menu-item.c generated by valac 0.9.5, the Vala compiler
  * generated from title-menu-item.vala, do not modify */
 
 /*
@@ -65,15 +65,15 @@ typedef struct _PlayerController PlayerController;
 typedef struct _PlayerControllerClass PlayerControllerClass;
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
-#define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
-#define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
-#define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-#define IS_MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER))
-#define IS_MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER))
-#define MPRIS_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
 
-typedef struct _MprisController MprisController;
-typedef struct _MprisControllerClass MprisControllerClass;
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
 
 #define PLAYER_CONTROLLER_TYPE_STATE (player_controller_state_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -101,7 +101,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisController* mpris_adaptor;
+	MprisBridge* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -129,9 +129,10 @@ const char* player_controller_get_name (PlayerController* self);
 TitleMenuitem* title_menuitem_new (PlayerController* parent);
 TitleMenuitem* title_menuitem_construct (GType object_type, PlayerController* parent);
 PlayerController* player_item_get_owner (PlayerItem* self);
-GType mpris_controller_get_type (void) G_GNUC_CONST;
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
 GType player_controller_state_get_type (void) G_GNUC_CONST;
 void player_controller_instantiate (PlayerController* self);
+void mpris_bridge_expose (MprisBridge* self);
 static void title_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 GeeHashSet* title_menuitem_attributes_format (void);
 
@@ -157,6 +158,10 @@ static void title_menuitem_real_handle_event (DbusmenuMenuitem* base, const char
 	g_return_if_fail (name != NULL);
 	if (player_item_get_owner ((PlayerItem*) self)->current_state == PLAYER_CONTROLLER_STATE_OFFLINE) {
 		player_controller_instantiate (player_item_get_owner ((PlayerItem*) self));
+	} else {
+		if (player_item_get_owner ((PlayerItem*) self)->current_state == PLAYER_CONTROLLER_STATE_CONNECTED) {
+			mpris_bridge_expose (player_item_get_owner ((PlayerItem*) self)->mpris_bridge);
+		}
 	}
 }
 
diff --git a/src/title-menu-item.vala b/src/title-menu-item.vala
index d7e16df..ec1cc62 100644
--- a/src/title-menu-item.vala
+++ b/src/title-menu-item.vala
@@ -35,6 +35,9 @@ public class TitleMenuitem : PlayerItem
 		{
 			this.owner.instantiate();
 		}
+		else if(this.owner.current_state == PlayerController.state.CONNECTED){
+			this.owner.mpris_bridge.expose();
+		}		
 	}
 	
 
diff --git a/src/title-widget.h b/src/title-widget.h
index efc0c78..fc8f169 100644
--- a/src/title-widget.h
+++ b/src/title-widget.h
@@ -20,7 +20,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __TITLE_WIDGET_H__
 
 #include <gtk/gtkmenuitem.h>
-#include <libdbusmenu-gtk/menu.h>
+#include <libdbusmenu-gtk/menuitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/transport-menu-item.c b/src/transport-menu-item.c
index 50d166b..7c6b46b 100644
--- a/src/transport-menu-item.c
+++ b/src/transport-menu-item.c
@@ -1,4 +1,4 @@
-/* transport-menu-item.c generated by valac, the Vala compiler
+/* transport-menu-item.c generated by valac 0.9.5, the Vala compiler
  * generated from transport-menu-item.vala, do not modify */
 
 /*
@@ -68,15 +68,15 @@ typedef struct _PlayerControllerClass PlayerControllerClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 typedef struct _PlayerControllerPrivate PlayerControllerPrivate;
 
-#define TYPE_MPRIS_CONTROLLER (mpris_controller_get_type ())
-#define MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_CONTROLLER, MprisController))
-#define MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
-#define IS_MPRIS_CONTROLLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_CONTROLLER))
-#define IS_MPRIS_CONTROLLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_CONTROLLER))
-#define MPRIS_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_CONTROLLER, MprisControllerClass))
+#define TYPE_MPRIS_BRIDGE (mpris_bridge_get_type ())
+#define MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MPRIS_BRIDGE, MprisBridge))
+#define MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
+#define IS_MPRIS_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MPRIS_BRIDGE))
+#define IS_MPRIS_BRIDGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MPRIS_BRIDGE))
+#define MPRIS_BRIDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MPRIS_BRIDGE, MprisBridgeClass))
 
-typedef struct _MprisController MprisController;
-typedef struct _MprisControllerClass MprisControllerClass;
+typedef struct _MprisBridge MprisBridge;
+typedef struct _MprisBridgeClass MprisBridgeClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 struct _PlayerItem {
@@ -108,7 +108,7 @@ struct _PlayerController {
 	PlayerControllerPrivate * priv;
 	gint current_state;
 	GeeArrayList* custom_items;
-	MprisController* mpris_adaptor;
+	MprisBridge* mpris_bridge;
 };
 
 struct _PlayerControllerClass {
@@ -130,8 +130,8 @@ TransportMenuitem* transport_menuitem_construct (GType object_type, PlayerContro
 void transport_menuitem_change_play_state (TransportMenuitem* self, gint state);
 PlayerController* player_item_get_owner (PlayerItem* self);
 const char* player_controller_get_name (PlayerController* self);
-GType mpris_controller_get_type (void) G_GNUC_CONST;
-void mpris_controller_transport_event (MprisController* self, TransportMenuitemaction command);
+GType mpris_bridge_get_type (void) G_GNUC_CONST;
+void mpris_bridge_transport_update (MprisBridge* self, TransportMenuitemaction update);
 static void transport_menuitem_real_handle_event (DbusmenuMenuitem* base, const char* name, GValue* input_value, guint timestamp);
 GeeHashSet* transport_menuitem_attributes_format (void);
 
@@ -179,7 +179,7 @@ static void transport_menuitem_real_handle_event (DbusmenuMenuitem* base, const
 	g_debug ("transport-menu-item.vala:46: handle_event with value %s", _tmp0_ = g_strdup_printf ("%i", input));
 	_g_free0 (_tmp0_);
 	g_debug ("transport-menu-item.vala:47: transport owner name = %s", player_controller_get_name (player_item_get_owner ((PlayerItem*) self)));
-	mpris_controller_transport_event (player_item_get_owner ((PlayerItem*) self)->mpris_adaptor, (TransportMenuitemaction) input);
+	mpris_bridge_transport_update (player_item_get_owner ((PlayerItem*) self)->mpris_bridge, (TransportMenuitemaction) input);
 }
 
 
diff --git a/src/transport-menu-item.vala b/src/transport-menu-item.vala
index 3d6dcdd..8bdd2c8 100644
--- a/src/transport-menu-item.vala
+++ b/src/transport-menu-item.vala
@@ -45,7 +45,7 @@ public class TransportMenuitem : PlayerItem
 		int input = input_value.get_int();
 		debug("handle_event with value %s", input.to_string());
 		debug("transport owner name = %s", this.owner.name);
-		this.owner.mpris_adaptor.transport_event((action)input);
+		this.owner.mpris_bridge.transport_update((action)input);
 	}	
 
 	public static HashSet<string> attributes_format()
diff --git a/src/transport-widget.h b/src/transport-widget.h
index 1d1aa6e..c69836a 100644
--- a/src/transport-widget.h
+++ b/src/transport-widget.h
@@ -20,7 +20,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __TRANSPORT_WIDGET_H__
 
 #include <gtk/gtkmenuitem.h>
-#include <libdbusmenu-gtk/menu.h>
+#include <libdbusmenu-gtk/menuitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/volume-widget.c b/src/volume-widget.c
new file mode 100644
index 0000000..bf1ddb9
--- /dev/null
+++ b/src/volume-widget.c
@@ -0,0 +1,247 @@
+/*
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib/gi18n.h>
+#include <math.h>
+#include <glib.h>
+#include "volume-widget.h"
+#include "common-defs.h"
+#include <libido/idoscalemenuitem.h>
+
+typedef struct _VolumeWidgetPrivate VolumeWidgetPrivate;
+
+struct _VolumeWidgetPrivate
+{
+	DbusmenuMenuitem* twin_item;	
+	GtkWidget* ido_volume_slider;
+	gboolean grabbed;
+};
+
+#define VOLUME_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), VOLUME_WIDGET_TYPE, VolumeWidgetPrivate))
+
+/* Prototypes */
+static void volume_widget_class_init (VolumeWidgetClass *klass);
+static void volume_widget_init       (VolumeWidget *self);
+static void volume_widget_dispose    (GObject *object);
+static void volume_widget_finalize   (GObject *object);
+static void volume_widget_set_twin_item( VolumeWidget* self,
+                           							DbusmenuMenuitem* twin_item);
+static void volume_widget_property_update( DbusmenuMenuitem* item, gchar* property, 
+                                       	  GValue* value, gpointer userdata);
+static gboolean volume_widget_change_value_cb (GtkRange     *range,
+                                 							GtkScrollType scroll,
+                                 							gdouble       value,
+                                 							gpointer      user_data);
+static gboolean volume_widget_value_changed_cb(GtkRange *range, gpointer user_data);
+static void volume_widget_slider_grabbed(GtkWidget *widget, gpointer user_data);
+static void volume_widget_slider_released(GtkWidget *widget, gpointer user_data);
+static void volume_widget_parent_changed (GtkWidget *widget, gpointer user_data);
+
+G_DEFINE_TYPE (VolumeWidget, volume_widget, G_TYPE_OBJECT);
+
+static void
+volume_widget_class_init (VolumeWidgetClass *klass)
+{
+	GObjectClass 			*gobject_class = G_OBJECT_CLASS (klass);
+	
+	g_type_class_add_private (klass, sizeof (VolumeWidgetPrivate));
+
+	gobject_class->dispose = volume_widget_dispose;
+	gobject_class->finalize = volume_widget_finalize;
+}
+
+static void
+volume_widget_init (VolumeWidget *self)
+{
+	g_debug("VolumeWidget::volume_widget_init");
+	VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(self);
+
+  priv->ido_volume_slider = ido_scale_menu_item_new_with_range ("VOLUME", IDO_RANGE_STYLE_DEFAULT,  0, 0, 100, 1);
+	g_object_ref (priv->ido_volume_slider);
+	ido_scale_menu_item_set_style (IDO_SCALE_MENU_ITEM (priv->ido_volume_slider), IDO_SCALE_MENU_ITEM_STYLE_IMAGE);	
+  g_object_set(priv->ido_volume_slider, "reverse-scroll-events", TRUE, NULL);
+
+  g_signal_connect (priv->ido_volume_slider,
+                    "notify::parent", G_CALLBACK (volume_widget_parent_changed),
+                    NULL);
+	
+  GtkWidget* volume_widget = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);	
+	
+	g_signal_connect(volume_widget, "change-value", G_CALLBACK(volume_widget_change_value_cb), self);	
+	g_signal_connect(volume_widget, "value-changed", G_CALLBACK(volume_widget_value_changed_cb), self);	
+  g_signal_connect(priv->ido_volume_slider, "slider-grabbed", G_CALLBACK(volume_widget_slider_grabbed), self);
+  g_signal_connect(priv->ido_volume_slider, "slider-released", G_CALLBACK(volume_widget_slider_released), self);
+
+  GtkWidget* primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)priv->ido_volume_slider);
+  GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks("audio-volume-low-zero-panel");
+  gtk_image_set_from_gicon(GTK_IMAGE(primary_image), primary_gicon, GTK_ICON_SIZE_MENU);
+  g_object_unref(primary_gicon);
+
+  GtkWidget* secondary_image = ido_scale_menu_item_get_secondary_image((IdoScaleMenuItem*)priv->ido_volume_slider);
+  GIcon * secondary_gicon = g_themed_icon_new_with_default_fallbacks("audio-volume-high-panel");
+  gtk_image_set_from_gicon(GTK_IMAGE(secondary_image), secondary_gicon, GTK_ICON_SIZE_MENU);
+  g_object_unref(secondary_gicon);
+
+  GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (volume_widget));
+  gtk_adjustment_set_step_increment(adj, 3);
+}
+
+static void
+volume_widget_dispose (GObject *object)
+{
+	G_OBJECT_CLASS (volume_widget_parent_class)->dispose (object);
+}
+
+static void
+volume_widget_finalize (GObject *object)
+{
+	G_OBJECT_CLASS (volume_widget_parent_class)->finalize (object);
+}
+
+static void 
+volume_widget_property_update(DbusmenuMenuitem* item, gchar* property, 
+                             GValue* value, gpointer userdata)
+{	
+	g_return_if_fail (IS_VOLUME_WIDGET (userdata));	
+	VolumeWidget* mitem = VOLUME_WIDGET(userdata);
+	VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(mitem);
+	g_debug("scrub-widget::property_update for prop %s", property); 
+	if(g_ascii_strcasecmp(DBUSMENU_VOLUME_MENUITEM_LEVEL, property) == 0){
+		if(priv->grabbed == FALSE){
+			GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
+			GtkRange *range = (GtkRange*)slider;
+			gdouble update = g_value_get_double (value);
+			g_debug("volume-widget - update level with value %f", update);
+			gtk_range_set_value(range, update);
+  		determine_state_from_volume(update);			
+		}
+	}
+}
+
+static void
+volume_widget_set_twin_item(VolumeWidget* self,
+                           DbusmenuMenuitem* twin_item)
+{
+	VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(self);
+	priv->twin_item = twin_item;
+	g_object_ref(priv->twin_item);
+	g_signal_connect(G_OBJECT(twin_item), "property-changed", 
+	                 G_CALLBACK(volume_widget_property_update), self);
+	gdouble initial_level = g_value_get_double (dbusmenu_menuitem_property_get_value(twin_item,
+	                                            DBUSMENU_VOLUME_MENUITEM_LEVEL));
+	g_debug("volume_widget_set_twin_item initial level = %f", initial_level);
+  GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);
+  GtkRange *range = (GtkRange*)slider;
+ 	gtk_range_set_value(range, initial_level);
+  determine_state_from_volume(initial_level);	
+}
+
+static gboolean
+volume_widget_change_value_cb (GtkRange     *range,
+                 							GtkScrollType scroll,
+                 							gdouble       new_value,
+                 							gpointer      user_data)
+{
+	g_return_val_if_fail (IS_VOLUME_WIDGET (user_data), FALSE);
+	VolumeWidget* mitem = VOLUME_WIDGET(user_data);
+	volume_widget_update(mitem, new_value);	
+  determine_state_from_volume(new_value);
+	return FALSE;
+}
+
+/*
+ We only want this callback to catch mouse icon press events
+ which set the slider to 0 or 100. Ignore all other events.
+*/ 
+static gboolean
+volume_widget_value_changed_cb(GtkRange *range, gpointer user_data)
+{
+	g_return_val_if_fail (IS_VOLUME_WIDGET (user_data), FALSE);
+	VolumeWidget* mitem = VOLUME_WIDGET(user_data);
+	VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(mitem);
+	GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)priv->ido_volume_slider);	
+  gdouble current_value =  CLAMP(gtk_range_get_value(GTK_RANGE(slider)), 0, 100);
+	
+	if(current_value == 0 || current_value == 100){
+		volume_widget_update(mitem, current_value);
+	}
+  return FALSE;
+}
+
+void 
+volume_widget_update(VolumeWidget* self, gdouble update)
+{
+	VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(self);
+	GValue value = {0};
+  g_value_init(&value, G_TYPE_DOUBLE);
+	gdouble clamped = CLAMP(update, 0, 100);
+  g_value_set_double(&value, clamped);
+  dbusmenu_menuitem_handle_event (priv->twin_item, "update", &value, 0);
+}
+
+
+
+GtkWidget*
+volume_widget_get_ido_slider(VolumeWidget* self)
+{
+	VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(self);
+	return priv->ido_volume_slider;	
+}
+
+static void
+volume_widget_parent_changed (GtkWidget *widget,
+                       				gpointer   user_data)
+{
+  gtk_widget_set_size_request (widget, 200, -1);
+  g_debug("volume_widget_parent_changed");
+}
+
+static void
+volume_widget_slider_grabbed(GtkWidget *widget, gpointer user_data)
+{
+	VolumeWidget* mitem = VOLUME_WIDGET(user_data);
+	VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(mitem);
+	priv->grabbed = TRUE;	
+}
+
+static void
+volume_widget_slider_released(GtkWidget *widget, gpointer user_data)
+{
+	VolumeWidget* mitem = VOLUME_WIDGET(user_data);
+	VolumeWidgetPrivate * priv = VOLUME_WIDGET_GET_PRIVATE(mitem);
+	priv->grabbed = FALSE;
+}
+
+/**
+ * volume_widget_new:
+ * @returns: a new #VolumeWidget.
+ **/
+GtkWidget* 
+volume_widget_new(DbusmenuMenuitem *item)
+{
+	GtkWidget* widget = g_object_new(VOLUME_WIDGET_TYPE, NULL);
+	volume_widget_set_twin_item((VolumeWidget*)widget, item);
+	return widget;
+}
+
+
diff --git a/src/volume-widget.h b/src/volume-widget.h
new file mode 100644
index 0000000..d4929ec
--- /dev/null
+++ b/src/volume-widget.h
@@ -0,0 +1,54 @@
+/*
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Conor Curran <conor.curran@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef __VOLUME_WIDGET_H__
+#define __VOLUME_WIDGET_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <libdbusmenu-gtk/menuitem.h>
+
+G_BEGIN_DECLS
+
+#define VOLUME_WIDGET_TYPE            (volume_widget_get_type ())
+#define VOLUME_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VOLUME_WIDGET_TYPE, VolumeWidget))
+#define VOLUME_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), VOLUME_WIDGET_TYPE, VolumeWidgetClass))
+#define IS_VOLUME_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VOLUME_WIDGET_TYPE))
+#define IS_VOLUME_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VOLUME_WIDGET_TYPE))
+#define VOLUME_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), VOLUME_WIDGET_TYPE, VolumeWidgetClass))
+
+typedef struct _VolumeWidget	VolumeWidget;
+typedef struct _VolumeWidgetClass	VolumeWidgetClass;
+
+struct _VolumeWidgetClass {
+  GObjectClass parent_class;
+};
+
+struct _VolumeWidget {
+	GObject parent;
+};
+
+GType volume_widget_get_type (void) G_GNUC_CONST;
+GtkWidget* volume_widget_new(DbusmenuMenuitem* twin_item);
+GtkWidget* volume_widget_get_ido_slider(VolumeWidget* self);
+void volume_widget_update(VolumeWidget* self, gdouble update);
+
+G_END_DECLS
+
+#endif
+
diff --git a/tests/test-indicator-sound-dbus-client.c b/tests/test-indicator-sound-dbus-client.c
index 1c23dc5..265a36d 100644
--- a/tests/test-indicator-sound-dbus-client.c
+++ b/tests/test-indicator-sound-dbus-client.c
@@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include <glib.h>
 #include <dbus/dbus-glib.h>
 #include "../src/dbus-shared-names.h"
@@ -34,59 +33,42 @@ static DBusGProxy * proxy= NULL;
 static void
 test_fetch_mute(DBusGProxy * proxy)
 {
-    GError * error = NULL;
-    gboolean *fetched_mute_value;
-    fetched_mute_value = g_new0(gboolean, 1);
-    org_ayatana_indicator_sound_get_sink_mute(proxy, fetched_mute_value, &error);
+  GError * error = NULL;
+  gboolean *fetched_mute_value;
+  fetched_mute_value = g_new0(gboolean, 1);
+  org_ayatana_indicator_sound_get_sink_mute(proxy, fetched_mute_value, &error);
 	if (error != NULL) {
 		g_warning("test-indicator-sound-dbus-client::test_fetch_mute - Unable to fetch mute: %s", error->message);
 		g_error_free(error);
-        g_free(fetched_mute_value);
-        return;
-	}
-    g_assert(TEST_MUTE_VALUE == *fetched_mute_value); 
     g_free(fetched_mute_value);
+    return;
+	}
+  g_assert(TEST_MUTE_VALUE == *fetched_mute_value); 
+  g_free(fetched_mute_value);
 }
 
-static void
-test_fetch_volume(DBusGProxy * proxy)
+static void 
+test_fetch_availability(DBusGProxy * proxy)
 {
 	GError * error = NULL;
-    gdouble *volume_percent_input;
-    volume_percent_input = g_new0(gdouble, 1);
-    org_ayatana_indicator_sound_get_sink_volume(proxy, volume_percent_input, &error);
+	gboolean * available_input;
+	available_input = g_new0(gboolean, 1);
+	org_ayatana_indicator_sound_get_sink_availability(proxy, available_input, &error);
 	if (error != NULL) {
-		g_warning("test-indicator-sound-dbus-client::test_fetch_volume - Unable to fetch VOLUME: %s", error->message);
+		g_warning("test-indicator-sound-dbus-client::test_fetch_availability - unable to fetch availability %s", error->message);
 		g_error_free(error);
-        g_free(volume_percent_input);
-        return;
+	  g_free(available_input);
+	  return;
 	}
-    g_assert(TEST_VOLUME_VALUE == *volume_percent_input); 
-    g_free(volume_percent_input);
-}
-
-static void 
-test_fetch_availability(DBusGProxy * proxy)
-{
-    GError * error = NULL;
-    gboolean * available_input;
-    available_input = g_new0(gboolean, 1);
-    org_ayatana_indicator_sound_get_sink_availability(proxy, available_input, &error);
-    if (error != NULL) {
-	    g_warning("test-indicator-sound-dbus-client::test_fetch_availability - unable to fetch availability %s", error->message);
-	    g_error_free(error);
-        g_free(available_input);
-        return;
-    }
-    g_assert(TEST_AVAILABLE_VALUE == *available_input);
-    g_free(available_input);
+	g_assert(TEST_AVAILABLE_VALUE == *available_input);
+	g_free(available_input);
 }
 
 
 gboolean
 kill_func (gpointer userdata)
 {
-    g_free(proxy);
+  g_free(proxy);
 	g_main_loop_quit(mainloop);
 	return FALSE;
 }
@@ -107,24 +89,17 @@ main (gint argc, gchar * argv[])
 	}
 
 	DBusGProxy * proxy = dbus_g_proxy_new_for_name_owner(session_bus,
-                                            ":1.0",
-											 INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
-                                             INDICATOR_SOUND_SERVICE_DBUS_INTERFACE,
-                                             &error);
+                                            					 ":1.0",
+											 																	INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
+                                             						INDICATOR_SOUND_SERVICE_DBUS_INTERFACE,
+                                             						&error);
 	if (error != NULL) {
 		g_error("Unable to get property proxy: %s", error->message);
 		return 1;
 	}
 
-/*    g_test_add_func("/test-indicator-sound-dbus/test-fetch-mute", test_fetch_mute);*/
-/*    g_test_add_func("/test-indicator-sound-dbus/test-fetch-volume", test_fetch_volume);*/
-/*    g_test_add_func("/test-indicator-sound-dbus/test-fetch-availability", test_fetch_availability);*/
-/*    g_test_queue_free(proxy);*/
-/*    return g_test_run();*/
-
-    test_fetch_mute(proxy);
-    test_fetch_volume(proxy);    
-    test_fetch_availability(proxy);    
+  test_fetch_mute(proxy);
+  test_fetch_availability(proxy);    
 
 	g_timeout_add_seconds(2, kill_func, NULL);
 
diff --git a/tests/test-indicator-sound-dbus-server.c b/tests/test-indicator-sound-dbus-server.c
index 6912dc4..b1e3d9c 100644
--- a/tests/test-indicator-sound-dbus-server.c
+++ b/tests/test-indicator-sound-dbus-server.c
@@ -35,33 +35,29 @@ gboolean
 kill_func (gpointer userdata)
 {
 	g_main_loop_quit(mainloop);
-    // TODO free the dbus interface !!
 	return FALSE;
 }
 
 gint
 main (gint argc, gchar * argv[])
 {
-    g_type_init();
-   
-	//g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
+	g_type_init();
 
-    dbus_interface = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL);
+	dbus_interface = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL);
 
-    // Set the mute value
-    sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE_VALUE);
-    sound_service_dbus_update_sink_volume(dbus_interface, TEST_VOLUME_VALUE);
-    sound_service_dbus_update_sink_availability(dbus_interface, TEST_AVAILABLE_VALUE);
+	// Set the mute value
+	sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE_VALUE);
+	sound_service_dbus_update_sink_availability(dbus_interface, TEST_AVAILABLE_VALUE);
 
-    g_timeout_add_seconds(4, kill_func, NULL);
+	g_timeout_add_seconds(4, kill_func, NULL);
 
-    // Run the loop
-    mainloop = g_main_loop_new(NULL, FALSE);
-    g_main_loop_run(mainloop);
+	// Run the loop
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
 
 	g_debug("Quiting");
 
-    return 0;
+	return 0;
 }
 
 
diff --git a/tests/test-indicator-sound.c b/tests/test-indicator-sound.c
index cd28587..e5d4657 100644
--- a/tests/test-indicator-sound.c
+++ b/tests/test-indicator-sound.c
@@ -91,9 +91,7 @@ gint main (gint argc, gchar * argv[])
 	g_type_init();
 	g_test_init(&argc, &argv, NULL);
 
-/*    g_test_add_func("/indicator-sound/indicator-sound/init", test_libindicator_sound_init);*/
-/*    g_test_add_func("/indicator-sound/indicator-sound/state_machine", test_libindicator_determine_state);*/
-    g_test_add_func("/indicator-sound/indicator-sound/image_names", test_libindicator_image_names);
+  g_test_add_func("/indicator-sound/indicator-sound/image_names", test_libindicator_image_names);
 
 	return g_test_run ();
 }
author	Sebastien Bacher <seb128@ubuntu.com>	2010-08-26 11:27:27 +0200
committer	Sebastien Bacher <seb128@ubuntu.com>	2010-08-26 11:27:27 +0200
commit	4bad61faf27bf1e5b5c967d641d1d36b1260d8e1 (patch)
tree	9cb69ca30ed4469e543b92c01eac2b6fa4af3838
parent	022c9bd2558d5881523d68d217c398e475a9da6e (diff)
parent	b4d305f16bae6804dcf2acf8b9ecc4629807c150 (diff)
download	ayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.tar.gz ayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.tar.bz2 ayatana-indicator-sound-4bad61faf27bf1e5b5c967d641d1d36b1260d8e1.zip