Merge lp:~dobey/ubuntu/precise/rhythmbox/prereleases-2-95-5 into lp:ubuntu/precise/rhythmbox

[dobey]

[lp:~dobey/ubuntu/precise/rhythmbox/prereleases-2-95-5]

210. By dobey on 2012-03-08

Remvoe the mpris name patch which is included upstream.

[Martin Pitt (pitti)]

Thanks! Merging with using Breaks: instead of Conflicts:.

review: Approve

=== removed directory '.pc/01_lpi.patch'
=== removed file '.pc/01_lpi.patch/configure.ac'
--- .pc/01_lpi.patch/configure.ac	2012-01-17 16:56:40 +0000
+++ .pc/01_lpi.patch/configure.ac	1970-01-01 00:00:00 +0000
@@ -1,988 +0,0 @@
-AC_PREREQ(2.53)
-AC_INIT([rhythmbox],
-	[2.95],
-	[https://bugzilla.gnome.org/enter_bug.cgi?product=rhythmbox])
-AC_CONFIG_SRCDIR(rhythmbox.pc.in)
-AC_CONFIG_MACRO_DIR(macros)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip])
-
-AC_SUBST(ACLOCAL_AMFLAGS, "-I macros")
-
-AM_MAINTAINER_MODE([enable])
-GNOME_MAINTAINER_MODE_DEFINES
-
-# plugin API versioning
-# Increment on interface addition, reset on removal
-RHYTHMBOX_CORE_AGE=0
-# Increment on interface add, remove, or change
-RHYTHMBOX_CORE_CURRENT=5
-# Increment on source change, reset when CURRENT changes.
-RHYTHMBOX_CORE_REVISION=0
-
-AC_SUBST(RHYTHMBOX_CORE_AGE)
-AC_SUBST(RHYTHMBOX_CORE_CURRENT)
-AC_SUBST(RHYTHMBOX_CORE_REVISION)
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
-
-dnl XXXX hack to kill off all the libtool tags ...
-dnl it isn't like we are using C++ or Fortran.
-m4_define([_LT_AC_TAGCONFIG],[])
-
-GOBJECT_INTROSPECTION_REQS=0.10.0
-GOBJECT_INTROSPECTION_REQUIRE([$GOBJECT_INTROSPECTION_REQS])
-
-IT_PROG_INTLTOOL([0.35.0])
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_STDC_HEADERS
-AM_PROG_LIBTOOL
-m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(long)
-
-GTK_REQS=2.91.4
-
-GST_0_10_REQS=0.10.32
-GDK_PIXBUF_REQS=2.18.0
-GLIB_REQS=2.26.0
-LIBGPOD_REQS=0.6
-MUSICBRAINZ3_REQS=3.0.2
-TOTEM_PLPARSER_REQS=2.32.1
-VALA_REQS=0.9.4
-AVAHI_REQS=0.6
-LIBSOUP_REQS=2.26.0
-GUDEV_REQS=143
-LIBMTP_REQS=0.3.0
-LIBPEAS_REQS=0.7.3
-GRILO_REQS=0.1.17
-
-LIBNOTIFY_REQS=0.7.0
-BRASERO_MIN_REQS=2.31.5
-WEBKIT_MIN_REQS=1.3.9
-PYGOBJECT_REQUIRED=2.90.2
-
-GLIB_GSETTINGS
-
-
-
-AC_MSG_CHECKING([for GNU extension fwrite_unlocked])
-AC_LINK_IFELSE(
-[AC_LANG_PROGRAM([[
-#define _GNU_SOURCE
-#include <stdio.h>
-]],
-[[fwrite_unlocked ("foo", 1, sizeof ("foo"), stdout);]])],[have_fwrite_unlocked=yes])
-if test x"$have_fwrite_unlocked" = xyes; then
-	AC_DEFINE(HAVE_GNU_FWRITE_UNLOCKED,1,[Define if you have GNU fwrite_unlocked])
-	AC_MSG_RESULT([yes])
-else
-	AC_MSG_RESULT([no])
-fi
-
-PKG_PROG_PKG_CONFIG
-
-PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-unix-2.0 >= $GLIB_REQS)
-
-dnl  note: gio-unix-2.0 is here for libmediaplayerid
-PKG_CHECK_MODULES(RHYTHMBOX,				\
-		  gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \
-		  gtk+-3.0 >= $GTK_REQS			\
-		  gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS	\
-		  glib-2.0 >= $GLIB_REQS		\
-		  gio-2.0 >= $GLIB_REQS			\
-		  gio-unix-2.0 >= $GLIB_REQS		\
-		  libsoup-2.4 >= $LIBSOUP_REQS		\
-		  libsoup-gnome-2.4 >= $LIBSOUP_REQS	\
-		  libpeas-1.0 >= $LIBPEAS_REQS		\
-		  libpeas-gtk-1.0 >= $LIBPEAS_REQS	\
-		  tdb >= 1.2.6)
-
-PKG_CHECK_MODULES(TOTEM_PLPARSER, totem-plparser >= $TOTEM_PLPARSER_REQS, have_totem_plparser=yes, have_totem_plparser=no)
-if test x$have_totem_plparser != xyes; then
-   AC_MSG_ERROR([totem playlist parsing library not found or too old])
-else
-   if test "x`pkg-config --variable uselibcamel totem-plparser`" = "xno" ; then
-       AC_MSG_ERROR([totem playlist parsing library has Podcast parsing disabled])
-   fi
-fi
-
-dnl gudev
-AC_ARG_WITH(gudev,
-	    AC_HELP_STRING([--with-gudev],
-			   [Enable GUdev for hardware detection]),,
-	    with_gudev=auto)
-if test x"$with_gudev" != "xno"; then
-	PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= $GUDEV_REQS,
-			  have_gudev=yes, have_gudev=no)
-	if test x"$have_gudev" = "xno" -a x"$with_gudev" = "xyes"; then
-	  AC_MSG_ERROR([GUdev explicitly requested, but is not available])
-	fi
-	if test x"$have_gudev" = "xyes"; then
-	  use_gudev=yes
-	  AC_SUBST(GUDEV_CFLAGS)
-	  AC_SUBST(GUDEV_LIBS)
-	  AC_DEFINE(HAVE_GUDEV, 1, [Use GUdev for hardware detection])
-	else
-	  use_gudev=no
-	fi
-else
-  use_gudev=no
-fi
-AM_CONDITIONAL(USE_GUDEV, test x"$use_gudev" = xyes)
-
-dnl hal remnants
-AC_ARG_WITH(hal,
-	      AC_HELP_STRING([--without-hal],
-			     [Disable HAL support]))
-if test "x$with_hal" != "xno"; then
-  PKG_CHECK_MODULES(HAL, hal >= 0.5 hal < 0.6 dbus-glib-1, enable_hal=yes, enable_hal=no)
-  if test "x$enable_hal" != "xyes" -a "x$with_hal" = "xyes"; then
-      AC_MSG_ERROR([HAL support explicitly requested but HAL couldn't be found])
-  fi
-
-  if test "x$enable_hal" = "xyes"; then
-    AC_DEFINE(HAVE_HAL, 1, [Define if you have HAL support])
-    AC_SUBST(HAL_CFLAGS)
-    AC_SUBST(HAL_LIBS)
-  fi	
-fi
-AM_CONDITIONAL(HAVE_HAL, test x"$enable_hal" = xyes)
-
-
-dnl iPod support
-AC_ARG_WITH(ipod,
-            AC_HELP_STRING([--with-ipod],
-			   [Enable iPod support]),,
-	      with_ipod=auto)
-if test "x$with_ipod" != "xno"; then
-	PKG_CHECK_MODULES(IPOD, libgpod-1.0 >= $LIBGPOD_REQS,
-	                  have_libgpod=yes, have_libgpod=no)
-	if test "x$have_libgpod" = "xno" -a "x$with_ipod" = "xyes"; then
-	  AC_MSG_ERROR([iPod explicitly requested but libgpod couldn't be found])
-	fi
-	if test "x$have_libgpod" = "xyes"; then
-	  PKG_CHECK_EXISTS(libgpod-1.0 >= 0.7.92, have_itdb_start_stop_sync=yes,
-						  have_itdb_start_stop_sync=no)
-          if test "x$have_itdb_start_stop_sync" = "xyes"; then
-	    AC_DEFINE([HAVE_ITDB_START_STOP_SYNC], 1, [Indicates whether libgpod is new enough to have its itdb_start/stop_sync API])
-          fi
-	  use_ipod=yes
-	  AC_SUBST(IPOD_CFLAGS)
-	  AC_SUBST(IPOD_LIBS)
-	fi
-fi
-AM_CONDITIONAL(USE_IPOD, test x"$use_ipod" = xyes)
-
-dnl mtp support
-AC_ARG_WITH(mtp,
-            AC_HELP_STRING([--with-mtp],
-			   [Enable MTP support]),,
-	      with_mtp=auto)
-if test "x$with_mtp" != "xno"; then
-	can_use_mtp=no
-	if test x"$use_gudev" = "xyes" -o x"$enable_hal" = "xyes"; then
-	  can_use_mtp=yes
-	fi
-
-	PKG_CHECK_MODULES(MTP, libmtp >= $LIBMTP_REQS, have_libmtp=yes, have_libmtp=no)
-	if test x"$with_mtp" = "xyes"; then
-	  if test x"$have_libmtp" = "xno"; then
-	    AC_MSG_ERROR([MTP explicitly requested but libmtp is not available])
-	  fi
-	  if test x"$can_use_mtp" = "xno"; then
-	    AC_MSG_ERROR([MTP explicitly requested but GUdev and HAL are not available])
-	  fi
-	fi
-	if test "x$have_libmtp" = "xyes" -a "x$can_use_mtp" = "xyes"; then
-	  use_mtp=yes
-	  AC_SUBST(MTP_CFLAGS)
-	  AC_SUBST(MTP_LIBS)
-	fi
-fi
-AM_CONDITIONAL(USE_MTP, test x"$use_mtp" = xyes)
-
-
-dnl gnome-keyring support
-
-AC_ARG_WITH(gnome-keyring,
-            AC_HELP_STRING([--with-gnome-keyring],
-			   [Enable gnome-keyring support]),,
-	      with_gnome_keyring=auto)
-if test "x$with_gnome_keyring" != "xno"; then
-
-	PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1, have_gnome_keyring=yes, have_gnome_keyring=no)
-	if test "x$have_gnome_keyring" = "xno" -a "x$with_gnome_keyring" = "xyes"; then
-	  AC_MSG_ERROR([gnome-keyring support explicitly requested but gnome-keyring couldn't be found])
-	fi
-	if test "x$have_gnome_keyring" = "xyes"; then
-	   AC_DEFINE(WITH_GNOME_KEYRING, 1, [Define if gnome-keyring support is enabled])
-	   use_gnome_keyring=yes
-	  AC_SUBST(GNOME_KEYRING_CFLAGS)
-	  AC_SUBST(GNOME_KEYRING_LIBS)
-	fi
-fi
-AM_CONDITIONAL(USE_GNOME_KEYRING, test x"$use_gnome_keyring" = xyes)
-
-dnl Database
-AC_ARG_WITH(database,
-              AC_HELP_STRING([--with-database=tree],
-			     [Select the database to use (default tree)]),,
-	      with_database=tree)
-AM_CONDITIONAL(USE_TREEDB, test x"$with_database" = xtree)
-
-case "x$with_database" in
-  "xtree")
-    AC_DEFINE(WITH_RHYTHMDB_TREE, 1, [Define if you are using the RhythmDB tree database])
-    ;;
-  *)
-    AC_MSG_ERROR([Unknown database selected])
-    ;;
-esac
-
-dnl Database debugging
-AC_ARG_WITH(rhythmdb-debug,
-              AC_HELP_STRING([--with-rhythmdb-debug=0|1|2],
-			     [Level of RhythmDB sanity checking]),,with_rhythmdb_debug=0)
-if test x"${with_rhythmdb_debug}" != x0; then
-   AC_DEFINE_UNQUOTED([RHYTHMDB_ENABLE_SANITY_CHECK], "${with_rhythmdb_debug}", [Define to the level of RhythmDB sanity checking])
-fi
-
-dnl Sound system
-dnl Now we're ready to ask for gstreamer libs and cflags
-dnl And we can also ask for the right version of gstreamer
-PKG_CHECK_MODULES(GSTREAMER_0_10, \
-	gstreamer-0.10 >= $GST_0_10_REQS
-	gstreamer-base-0.10 >= $GST_0_10_REQS
-	gstreamer-plugins-base-0.10 >= $GST_0_10_REQS
-	gstreamer-interfaces-0.10 >= $GST_0_10_REQS
-	gstreamer-pbutils-0.10 >= $GST_0_10_REQS)
-
-RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GSTREAMER_0_10_CFLAGS"
-RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_10_LIBS"
-
-AC_ARG_WITH(mdns,
-   AC_HELP_STRING([--with-mdns=auto|avahi],
-   [Select the mDNS/DNS-SD implementation to use (default auto)]),,
-   with_mdns=auto)
-
-have_avahi=no
-have_mdns=no
-use_avahi=no
-
-PKG_CHECK_MODULES(AVAHI,
-   avahi-client >= $AVAHI_REQS
-   avahi-glib >= $AVAHI_REQS,
-   have_avahi=yes,
-   have_avahi=no)
-
-if test x"$with_mdns" = xauto || test x"$with_mdns" = xavahi; then
-   if test x"$have_avahi" = xyes; then
-      MDNS_CFLAGS=$AVAHI_CFLAGS
-      MDNS_LIBS=$AVAHI_LIBS
-      AC_DEFINE(WITH_AVAHI, 1, [Define if mDNS/DNS-SD implementation uses Avahi])
-      use_avahi=yes
-      AC_MSG_NOTICE([Detected Avahi, using it for mDNS/DNS-SD])
-      have_mdns=yes
-   elif test x"$with_mdns" = xavahi; then
-      AC_MSG_ERROR([Avahi explicitly requested but not found.])
-   fi
-fi
-
-AM_CONDITIONAL(USE_AVAHI, test "x$use_avahi" = "xyes")
-
-AC_ARG_ENABLE(libnotify,
-            AC_HELP_STRING([--disable-libnotify],
-			   [Disable libnotify support]),,
-	      enable_libnotify=auto)
-if test "x$enable_libnotify" != "xno"; then
-	PKG_CHECK_MODULES(NOTIFY,                            \
-			  libnotify >= $LIBNOTIFY_REQS,
-			  have_libnotify=yes,
-			  have_libnotify=no)
-	if test "x$have_libnotify" = "xno" -a "x$enable_libnotify" = "xyes"; then
-	  AC_MSG_ERROR([libnotify support explicitly requested, but libnotify couldn't be found])
-	fi
-	if test "x$have_libnotify" = "xyes"; then
-	     enable_libnotify=yes
-	fi
-fi
-AM_CONDITIONAL(USE_NOTIFY, test x"$enable_libnotify" = xyes)
-if test x$enable_libnotify = xyes ; then
-    # Find out the version of LIBNOTIFY we're using
-    libnotify_version=`pkg-config --modversion libnotify`
-    LIBNOTIFY_VERSION_MAJOR=`echo $libnotify_version | awk -F. '{print $1}'`
-    LIBNOTIFY_VERSION_MINOR=`echo $libnotify_version | awk -F. '{print $2}'`
-    LIBNOTIFY_VERSION_MICRO=`echo $libnotify_version | awk -F. '{print $3}'`
-    if test "z$LIBNOTIFY_VERSION_MAJOR" = "z"; then
-        LIBNOTIFY_VERSION_MAJOR="0"
-    fi
-    if test "z$LIBNOTIFY_VERSION_MINOR" = "z"; then
-        LIBNOTIFY_VERSION_MINOR="0"
-    fi
-    if test "z$LIBNOTIFY_VERSION_MICRO" = "z"; then
-        LIBNOTIFY_VERSION_MICRO="0"
-    fi
-    echo "Your libnotify version is $LIBNOTIFY_VERSION_MAJOR,$LIBNOTIFY_VERSION_MINOR,$LIBNOTIFY_VERSION_MICRO."
-    NOTIFY_CFLAGS="$NOTIFY_CFLAGS -DLIBNOTIFY_VERSION_MAJOR=$LIBNOTIFY_VERSION_MAJOR"
-    NOTIFY_CFLAGS="$NOTIFY_CFLAGS -DLIBNOTIFY_VERSION_MINOR=$LIBNOTIFY_VERSION_MINOR"
-    NOTIFY_CFLAGS="$NOTIFY_CFLAGS -DLIBNOTIFY_VERSION_MICRO=$LIBNOTIFY_VERSION_MICRO"
-
-    AC_DEFINE(HAVE_NOTIFY, 1, [Define if libnotify support is enabled])
-    AC_SUBST(NOTIFY_CFLAGS)
-    AC_SUBST(NOTIFY_LIBS)
-fi
-
-AC_CHECK_LIB(z, uncompress)
-
-dnl check for libgstcdda, needed to list the audio tracks
-PKG_CHECK_MODULES(GSTCDDA, gstreamer-cdda-0.10)
-AC_SUBST(GSTCDDA_LIBS)
-AC_SUBST(GSTCDDA_CFLAGS)
-
-dnl check for MusicBrainz
-have_sj_metadata_getter=no
-AC_ARG_ENABLE(musicbrainz, AC_HELP_STRING([--disable-musicbrainz],
-				[don't build with MusicBrainz support]))
-if test x"$enable_musicbrainz" != "xno"; then
-	PKG_CHECK_MODULES(MUSICBRAINZ3, libmusicbrainz3 >= $MUSICBRAINZ3_REQS gconf-2.0, [have_musicbrainz3=yes], [have_musicbrainz3=no])
-
-	AC_SUBST(MUSICBRAINZ3_CFLAGS)
-	AC_SUBST(MUSICBRAINZ3_LIBS)
-
-	if test x"$have_musicbrainz3" = xyes; then
-		oldlibs=$LIBS
-		LIBS="$LIBS $MUSICBRAINZ3_LIBS"
-		AC_CHECK_FUNCS(mb_extract_uuid)
-		LIBS="$oldlibs"
-
-		AC_DEFINE([HAVE_MUSICBRAINZ3], 1, [Whether libmusicbrainz3 is available])
-		have_sj_metadata_getter=yes
-		AC_DEFINE([HAVE_SJ_METADATA_GETTER], 1, [Whether to use the sound-juicer metadata getter code])
-	else
-		if test x"$enable_musicbrainz" = xyes; then
-			AC_MSG_ERROR([MusicBrainz requested, but neither libmusicbrainz nor libmusicbrainz3 are available])
-		fi
-	fi
-fi
-AM_CONDITIONAL([HAVE_MUSICBRAINZ3], [test "x$have_musicbrainz3" = "xyes"])
-AM_CONDITIONAL([HAVE_SJ_METADATA_GETTER], [test "x$have_sj_metadata_getter" = "xyes"])
-
-AC_PATH_XTRA
-CFLAGS="$CFLAGS $X_CFLAGS"
-#LIBS=$X_LIBS
-
-dnl Multimedia keys
-have_xfree=no
-AC_COMPILE_IFELSE([
-	#include <X11/XF86keysym.h>
-int main(int argc,char **argv) {
-  return 0;
-}
-], have_xfree=yes)
-AC_MSG_CHECKING(for XFree86 headers)
-AC_MSG_RESULT($have_xfree)
-if test x"$have_xfree" = "xyes" ; then
-	AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h])
-fi
-
-AC_ARG_ENABLE(mmkeys, AC_HELP_STRING([--disable-mmkeys],
-					[don't build with Multimedia Keys support]))
-if test x"$have_xfree" = xyes; then
-	if test x"$enable_mmkeys" != xno; then
-		enable_mmkeys=yes
-		AC_DEFINE(HAVE_MMKEYS, 1, [define if Multimedia Keys are enabled])
-	fi
-else
-	if test x"$enable_mmkeys" = xyes; then
-		AC_MSG_ERROR([Multimedia keys explicitly requested but no support found])
-	fi
-fi
-
-dnl libbrasero-media support
-have_libbrasero_media=no
-AC_ARG_WITH(brasero,
-	    AC_HELP_STRING([--with-brasero],
-	    		   [Build with libbrasero-media support]),,
-	    with_brasero=auto)
-if test x"$with_brasero" != "xno"; then
-    PKG_CHECK_MODULES(LIBBRASERO_MEDIA,
-	libbrasero-media3 >= $BRASERO_MIN_REQS,
-	have_libbrasero_media=yes,
-	have_libbrasero_media=no)
-    AC_SUBST(LIBBRASERO_MEDIA_CFLAGS)
-    AC_SUBST(LIBBRASERO_MEDIA_LIBS)
-fi
-if test "x$have_libbrasero_media" = "xyes"; then
-    AC_DEFINE([HAVE_LIBBRASERO_MEDIA], 1, [Have libbrasero-media])
-fi
-AM_CONDITIONAL(HAVE_LIBBRASERO_MEDIA, test x$have_libbrasero_media = xyes)
-AC_SUBST(HAVE_LIBBRASERO_MEDIA)
-
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
-
-AC_SUBST(RHYTHMBOX_CFLAGS)
-AC_SUBST(RHYTHMBOX_LIBS)
-
-AC_CACHE_CHECK([whether strftime supports %E and %O modifiers], ac_cv_strftime_supports_E_O, [
-AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <time.h>
-                int main ()
-                {
-                  char buf[100];
-                  struct tm tm = {0};
-                  tm.tm_year = 99;
-                  if (strftime(buf, 100, "%EY", &tm) == 4 &&
-                      strcmp (buf, "1999")==0)
-                    return 0;
-                  return 1;
-                }
-            ]])],
-            [ac_cv_strftime_supports_E_O=yes],
-            [ac_cv_strftime_supports_E_O=no],
-            [AC_MSG_RESULT([cannot run test program while cross compiling])
-            AC_MSG_ERROR([Please set ac_cv_strftime_supports_E_O to yes or no.])]
-            )
-])
-if test "x$ac_cv_strftime_supports_E_O" = xyes; then
-        AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
-fi
-
-GETTEXT_PACKAGE=rhythmbox
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
-
-AM_GLIB_GNU_GETTEXT
-
-dnl Workaround for automake 1.8
-AC_SUBST(mkdir_p) if test x"$mkdir_p" = "x"; then
-  MKINSTALLDIRS="mkinstalldirs"
-fi
-AC_SUBST(MKINSTALLDIRS)
-
-AM_GCONF_SOURCE_2
-
-dnl LIRC
-AC_ARG_ENABLE(lirc,
-	AC_HELP_STRING([--enable-lirc],[enable lirc support]))
-with_lirc=no
-if test x"$enable_lirc" != xno; then
-	AC_CHECK_HEADER(lirc/lirc_client.h,[with_lirc=yes],[with_lirc=no])
-	if test x"$with_lirc" = xyes; then
-		AC_CHECK_LIB(lirc_client,lirc_init,[with_lirc=yes],[with_lirc=no])
-	fi
-	if test x"$with_lirc" = xno -a x"$enable_lirc" = xyes; then
-		AC_MSG_ERROR([lirc explicitly requested but no support found])
-	fi
-fi
-AM_CONDITIONAL(WITH_LIRC, test x"$with_lirc" = xyes)
-
-dnl WebKit
-have_webkit=no
-AC_ARG_WITH(webkit,
-	    AC_HELP_STRING([--with-webkit],
-			   [Use WebKit to display HTML]),,
-	    with_webkit=auto)
-if test "x$with_webkit" != xno; then
-	PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_MIN_REQS], have_webkit=yes, have_webkit=no)
-	if test "x$have_webkit" = "xno" -a "x$with_webkit" = "xyes"; then
-		AC_MSG_ERROR([WebKit support explicitly requested, but WebKit could not be found])
-	fi
-	if test "x$have_webkit" = "xyes"; then
-		AC_DEFINE(WITH_WEBKIT, 1, [Define if WebKit is enabled])
-	fi
-fi
-AM_CONDITIONAL(WITH_WEBKIT, test x"$have_webkit" = xyes)
-
-
-AC_ARG_ENABLE(uninstalled-build,
-              AC_HELP_STRING([--enable-uninstalled-build],
-			     [Search for files in build directory as well]),
-	      enable_uninstalled=yes,)
-if test x"$enable_uninstalled" = xyes; then
-	AC_DEFINE(USE_UNINSTALLED_DIRS, 1, [Define to look for files in source tree locations])
-fi
-ROOT_UNINSTALLED_DIR="`pwd`"
-AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_DIR,"`pwd`/$srcdir/data",[path to source data dir])
-AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_BUILDDIR,"`pwd`/data",[path to built source data dir])
-AC_DEFINE_UNQUOTED(METADATA_UNINSTALLED_DIR,"`pwd`/metadata",[path to metadata build dir])
-AC_SUBST(ROOT_UNINSTALLED_DIR)
-
-
-dnl warnings bits, copied from gnome-keyring configure.in
-dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
-
-AC_ARG_ENABLE(more-warnings,
-[  --enable-more-warnings  Maximum compiler warnings],
-set_more_warnings="$enableval",[
-if test -d "$srcdir/.svn" || test -d "$srcdir/{arch}" || test -d "$srcdir/CVS" || test -d "$srcdir/_darcs" || test -d "$srcdir/.git"; then
-	set_more_warnings=yes
-else
-	set_more_warnings=no
-fi
-])
-RHYTHMBOX_CFLAGS_NOWARN=$RHYTHMBOX_CFLAGS
-AC_SUBST(RHYTHMBOX_CFLAGS_NOWARN)
-AC_MSG_CHECKING(for more warnings, including -Werror)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-	AC_MSG_RESULT(yes)
-	WARN_CFLAGS="\
-	-Wcomment -Wformat -Wnonnull -Wimplicit-int -Wimplicit \
-	-Wmain -Wmissing-braces -Wparentheses -Wsequence-point \
-	-Wreturn-type -Wswitch -Wtrigraphs -Wunused-function \
-	-Wunused-label -Wunused-value \
-	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-	-Wnested-externs -Wpointer-arith \
-	-Wcast-align -Wall \
-	-Werror -std=gnu89"
-
-	if echo "$CFLAGS" | grep -q -- '-O' && echo "$CFLAGS" | grep -q -v -- '-O0'; then
-		WARN_CFLAGS="-Wuninitialized $WARN_CFLAGS"
-	fi
-
-	for option in $WARN_CFLAGS; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		if test x$has_option = xyes; then
-			RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $option"
-		fi
-		AC_MSG_RESULT($has_option)
-		CFLAGS="$SAVE_CFLAGS"
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	AC_SUBST(WARN_CFLAGS)
-
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -Wno-error"
-	AC_TRY_COMPILE([], [],
-		WNOERROR_CFLAGS="-Wno-error",
-		WNOERROR_CFLAGS="")
-	AC_SUBST(WNOERROR_CFLAGS)
-	CFLAGS="$SAVE_CFLAGS"
-	unset SAVE_CFLAGS
-	unset has_wnoerror
-
-	dnl enable GSEAL if gtk is new enough
-	PKG_CHECK_EXISTS(gtk+-2.0 >= 2.20.0, [CFLAGS="$CFLAGS -DGSEAL_ENABLE"], [])
-
-	dnl disable deprecated stuff
-	dnl CFLAGS="$CFLAGS $DISABLE_DEPRECATED"
-else
-	AC_MSG_RESULT(no)
-fi
-
-
-dnl Check for -fno-strict-aliasing
-FLAGS="-fno-strict-aliasing"
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $FLAGS"
-AC_MSG_CHECKING([whether [$]CC understands $FLAGS])
-AC_TRY_COMPILE([], [], [compiler_has_option=yes], [compiler_has_option=no])
-CFLAGS="$save_CFLAGS"
-AC_MSG_RESULT($compiler_has_option)
-if test $compiler_has_option = yes; then
-	NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-fi
-AC_SUBST([NO_STRICT_ALIASING_CFLAGS])
-
-dnl Enable gtk-doc
-GTK_DOC_CHECK(1.4)
-
-dnl Enable gnome-doc-utils
-GNOME_DOC_INIT
-
-
-dnl ================================================================
-dnl Plugins
-dnl ================================================================
-
-PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
-AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
-
-PLUGINDIR='${libdir}/rhythmbox/plugins'
-PLUGINDATADIR='${datadir}/rhythmbox/plugins'
-AC_SUBST(PLUGINDIR)
-AC_SUBST(PLUGINDATADIR)
-
-dnl ================================================================
-dnl Python plugins
-dnl ================================================================
-AM_PATH_PYTHON
-
-
-AC_ARG_ENABLE([python],
-              AS_HELP_STRING([--enable-python[=@<:@no/auto/yes@:>@]],[Build with python support]),
-              [enable_python=$enableval],
-              [enable_python="auto"])
-
-if test "x$enable_python" = "xauto"; then
-	PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
-	                 [enable_python=yes],[enable_python=no])
-fi
-
-if test "x$enable_python" = "xyes"; then
-	PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
-
-	pyoverridesdir=`$PKG_CONFIG --variable=overridesdir pygobject-3.0`
-	AC_SUBST(pyoverridesdir)
-fi
-
-AM_CONDITIONAL(ENABLE_PYTHON, test x"$enable_python" = "xyes")
-
-dnl ================================================================
-dnl Vala plugins
-dnl ================================================================
-AC_MSG_CHECKING([whether Vala plugin support is requested])
-AC_ARG_ENABLE([vala],
-	AS_HELP_STRING([--enable-vala],[Enable Vala plugin support]),
-	[enable_vala=$enableval have_vala=$enableval],
-	[enable_vala=autodetect have_vala=yes])
-AC_MSG_RESULT([$enable_vala])
-with_vala=no
-if test "x$enable_vala" = "xyes"; then
-	AM_PROG_VALAC([$VALA_REQS])
-	if test "x$VALAC" != "x"; then
-		VAPIDIR=$datadir/vala/vapi
-		# what?
-		VAPIGEN=vapigen
-		AC_SUBST([VALAC])
-		AC_SUBST([VAPIDIR])
-		AC_SUBST([VAPIGEN])
-		with_vala=yes
-	elif test "x$enable_vala" = "xyes"; then
-		AC_MSG_ERROR([Vala plugin support explicitly requested, but not found])
-	fi
-fi
-AM_CONDITIONAL(ENABLE_VALA, test "x$with_vala" = "xyes")
-
-dnl ================================================================
-dnl FM Radio Plugin
-dnl ================================================================
-AC_MSG_CHECKING([whether FM radio support is requested])
-AC_ARG_ENABLE([fm-radio],
-  AC_HELP_STRING([--disable-fm-radio],[Disable FM radio support]),,
-  enable_fm_radio=yes)
-if test "x$enable_fm_radio" != xno; then
-  AC_CHECK_HEADER([linux/videodev2.h],,[enable_fm_radio=no])
-fi
-AM_CONDITIONAL(ENABLE_FM_RADIO, test "x$enable_fm_radio" != xno)
-
-
-dnl check, for unit tests
-PKG_CHECK_MODULES(CHECK, check, have_check=yes, have_check=no)
-AM_CONDITIONAL([HAVE_CHECK],[test "x$have_check" = "xyes"])
-
-dnl ================================================================
-dnl Browser plugin
-dnl ================================================================
-
-AC_ARG_ENABLE([browser-plugin],
-	[AS_HELP_STRING([--enable-browser-plugin],[compile the iTunes detection browser plugin])],
-	[],[enable_browser_plugin=yes])
-
-MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:="\${libdir}/mozilla/plugins"}"
-AC_ARG_VAR([MOZILLA_PLUGINDIR],[Where to install the browser plugin to])
-
-AM_CONDITIONAL([ENABLE_BROWSER_PLUGIN], test x$enable_browser_plugin = xyes)
-
-
-dnl ================================================================
-dnl Use libdmapsharing for DAAP?
-dnl ================================================================
-AC_ARG_ENABLE(daap,
-              AC_HELP_STRING([--disable-daap],
-                             [Disable DAAP support]),,
-              enable_daap=auto)
-if test "x$enable_daap" != "xno"; then
-	PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-3.0 >= 2.9.11,
-			  have_libdmapsharing=yes,
-			  have_libdmapsharing=no)
-	if test "x$have_libdmapsharing" = "xno" -a "x$enable_daap" = "xyes"; then
-		AC_MSG_ERROR([DAAP support explicitly requested, but libdmapsharing couldn't be found])
-	fi
-	if test x"$have_libdmapsharing" = "xyes"; then
-		AC_DEFINE(HAVE_LIBDMAPSHARING, 1, [Define if libdmapsharing support is enabled])
-	fi
-fi
-
-AM_CONDITIONAL(USE_LIBDMAPSHARING, test x"$have_libdmapsharing" = "xyes")
-
-AC_SUBST(DMAPSHARING_CFLAGS)
-AC_SUBST(DMAPSHARING_LIBS)
-
-dnl ================================================================
-dnl clutter for visualizer plugin
-dnl ================================================================
-AC_ARG_ENABLE(visualizer,
-              AC_HELP_STRING([--disable-visualizer],
-                             [Disable visualizer plugin support]),,
-              enable_visualizer=auto)
-if test "x$enable_visualizer" != "xno"; then
-	PKG_CHECK_MODULES(CLUTTER,
-			  clutter-1.0 >= 1.2			\
-			  clutter-x11-1.0 >= 1.2		\
-			  clutter-gst-1.0 >= 1.0		\
-			  clutter-gtk-1.0 >= 1.0		\
-			  mx-1.0 >= 1.0.1,
-			  have_clutter=yes,
-			  have_clutter=no)
-	if test "x$have_clutter" = "xno" -a "x$enable_visualizer" = "xyes"; then
-		AC_MSG_ERROR([Visualizer support explicitly requested, but clutter couldn't be found])
-	fi
-fi
-
-AM_CONDITIONAL(USE_CLUTTER, test x"$have_clutter" = "xyes")
-
-AC_SUBST(CLUTTER_CFLAGS)
-AC_SUBST(CLUTTER_LIBS)
-
-dnl ================================================================
-dnl Dependencies for Last.fm plugin
-dnl ================================================================
-AC_ARG_ENABLE(lastfm,
-              AC_HELP_STRING([--disable-lastfm],
-                             [Disable Last.fm support]),,
-              enable_lastfm=auto)
-if test "x$enable_lastfm" != "xno"; then
-	PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0,
-			  have_json_glib=yes,
-			  have_json_glib=no)
-	if test "x$have_json_glib" = "xno" -a "x$enable_lastfm" = "xyes"; then
-		AC_MSG_ERROR([Last.fm support explicitly requested, but json-glib couldn't be found])
-	fi
-	if test x"$have_json_glib" = "xyes"; then
-		AC_DEFINE(HAVE_JSON_GLIB, 1, [Define if json-glib support is enabled])
-	fi
-fi
-
-AM_CONDITIONAL(ENABLE_LASTFM, test x"$have_json_glib" = "xyes")
-
-AC_SUBST(JSON_GLIB_CFLAGS)
-AC_SUBST(JSON_GLIB_LIBS)
-
-dnl ================================================================
-dnl grilo plugin
-dnl ================================================================
-AC_ARG_ENABLE(grilo,
-	      AC_HELP_STRING([--disable-grilo],
-			     [Disable Grilo support]),,
-	      enable_grilo=auto)
-if test "x$enable_grilo" != "xno"; then
-	PKG_CHECK_MODULES(GRILO, grilo-0.1 >= $GRILO_REQS, have_grilo=yes, have_grilo=no)
-	if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
-		AC_MSG_ERROR([Grilo support explicitly requested, but grilo couldn not be found])
-	fi
-	if test "x$have_grilo" = "xyes"; then
-		AC_DEFINE(HAVE_GRILO, 1, [Define if Grilo support is enabled])
-	fi
-fi
-
-AM_CONDITIONAL(ENABLE_GRILO, test x"$have_grilo" = "xyes")
-AC_SUBST(GRILO_CFLAGS)
-AC_SUBST(GRILO_LIBS)
-
-dnl ================================================================
-dnl end-game
-dnl ================================================================
-
-AC_OUTPUT([
-rhythmbox.pc
-Makefile
-macros/Makefile
-lib/Makefile
-lib/libmediaplayerid/Makefile
-metadata/Makefile
-rhythmdb/Makefile
-widgets/Makefile
-podcast/Makefile
-shell/Makefile
-data/Makefile
-data/rhythmbox.desktop.in
-data/rhythmbox-device.desktop.in
-data/ui/Makefile
-data/icons/Makefile
-data/icons/hicolor/Makefile
-data/icons/hicolor/16x16/Makefile
-data/icons/hicolor/16x16/actions/Makefile
-data/icons/hicolor/16x16/apps/Makefile
-data/icons/hicolor/16x16/places/Makefile
-data/icons/hicolor/16x16/status/Makefile
-data/icons/hicolor/22x22/Makefile
-data/icons/hicolor/22x22/actions/Makefile
-data/icons/hicolor/22x22/apps/Makefile
-data/icons/hicolor/22x22/places/Makefile
-data/icons/hicolor/24x24/Makefile
-data/icons/hicolor/24x24/apps/Makefile
-data/icons/hicolor/24x24/places/Makefile
-data/icons/hicolor/32x32/Makefile
-data/icons/hicolor/32x32/actions/Makefile
-data/icons/hicolor/32x32/apps/Makefile
-data/icons/hicolor/32x32/places/Makefile
-data/icons/hicolor/48x48/Makefile
-data/icons/hicolor/48x48/apps/Makefile
-data/icons/hicolor/256x256/Makefile
-data/icons/hicolor/256x256/apps/Makefile
-data/icons/hicolor/scalable/Makefile
-data/icons/hicolor/scalable/actions/Makefile
-data/icons/hicolor/scalable/apps/Makefile
-data/icons/hicolor/scalable/places/Makefile
-data/icons/src/Makefile
-sources/Makefile
-sources/sync/Makefile
-plugins/Makefile
-plugins/sample/Makefile
-plugins/audiocd/Makefile
-plugins/audioscrobbler/Makefile
-plugins/brasero-disc-recorder/Makefile
-plugins/daap/Makefile
-plugins/fmradio/Makefile
-plugins/im-status/Makefile
-plugins/ipod/Makefile
-plugins/mtpdevice/Makefile
-plugins/iradio/Makefile
-plugins/lirc/Makefile
-plugins/lyrics/Makefile
-plugins/sample-python/Makefile
-plugins/sample-vala/Makefile
-plugins/pythonconsole/Makefile
-plugins/artdisplay/Makefile
-plugins/artsearch/Makefile
-plugins/magnatune/Makefile
-plugins/generic-player/Makefile
-plugins/rb/Makefile
-plugins/power-manager/Makefile
-plugins/mmkeys/Makefile
-plugins/context/Makefile
-plugins/sendto/Makefile
-plugins/replaygain/Makefile
-plugins/mpris/Makefile
-plugins/dbus-media-server/Makefile
-plugins/rbzeitgeist/Makefile
-plugins/notification/Makefile
-plugins/visualizer/Makefile
-plugins/grilo/Makefile
-bindings/Makefile
-bindings/vala/Makefile
-bindings/gi/Makefile
-help/Makefile
-po/Makefile.in
-tests/Makefile
-doc/Makefile
-doc/reference/Makefile
-backends/Makefile
-backends/gstreamer/Makefile
-remote/Makefile
-remote/dbus/Makefile
-])
-
-AC_MSG_NOTICE([Rhythmbox was configured with the following options:])
-if test x"$with_database" = xtree; then
-	AC_MSG_NOTICE([** Tree database is enabled])
-else
-	AC_MSG_ERROR([Unknown database!])
-fi
-if test x"${with_rhythmdb_debug}" != x0; then
-	AC_MSG_NOTICE([** RhythmDB sanity checking enabled (may be slow!)])
-fi
-
-
-if test x"$enable_mmkeys" != "xyes"; then
-	AC_MSG_NOTICE([   Multimedia keys support is disabled])
-else
-	AC_MSG_NOTICE([** Multimedia keys support is enabled])
-fi
-
-if test x"$have_musicbrainz3" = "xyes"; then
-	AC_MSG_NOTICE([** MusicBrainz support is enabled])
-else
-	AC_MSG_NOTICE([   MusicBrainz support is disabled])
-fi
-
-if test x"$use_ipod" = xyes; then
-	AC_MSG_NOTICE([** iPod integration enabled])
-else
-	AC_MSG_NOTICE([   iPod integration disabled])
-fi
-if test x"$use_mtp" = xyes; then
-	AC_MSG_NOTICE([** MTP integration enabled])
-else
-	AC_MSG_NOTICE([   MTP integration disabled])
-fi
-if test x"$have_libbrasero_media" != xno; then
-	AC_MSG_NOTICE([** CD burning support enabled])
-else
-	AC_MSG_NOTICE([   CD burning support disabled])
-fi
-if test x"$have_libdmapsharing" = xyes; then
-	AC_MSG_NOTICE([** DAAP (music sharing) support is enabled])
-else
-	AC_MSG_NOTICE([   DAAP (music sharing) support is disabled])
-fi
-if test x"$have_libnotify" = xyes; then
-	AC_MSG_NOTICE([** libnotify support is enabled])
-else
-	AC_MSG_NOTICE([   libnotify support is disabled])
-fi
-if test x"$have_webkit" = xyes; then
-	AC_MSG_NOTICE([** WebKit support is enabled])
-else
-	AC_MSG_NOTICE([   WebKit support is disabled])
-fi
-if test x"$use_gudev" = xyes; then
-	AC_MSG_NOTICE([** GUdev support enabled])
-elif test x"$enable_hal" = xyes; then
-	AC_MSG_NOTICE([** HAL support enabled])
-else
-	AC_MSG_NOTICE([   GUdev support disabled])
-fi
-if test x"$enable_python" = xyes; then
-	AC_MSG_NOTICE([** Python plugin support enabled])
-else
-	AC_MSG_NOTICE([   Python plugin support disabled])
-fi
-if test x"$with_vala" = xyes; then
-	AC_MSG_NOTICE([** Vala plugin support enabled])
-else
-	AC_MSG_NOTICE([   Vala plugin support disabled])
-fi
-if test x"$use_gnome_keyring" = xyes; then
-	AC_MSG_NOTICE([** gnome-keyring support enabled])
-else
-	AC_MSG_NOTICE([   gnome-keyring support disabled])
-fi
-if test "x$enable_fm_radio" != xno; then
-	AC_MSG_NOTICE([** FM radio support enabled])
-else
-	AC_MSG_NOTICE([   FM radio support disabled])
-fi
-
-if test "x$enable_browser_plugin" != xno; then
-	AC_MSG_NOTICE([** iTunes detection browser plugin (for podcasts) enabled])
-else
-	AC_MSG_NOTICE([   iTunes detection browser plugin (for podcasts) disabled])
-fi
-
-if test "x$have_clutter" = xyes; then
-	AC_MSG_NOTICE([** Visualizer plugin enabled])
-else
-	AC_MSG_NOTICE([   Visualizer plugin disabled])
-fi
-
-if test "x$have_json_glib" = xyes; then
-	AC_MSG_NOTICE([** Last.fm support enabled])
-else
-	AC_MSG_NOTICE([   Last.fm support disabled])
-fi
-
-AC_MSG_NOTICE([End options])

=== removed directory '.pc/01_lpi.patch/data'
=== removed directory '.pc/01_lpi.patch/data/ui'
=== removed file '.pc/01_lpi.patch/data/ui/rhythmbox-ui.xml'
--- .pc/01_lpi.patch/data/ui/rhythmbox-ui.xml	2011-12-05 19:31:23 +0000
+++ .pc/01_lpi.patch/data/ui/rhythmbox-ui.xml	1970-01-01 00:00:00 +0000
@@ -1,330 +0,0 @@
-<ui>
-  <menubar name="MenuBar">
-    <menu name="MusicMenu" action="Music">
-      <menuitem name="MusicImportFileMenu" action="MusicImportFile"/>
-      <menuitem name="MusicImportFolderMenu" action="MusicImportFolder"/>
-      <separator/>
-      <menuitem name="MusicCheckDevices" action="MusicCheckDevices"/>
-      <separator/>
-      <menu name="PlaylistMenu" action="Playlist">
-	<menuitem name="MusicPlaylistNewPlaylistMenu" action="MusicPlaylistNewPlaylist"/>
-	<menuitem name="MusicPlaylistNewAutomaticPlaylistMenu" action="MusicPlaylistNewAutomaticPlaylist"/>
-	<menuitem name="MusicPlaylistLoadPlaylistMenu" action="MusicPlaylistLoadPlaylist"/>
-	<menuitem name="MusicPlaylistSavePlaylistMenu" action="MusicPlaylistSavePlaylist"/>
-	<menuitem name="MusicPlaylistEditAutoPlaylistMenu" action="EditAutomaticPlaylist"/>
-	<placeholder name="PluginPlaceholder" />
-	<separator name="MusicPlaylistSeparator1"/>
-	<menuitem name="MusicPlaylistDeletePlaylistMenu" action="MusicPlaylistDeletePlaylist"/>
-      </menu>
-      <placeholder name="PluginPlaceholder" />
-      <menuitem name="MusicNewPodcastMenu" action="MusicNewPodcast"/>
-      <separator/>
-      <menuitem name="MusicPropertiesMenu" action="MusicProperties"/>
-      <separator/>
-      <placeholder name="PluginWindowPlaceholder" />
-      <menuitem name="MusicQuit" action="MusicQuit"/>
-    </menu>
-
-    <menu name="EditMenu" action="Edit">
-      <menuitem name="EditCutMenu" action="EditCut"/>
-      <menuitem name="EditCopyMenu" action="EditCopy"/>
-      <menuitem name="EditPasteMenu" action="EditPaste"/>
-      <separator/>
-      <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
-      <menuitem name="EditSelectNoneMenu" action="EditSelectNone"/>
-      <separator/>
-      <menuitem name="EditAddToQueueMenu" action="AddToQueue"/>
-      <menu name="EditPlaylistAddMenu" action="EditPlaylistAdd">
-        <menuitem name="EditPlaylistAddNew" action="EditPlaylistAddNew"/>
-        <separator/>
-        <placeholder name="EditPlaylistAddPlaceholder"/>
-      </menu>
-      <separator/>
-      <placeholder name="DeleteActionPlaceholder" />
-      <menuitem name="EditMovetoTrash" action="EditMovetoTrash"/>
-      <separator/>
-      <menuitem name="EditPluginsMenu" action="EditPlugins"/>
-      <menuitem name="EditPreferencesMenu" action="EditPreferences"/>
-    </menu>
-
-    <menu name="ViewMenu" action="View">
-      <menuitem name="ViewSmallDisplayMenu" action="ViewSmallDisplay"/>
-      <menuitem name="ViewPartyModeMenu" action="ViewPartyMode"/>
-      <placeholder name="ViewMenuModePlaceholder"/>
-      <separator name="ViewSep1"/>
-      <menuitem name="ViewSidePaneMenu" action="ViewSidePane"/>
-      <menuitem name="ViewQueueAsSidebarMenu" action="ViewQueueAsSidebar"/>
-      <menuitem name="ViewBrowserMenu" action="ViewBrowser"/>
-      <menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
-      <menuitem name="ViewToolbarMenu" action="ViewToolbar"/>
-      <separator name="ViewSep2"/>
-      <menuitem name="ViewAllMenu" action="ViewAll"/>
-      <separator name="ViewSep3"/>
-      <menuitem name="ViewJumpToPlayingMenu" action="ViewJumpToPlaying"/>
-    </menu>
-
-    <menu name="ToolsMenu" action="Tools">
-      <placeholder name="ToolsOps_1" />
-      <separator/>
-      <placeholder name="ToolsOps_2" />
-      <separator/>
-      <placeholder name="ToolsOps_3" />
-      <separator/>
-      <placeholder name="ToolsOps_4" />
-      <separator/>
-      <placeholder name="ToolsOps_5" />
-    </menu>
-
-    <menu name="ControlMenu" action="Control">
-      <menuitem name="ControlPlayMenu" action="ControlPlay"/>
-      <separator name="ControlSep1"/>
-      <menuitem name="ControlPreviousMenu" action="ControlPrevious"/>
-      <menuitem name="ControlNextMenu" action="ControlNext"/>
-      <separator name="ControlSep2"/>
-      <menuitem name="ControlVolumeUpMenu" action="ControlVolumeUp"/>
-      <menuitem name="ControlVolumeDownMenu" action="ControlVolumeDown"/>
-      <separator name="ControlSep3"/>
-      <menuitem name="ControlShuffleMenu" action="ControlShuffle"/>
-      <menuitem name="ControlRepeatMenu" action="ControlRepeat"/>
-    </menu>
-
-    <menu name="HelpMenu" action="Help">
-      <menuitem name="HelpContentsMenu" action="HelpContents"/>
-      <menuitem name="HelpAboutMenu" action="HelpAbout"/>
-    </menu>
-
-  </menubar>
-
-  <toolbar name="ToolBar">
-    <toolitem name="Play" action="ControlPlay"/>
-    <toolitem name="Previous" action="ControlPrevious"/>
-    <toolitem name="Next" action="ControlNext"/>
-    <separator/>
-    <toolitem name="Repeat" action="ControlRepeat"/>
-    <toolitem name="Shuffle" action="ControlShuffle"/>
-    <separator/>
-  </toolbar>
-
-  <popup name="BrowserSourceViewPopup">
-    <menuitem name="AddToQueueLibraryPopup" action="AddToQueue"/>
-    <menu name="BrowserSourcePopupPlaylistAdd" action="EditPlaylistAdd">
-      <menuitem name="BrowserSourcePopupPlaylistAddNew" action="EditPlaylistAddNew"/>
-      <separator/>
-      <placeholder name="BrowserSourcePopupPlaylistAddPlaceholder"/>
-    </menu>
-    <menuitem name="CopyLibraryPopup" action="EditCopy"/>
-    <separator/>
-    <placeholder name="DeleteActionPlaceholder" />
-    <menuitem name="MovetoTrashPopup" action="EditMovetoTrash"/>
-    <separator/>
-    <menuitem name="BrowseGenreLibraryPopup" action="BrowserSrcChooseGenre"/>
-    <menuitem name="BrowseArtistLibraryPopup" action="BrowserSrcChooseArtist"/>
-    <menuitem name="BrowseAlbumLibraryPopup" action="BrowserSrcChooseAlbum"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-    <separator/>
-    <menuitem name="PropertiesLibraryPopup" action="MusicProperties"/>
-  </popup>
-
-  <popup name="BrowserSourceSearchMenu">
-    <menuitem name="SearchAll" action="BrowserSourceSearchAll"/>
-    <menuitem name="SearchArtists" action="BrowserSourceSearchArtists"/>
-    <menuitem name="SearchAlbums" action="BrowserSourceSearchAlbums"/>
-    <menuitem name="SearchTitles" action="BrowserSourceSearchTitles"/>
-    <placeholder name="PluginPlaceholder"/>
-  </popup>
-
-  <popup name="AutoPlaylistSourceSearchMenu">
-    <menuitem name="SearchAll" action="AutoPlaylistSearchAll"/>
-    <menuitem name="SearchArtists" action="AutoPlaylistSearchArtists"/>
-    <menuitem name="SearchAlbums" action="AutoPlaylistSearchAlbums"/>
-    <menuitem name="SearchTitles" action="AutoPlaylistSearchTitles"/>
-    <placeholder name="PluginPlaceholder"/>
-  </popup>
-
-  <popup name="StaticPlaylistSourceSearchMenu">
-    <menuitem name="SearchAll" action="StaticPlaylistSearchAll"/>
-    <menuitem name="SearchArtists" action="StaticPlaylistSearchArtists"/>
-    <menuitem name="SearchAlbums" action="StaticPlaylistSearchAlbums"/>
-    <menuitem name="SearchTitles" action="StaticPlaylistSearchTitles"/>
-    <placeholder name="PluginPlaceholder"/>
-  </popup>
-
-  <popup name="PodcastSourceSearchMenu">
-    <menuitem name="SearchAll" action="PodcastSearchAll"/>
-    <menuitem name="SearchFeeds" action="PodcastSearchFeeds"/>
-    <menuitem name="SearchEpisodes" action="PodcastSearchEpisodes"/>
-    <placeholder name="PluginPlaceholder"/>
-  </popup>
-
-  <toolbar name="LibrarySourceToolBar">
-    <toolitem name="Browse" action="ViewBrowser"/>
-    <toolitem name="ViewAll" action="ViewAll"/>
-    <toolitem name="LibraryImport" action="MusicImportFolder"/>
-    <placeholder name="PluginPlaceholder"/>
-  </toolbar>
-
-  <toolbar name="QueueSourceToolBar">
-    <toolitem name="ShuffleQueue" action="ShuffleQueue"/>
-    <toolitem name="Clear" action="ClearQueue"/>
-    <placeholder name="PluginPlaceholder"/>
-  </toolbar>
-
-  <toolbar name="StaticPlaylistSourceToolBar">
-    <toolitem name="Browse" action="ViewBrowser"/>
-    <toolitem name="ViewAll" action="ViewAll"/>
-    <placeholder name="PluginPlaceholder"/>
-  </toolbar>
-
-  <toolbar name="AutoPlaylistSourceToolBar">
-    <toolitem name="Browse" action="ViewBrowser"/>
-    <toolitem name="ViewAll" action="ViewAll"/>
-    <toolitem name="Edit" action="EditAutomaticPlaylist"/>
-    <placeholder name="PluginPlaceholder"/>
-  </toolbar>
-
-  <toolbar name="PodcastSourceToolBar">
-    <toolitem name="Browse" action="ViewBrowser"/>
-    <toolitem name="ViewAll" action="ViewAll"/>
-    <toolitem name="NewPodcast" action="MusicNewPodcast"/>
-    <toolitem name="UpdateFeed" action="PodcastFeedUpdate"/>
-    <placeholder name="PluginPlaceholder"/>
-  </toolbar>
-
-  <popup name="ImportErrorsViewPopup">
-    <menuitem name="DeleteLibraryPopup" action="EditRemove"/>
-    <menuitem name="MovetoTrashPopup" action="EditMovetoTrash"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-  </popup>
-
-  <popup name="PlaylistViewPopup">
-    <menuitem name="AddToQueuePlaylistPopup" action="AddToQueue"/>
-    <menu name="PlaylistPopupPlaylistAdd" action="EditPlaylistAdd">
-      <menuitem name="PlaylistPopupPlaylistAddNew" action="EditPlaylistAddNew"/>
-      <separator/>
-      <placeholder name="PlaylistPopupPlaylistAddPlaceholder"/>
-    </menu>
-    <menuitem name="CopyPlaylistPopup" action="EditCopy"/>
-    <menuitem name="CutPlaylistPopup" action="EditCut"/>
-    <separator/>
-    <menuitem name="RemoveFromPlaylistPopup" action="RemoveFromPlaylist"/>
-    <menuitem name="MovetoTrashPlaylistPopup" action="EditMovetoTrash"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-    <separator/>
-    <menuitem name="PropertiesPlaylistPopup" action="MusicProperties"/>
-  </popup>
-
-  <popup name="QueuePlaylistViewPopup">
-    <menuitem name="RemoveFromPlaylistPopup" action="RemoveFromPlaylist"/>
-    <menuitem name="ShufflePlaylistPopup" action="ShuffleQueue"/>
-    <menuitem name="SaveQueuePopup" action="MusicPlaylistSavePlaylist"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-    <separator/>
-    <menuitem name="PropertiesPlaylistPopup" action="MusicProperties"/>
-  </popup>
-
-  <popup name="QueueSidebarViewPopup">
-    <menuitem name="DeletePlaylistPopup" action="QueueDelete"/>
-    <menuitem name="ClearPlaylistPopup" action="ClearQueue"/>
-    <menuitem name="ShufflePlaylistPopup" action="ShuffleQueue"/>
-    <menuitem name="SaveQueueSidebarPopup" action="MusicPlaylistSaveQueue"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-    <separator/>
-    <menuitem name="PropertiesPlaylistPopup" action="QueueMusicProperties"/>
-  </popup>
-
-  <popup name="QueueSourcePopup">
-    <menuitem name="ClearPlaylistPopup" action="ClearQueue"/>
-    <menuitem name="ShufflePlaylistPopup" action="ShuffleQueue"/>
-    <menuitem name="SaveQueuePopup" action="MusicPlaylistSavePlaylist"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder" />
-  </popup>
-
-  <popup name="DisplayPageTreePopup">
-    <menuitem name="DisplayPageTreePopupNewPlaylist" action="MusicPlaylistNewPlaylist"/>
-    <menuitem name="DisplayPageTreePopupNewAutomaticPlaylist" action="MusicPlaylistNewAutomaticPlaylist"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder" />
-  </popup>
-
-  <popup name="LibrarySourcePopup">
-    <menuitem name="LibrarySrcPopupAddFile" action="MusicImportFile"/>
-    <menuitem name="LibrarySrcPopupAddFolder" action="MusicImportFolder"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-  </popup>
-
-  <popup name="PodcastSourcePopup">
-    <menuitem name="PodcastSrcPopupNew" action="MusicNewPodcast"/>
-    <menuitem name="PodcastSrcPopupUpdateAllFeeds" action="PodcastUpdateAllFeeds"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-  </popup>
-
-  <popup name="PodcastViewPopup">
-    <menuitem name="DownloadPodcastPopup" action="PodcastSrcDownloadPost"/>
-    <menuitem name="CancelDownloadPopup" action="PodcastSrcCancelDownload"/>
-    <menuitem name="DeletePodcastPopup" action="EditDelete"/>
-    <separator/>
-    <menuitem name="AddToQueuePodcastPopup" action="AddToQueue"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-    <separator/>
-    <menuitem name="PropertiesPodcastPopup" action="MusicProperties"/>
-  </popup>
-
-  <popup name="PodcastFeedViewPopup">
-    <menuitem name="NewPodcastPopup" action="MusicNewPodcast"/>
-    <menuitem name="PodcastSrcPopupUpdateAllFeeds" action="PodcastUpdateAllFeeds"/>
-    <separator/>
-    <menuitem name="UpdateFeedPodcastPopup" action="PodcastFeedUpdate"/>
-    <menuitem name="DeleteFeedPodcastPopup" action="PodcastFeedDelete"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-    <separator/>
-    <menuitem name="PropertiesFeedPodcastPopup" action="PodcastFeedProperties"/>
-  </popup>
-
-  <popup name="PlaylistSourcePopup">
-    <menuitem name="RenameAutoPlaylistPopup" action="MusicPlaylistRenamePlaylist"/>
-    <separator/>
-    <menuitem name="QueuePlaylistPopup" action="QueuePlaylist"/>
-    <menuitem name="ShufflePlaylistPopup" action="ShufflePlaylist"/>
-    <placeholder name="PluginPlaceholder" />
-    <separator/>
-    <menuitem name="DeletePlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-    <separator/>
-    <menuitem name="PlaylistSourceSavePlaylistPopup" action="MusicPlaylistSavePlaylist"/>
-  </popup>
-
-  <popup name="AutoPlaylistSourcePopup">
-    <menuitem name="EditAutoPlaylistPopup" action="EditAutomaticPlaylist"/>
-    <menuitem name="RenameAutoPlaylistPopup" action="MusicPlaylistRenamePlaylist"/>
-    <separator/>
-    <menuitem name="QueuePlaylistPopup" action="QueuePlaylist"/>
-    <menuitem name="ShufflePlaylistPopup" action="ShufflePlaylist"/>
-    <placeholder name="PluginPlaceholder" />
-    <separator/>
-    <menuitem name="DeleteAutoPlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-    <separator/>
-    <menuitem name="PlaylistSourceSavePlaylistPopup" action="MusicPlaylistSavePlaylist"/>
-  </popup>
-
-
-  <popup name="MissingFilesViewPopup">
-    <menuitem name="DeleteMissingFilesPopup" action="EditRemove"/>
-    <menuitem name="PropertiesMissingFilesPopup" action="MusicProperties"/>
-    <separator/>
-    <placeholder name="PluginPlaceholder"/>
-  </popup>
-
-</ui>

=== removed directory '.pc/01_lpi.patch/shell'
=== removed file '.pc/01_lpi.patch/shell/rb-shell.c'
--- .pc/01_lpi.patch/shell/rb-shell.c	2012-01-17 16:56:40 +0000
+++ .pc/01_lpi.patch/shell/rb-shell.c	1970-01-01 00:00:00 +0000
@@ -1,4126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- *  Copyright (C) 2002, 2003 Jorn Baayen
- *  Copyright (C) 2003, 2004 Colin Walters <[e-mail]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  The Rhythmbox authors hereby grant permission for non-GPL compatible
- *  GStreamer plugins to be used and distributed together with GStreamer
- *  and Rhythmbox. This permission is above and beyond the permissions granted
- *  by the GPL license by which Rhythmbox is covered. If you modify this code
- *  you may extend this exception to your version of the code, but you are not
- *  obligated to do so. If you do not wish to do so, delete this exception
- *  statement from your version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
- *
- */
-
-/**
- * SECTION:rb-shell
- * @short_description: holds the Rhythmbox main window and everything else
- *
- * RBShell is the main application class in Rhythmbox.  It creates and holds
- * references to the other main objects (#RBShellPlayer, #RhythmDB, #RBDisplayPageTree),
- * constructs the main window UI, and provides the basic DBus interface.
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/stat.h>
-
-#include <glib/gi18n.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
-#include <girepository.h>
-
-#include <libpeas/peas.h>
-#include <libpeas-gtk/peas-gtk.h>
-
-#include <gst/gst.h>
-
-#ifdef HAVE_MMKEYS
-#include <X11/XF86keysym.h>
-#endif /* HAVE_MMKEYS */
-
-#include "rb-shell.h"
-#include "rb-debug.h"
-#include "rb-dialog.h"
-#ifdef WITH_RHYTHMDB_TREE
-#include "rhythmdb-tree.h"
-#else
-#error "no database specified. configure broken?"
-#endif
-#include "rb-stock-icons.h"
-#include "rb-display-page-tree.h"
-#include "rb-display-page-group.h"
-#include "rb-file-helpers.h"
-#include "rb-source.h"
-#include "rb-playlist-manager.h"
-#include "rb-removable-media-manager.h"
-#include "rb-track-transfer-queue.h"
-#include "rb-shell-clipboard.h"
-#include "rb-shell-player.h"
-#include "rb-statusbar.h"
-#include "rb-shell-preferences.h"
-#include "rb-library-source.h"
-#include "rb-podcast-source.h"
-#include "totem-pl-parser.h"
-#include "rb-shell-preferences.h"
-#include "rb-playlist-source.h"
-#include "rb-static-playlist-source.h"
-#include "rb-play-queue-source.h"
-#include "rb-missing-files-source.h"
-#include "rb-import-errors-source.h"
-#include "rb-util.h"
-#include "rb-display-page-model.h"
-#include "rb-song-info.h"
-#include "rb-marshal.h"
-#include "rb-missing-plugins.h"
-#include "rb-podcast-manager.h"
-#include "rb-podcast-main-source.h"
-#include "rb-podcast-entry-types.h"
-#include "rb-ext-db.h"
-#include "rb-auto-playlist-source.h"
-
-#include "eggsmclient.h"
-
-#define UNINSTALLED_PLUGINS_LOCATION "plugins"
-
-#define PLAYING_ENTRY_NOTIFY_TIME 4
-
-static void rb_shell_class_init (RBShellClass *klass);
-static void rb_shell_init (RBShell *shell);
-static void rb_shell_constructed (GObject *object);
-static void rb_shell_finalize (GObject *object);
-static void rb_shell_set_property (GObject *object,
-				   guint prop_id,
-				   const GValue *value,
-				   GParamSpec *pspec);
-static void rb_shell_get_property (GObject *object,
-				   guint prop_id,
-				   GValue *value,
-				   GParamSpec *pspec);
-static void rb_shell_activate (GApplication *app);
-static void rb_shell_open (GApplication *app, GFile **files, int n_files, const char *hint);
-static gboolean rb_shell_local_command_line (GApplication *app, gchar ***args, int *exit_status);
-static gboolean rb_shell_get_visibility (RBShell *shell);
-static gboolean rb_shell_window_state_cb (GtkWidget *widget,
-					  GdkEventWindowState *event,
-					  RBShell *shell);
-static gboolean rb_shell_window_configure_cb (GtkWidget *win,
-					      GdkEventConfigure*event,
-					      RBShell *shell);
-static gboolean rb_shell_window_delete_cb (GtkWidget *win,
-			                   GdkEventAny *event,
-			                   RBShell *shell);
-static gboolean rb_shell_key_press_event_cb (GtkWidget *win,
-					     GdkEventKey *event,
-					     RBShell *shell);
-static void rb_shell_sync_window_state (RBShell *shell, gboolean dont_maximise);
-static void rb_shell_sync_paned (RBShell *shell);
-static void rb_shell_sync_party_mode (RBShell *shell);
-static void rb_shell_select_page (RBShell *shell, RBDisplayPage *display_page);
-static void display_page_selected_cb (RBDisplayPageTree *display_page_tree,
-				      RBDisplayPage *page,
-				      RBShell *shell);
-static void rb_shell_playing_source_changed_cb (RBShellPlayer *player,
-						RBSource *source,
-						RBShell *shell);
-static void rb_shell_playing_from_queue_cb (RBShellPlayer *player,
-					    GParamSpec *arg,
-					    RBShell *shell);
-static void rb_shell_db_save_error_cb (RhythmDB *db,
-				       const char *uri, const GError *error,
-				       RBShell *shell);
-
-static void rb_shell_playlist_added_cb (RBPlaylistManager *mgr, RBSource *source, RBShell *shell);
-static void rb_shell_playlist_created_cb (RBPlaylistManager *mgr, RBSource *source, RBShell *shell);
-static void rb_shell_medium_added_cb (RBRemovableMediaManager *mgr, RBSource *source, RBShell *shell);
-static void rb_shell_display_page_deleted_cb (RBDisplayPage *page, RBShell *shell);
-static void rb_shell_set_window_title (RBShell *shell, const char *window_title);
-static void rb_shell_player_window_title_changed_cb (RBShellPlayer *player,
-					             const char *window_title,
-					             RBShell *shell);
-static void rb_shell_cmd_about (GtkAction *action,
-		                RBShell *shell);
-static void rb_shell_cmd_contents (GtkAction *action,
-				   RBShell *shell);
-static void rb_shell_cmd_quit (GtkAction *action,
-			       RBShell *shell);
-static void rb_shell_cmd_preferences (GtkAction *action,
-		                      RBShell *shell);
-static void rb_shell_cmd_plugins (GtkAction *action,
-		                  RBShell *shell);
-static void rb_shell_cmd_add_folder_to_library (GtkAction *action,
-						RBShell *shell);
-static void rb_shell_cmd_add_file_to_library (GtkAction *action,
-					      RBShell *shell);
-
-static void rb_shell_cmd_current_song (GtkAction *action,
-				       RBShell *shell);
-static void rb_shell_jump_to_current (RBShell *shell);
-static void rb_shell_jump_to_entry_with_source (RBShell *shell, RBSource *source,
-						RhythmDBEntry *entry);
-static void rb_shell_play_entry (RBShell *shell, RhythmDBEntry *entry);
-static void rb_shell_cmd_view_all (GtkAction *action,
-				   RBShell *shell);
-static void rb_shell_view_party_mode_changed_cb (GtkAction *action,
-						 RBShell *shell);
-static void rb_shell_view_smalldisplay_changed_cb (GtkAction *action,
-						 RBShell *shell);
-static void rb_shell_view_statusbar_changed_cb (GtkAction *action,
-						RBShell *shell);
-static void rb_shell_view_queue_as_sidebar_changed_cb (GtkAction *action,
-						       RBShell *shell);
-static void rb_shell_load_complete_cb (RhythmDB *db, RBShell *shell);
-static void rb_shell_sync_toolbar_state (RBShell *shell);
-static void rb_shell_sync_smalldisplay (RBShell *shell);
-static void rb_shell_sync_pane_visibility (RBShell *shell);
-static void rb_shell_sync_statusbar_visibility (RBShell *shell);
-static void rb_shell_set_visibility (RBShell *shell,
-				     gboolean initial,
-				     gboolean visible);
-static void display_page_tree_drag_received_cb (RBDisplayPageTree *display_page_tree,
-						RBDisplayPage *page,
-						GtkSelectionData *data,
-						RBShell *shell);
-
-static void paned_size_allocate_cb (GtkWidget *widget,
-				    GtkAllocation *allocation,
-				    RBShell *shell);
-static void rb_shell_volume_widget_changed_cb (GtkScaleButton *vol,
-					       gdouble volume,
-					       RBShell *shell);
-static void rb_shell_player_volume_changed_cb (RBShellPlayer *player,
-					       GParamSpec *arg,
-					       RBShell *shell);
-static void settings_changed_cb (GSettings *settings, const char *key, RBShell *shell);
-
-static void rb_shell_session_init (RBShell *shell);
-
-static gboolean rb_shell_visibility_changing (RBShell *shell, gboolean initial, gboolean visible);
-
-enum
-{
-	PROP_NONE,
-	PROP_NO_REGISTRATION,
-	PROP_NO_UPDATE,
-	PROP_DRY_RUN,
-	PROP_RHYTHMDB_FILE,
-	PROP_PLAYLISTS_FILE,
-	PROP_SELECTED_PAGE,
-	PROP_DB,
-	PROP_UI_MANAGER,
-	PROP_CLIPBOARD,
-	PROP_PLAYLIST_MANAGER,
-	PROP_REMOVABLE_MEDIA_MANAGER,
-	PROP_SHELL_PLAYER,
-	PROP_WINDOW,
-	PROP_PREFS,
-	PROP_QUEUE_SOURCE,
-	PROP_PROXY_CONFIG,
-	PROP_LIBRARY_SOURCE,
-	PROP_DISPLAY_PAGE_MODEL,
-	PROP_DISPLAY_PAGE_TREE,
-	PROP_VISIBILITY,
-	PROP_TRACK_TRANSFER_QUEUE,
-	PROP_AUTOSTARTED,
-	PROP_DISABLE_PLUGINS
-};
-
-enum
-{
-	VISIBILITY_CHANGED,
-	VISIBILITY_CHANGING,
-	CREATE_SONG_INFO,
-	NOTIFY_PLAYING_ENTRY,
-	NOTIFY_CUSTOM,
-	LAST_SIGNAL
-};
-
-static guint rb_shell_signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (RBShell, rb_shell, GTK_TYPE_APPLICATION)
-
-struct _RBShellPrivate
-{
-	GtkWidget *window;
-	gboolean iconified;
-
-	GtkUIManager *ui_manager;
-	GtkActionGroup *actiongroup;
-	guint source_ui_merge_id;
-
-	GtkWidget *main_vbox;
-	GtkWidget *paned;
-	GtkWidget *right_paned;
-	RBDisplayPageTree *display_page_tree;
-	GtkWidget *notebook;
-	GtkWidget *queue_paned;
-	GtkWidget *queue_sidebar;
-
-	GtkBox *sidebar_container;
-	GtkBox *right_sidebar_container;
-	GtkBox *top_container;
-	GtkBox *bottom_container;
-	guint right_sidebar_widget_count;
-
-	RBDisplayPageModel *display_page_model;
-	GList *sources;				/* kill? */
-	GHashTable *sources_hash;		/* kill? */
-
-	guint async_state_save_id;
-	guint save_playlist_id;
-	guint save_db_id;
-
-	gboolean shutting_down;
-	gboolean load_complete;
-
-	gboolean no_registration;
-	gboolean no_update;
-	gboolean dry_run;
-	gboolean autostarted;
-	gboolean disable_plugins;
-	char *rhythmdb_file;
-	char *playlists_file;
-
-	RhythmDB *db;
-	RBExtDB *art_store;
-
-	RBShellPlayer *player_shell;
-	RBShellClipboard *clipboard_shell;
-	RBStatusbar *statusbar;
-	RBPlaylistManager *playlist_manager;
-	RBRemovableMediaManager *removable_media_manager;
-	RBTrackTransferQueue *track_transfer_queue;
-	RBPodcastManager *podcast_manager;
-
-	RBLibrarySource *library_source;
-	RBPodcastSource *podcast_source;
-	RBPlaylistSource *queue_source;
-	RBSource *missing_files_source;
-	RBSource *import_errors_source;
-
-	RBDisplayPage *selected_page;
-
-	GtkWidget *prefs;
-	GtkWidget *plugins;
-
-	GtkWidget *volume_button;
-	gboolean syncing_volume;
-
-	char *cached_title;
-	gboolean cached_playing;
-
-	guint sidepane_visibility_notify_id;
-	guint toolbar_visibility_notify_id;
-	guint toolbar_style_notify_id;
-	guint smalldisplay_notify_id;
-
-	glong last_small_time; /* when we last changed small mode */
-	gboolean party_mode;
-
-	GSettings *settings;
-
-	GSettings *plugin_settings;
-	PeasEngine *plugin_engine;
-	PeasExtensionSet *activatable;
-};
-
-
-static GtkActionEntry rb_shell_actions [] =
-{
-	{ "Music", NULL, N_("_Music") },
-	{ "Edit", NULL, N_("_Edit") },
-	{ "View", NULL, N_("_View") },
-	{ "Control", NULL, N_("_Control") },
-	{ "Tools", NULL, N_("_Tools") },
-	{ "Help", NULL, N_("_Help") },
-
-	{ "MusicImportFolder", GTK_STOCK_OPEN, N_("_Import Folder..."), "<control>O",
-	  N_("Choose folder to be added to the Library"),
-	  G_CALLBACK (rb_shell_cmd_add_folder_to_library) },
-	{ "MusicImportFile", GTK_STOCK_FILE, N_("Import _File..."), NULL,
-	  N_("Choose file to be added to the Library"),
-	  G_CALLBACK (rb_shell_cmd_add_file_to_library) },
-	{ "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL,
-	  N_("Show information about Rhythmbox"),
-	  G_CALLBACK (rb_shell_cmd_about) },
-	{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
-	  N_("Display Rhythmbox help"),
-	  G_CALLBACK (rb_shell_cmd_contents) },
-	{ "MusicQuit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q",
-	  N_("Quit Rhythmbox"),
-	  G_CALLBACK (rb_shell_cmd_quit) },
-	{ "EditPreferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL,
-	  N_("Edit Rhythmbox preferences"),
-	  G_CALLBACK (rb_shell_cmd_preferences) },
-	{ "EditPlugins", NULL, N_("Plu_gins"), NULL,
-	  N_("Change and configure plugins"),
-	  G_CALLBACK (rb_shell_cmd_plugins) },
-	{ "ViewAll", NULL, N_("Show _All Tracks"), "<control>Y",
-	  N_("Show all tracks in this music source"),
-	  G_CALLBACK (rb_shell_cmd_view_all) },
-	{ "ViewJumpToPlaying", GTK_STOCK_JUMP_TO, N_("_Jump to Playing Song"), "<control>J",
-	  N_("Scroll the view to the currently playing song"),
-	  G_CALLBACK (rb_shell_cmd_current_song) },
-};
-static guint rb_shell_n_actions = G_N_ELEMENTS (rb_shell_actions);
-
-static GtkToggleActionEntry rb_shell_toggle_entries [] =
-{
-	{ "ViewSidePane", NULL, N_("Side _Pane"), "F9",
-	  N_("Change the visibility of the side pane"),
-	  NULL, TRUE },
-	{ "ViewToolbar", NULL, N_("T_oolbar"), NULL,
-	  N_("Change the visibility of the toolbar"),
-	  NULL, TRUE },
-	{ "ViewSmallDisplay", NULL, N_("_Small Display"), "<control>D",
-	  N_("Make the main window smaller"),
-	  G_CALLBACK (rb_shell_view_smalldisplay_changed_cb), },
-	{ "ViewPartyMode", NULL, N_("Party _Mode"), "F11",
-	  N_("Change the status of the party mode"),
-	  G_CALLBACK (rb_shell_view_party_mode_changed_cb), FALSE },
-	{ "ViewQueueAsSidebar", NULL, N_("Play _Queue as Side Pane"), "<control>K",
-	  N_("Change whether the queue is visible as a source or a sidebar"),
-	  G_CALLBACK (rb_shell_view_queue_as_sidebar_changed_cb) },
-        { "ViewStatusbar", NULL, N_("S_tatusbar"), NULL,
-	  N_("Change the visibility of the statusbar"),
-	  G_CALLBACK (rb_shell_view_statusbar_changed_cb), TRUE },
-        { "ViewBrowser", NULL, N_("_Browse"), "<control>B",
-	  N_("Change the visibility of the browser"),
-	  NULL, TRUE }
-};
-static guint rb_shell_n_toggle_entries = G_N_ELEMENTS (rb_shell_toggle_entries);
-
-static void
-rb_shell_activate (GApplication *app)
-{
-	rb_shell_present (RB_SHELL (app), gtk_get_current_event_time (), NULL);
-}
-
-static void
-rb_shell_open (GApplication *app, GFile **files, int n_files, const char *hint)
-{
-	int i;
-
-	for (i = 0; i < n_files; i++) {
-		char *uri;
-
-		uri = g_file_get_uri (files[i]);
-
-		/*
-		 * rb_uri_exists won't work if the location isn't mounted.
-		 * however, things that are interesting to mount are generally
-		 * non-local, so we'll process them anyway.
-		 */
-		if (rb_uri_is_local (uri) == FALSE || rb_uri_exists (uri)) {
-			rb_shell_load_uri (RB_SHELL (app), uri, TRUE, NULL);
-		}
-		g_free (uri);
-	}
-}
-
-static void
-load_state_changed_cb (GActionGroup *action_group, const char *action_name, GVariant *state, GPtrArray *files)
-{
-	gboolean loaded;
-	gboolean scanned;
-
-	if (g_strcmp0 (action_name, "LoadURI") != 0) {
-		return;
-	}
-
-	g_variant_get (state, "(bb)", &loaded, &scanned);
-	if (loaded) {
-		rb_debug ("opening files now");
-		g_signal_handlers_disconnect_by_func (action_group, load_state_changed_cb, files);
-
-		g_application_open (G_APPLICATION (action_group), (GFile **)files->pdata, files->len, "");
-		g_ptr_array_free (files, TRUE);
-	}
-}
-
-
-
-static GMountOperation *
-rb_shell_create_mount_op_cb (RhythmDB *db, RBShell *shell)
-{
-	/* we don't want the operation to be modal, so we don't associate it with the window. */
-	GMountOperation *op = gtk_mount_operation_new (NULL);
-	gtk_mount_operation_set_screen (GTK_MOUNT_OPERATION (op),
-					gtk_window_get_screen (GTK_WINDOW (shell->priv->window)));
-	return op;
-}
-
-static GValue *
-load_external_art_cb (RBExtDB *store, GValue *value, RBShell *shell)
-{
-	const char *data;
-	gsize data_size;
-	GdkPixbufLoader *loader;
-	GdkPixbuf *pixbuf;
-	GValue *v;
-	GError *error = NULL;
-
-	if (G_VALUE_HOLDS_STRING (value)) {
-		data = g_value_get_string (value);
-		data_size = strlen (data);
-	} else if (G_VALUE_HOLDS (value, G_TYPE_GSTRING)) {
-		GString *str = g_value_get_boxed (value);
-		data = (const char *)str->str;
-		data_size = str->len;
-	} else if (G_VALUE_HOLDS (value, G_TYPE_BYTE_ARRAY)) {
-		GByteArray *bytes = g_value_get_boxed (value);
-		data = (const char *)bytes->data;
-		data_size = bytes->len;
-	} else {
-		rb_debug ("unable to load pixbufs from values of type %s", G_VALUE_TYPE_NAME (value));
-		return NULL;
-	}
-
-	loader = gdk_pixbuf_loader_new ();
-	gdk_pixbuf_loader_write (loader, (const guchar *)data, data_size, &error);
-	if (error != NULL) {
-		rb_debug ("unable to load pixbuf: %s", error->message);
-		g_clear_error (&error);
-		g_object_unref (loader);
-		return NULL;
-	}
-
-	gdk_pixbuf_loader_close (loader, &error);
-	if (error != NULL) {
-		rb_debug ("unable to load pixbuf: %s", error->message);
-		g_clear_error (&error);
-		return NULL;
-	}
-
-	pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-	v = g_new0 (GValue, 1);
-	g_value_init (v, GDK_TYPE_PIXBUF);
-	g_value_set_object (v, pixbuf);
-	g_object_unref (loader);
-
-	return v;
-}
-
-static GValue *
-store_external_art_cb (RBExtDB *store, GValue *value, RBShell *shell)
-{
-	const char *jpeg_format = "jpeg";
-	char *jpeg_format_options[] = { "quality", NULL };
-	char *jpeg_format_values[] = { "100", NULL };
-	const char *png_format = "png";
-	char *png_format_options[] = { "compression", NULL };
-	char *png_format_values[] = { "9", NULL };
-	const char *format;
-	char **format_options;
-	char **format_values;
-	GdkPixbuf *pixbuf;
-	char *data;
-	gsize data_size;
-	GError *error = NULL;
-	GString *s;
-	GValue *v;
-
-	if (G_VALUE_HOLDS (value, GDK_TYPE_PIXBUF) == FALSE) {
-		rb_debug ("can't store values of type %s", G_VALUE_TYPE_NAME (value));
-		return NULL;
-	}
-
-	pixbuf = GDK_PIXBUF (g_value_get_object (value));
-
-	/* switch to png if the image has an alpha channel */
-	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-		format = png_format;
-		format_options = png_format_options;
-		format_values = png_format_values;
-	} else {
-		format = jpeg_format;
-		format_options = jpeg_format_options;
-		format_values = jpeg_format_values;
-	}
-
-	if (gdk_pixbuf_save_to_bufferv (pixbuf, &data, &data_size, format, format_options, format_values, &error) == FALSE) {
-		rb_debug ("unable to save pixbuf: %s", error->message);
-		g_clear_error (&error);
-		return NULL;
-	}
-
-	s = g_string_new_len (data, data_size);
-	v = g_new0 (GValue, 1);
-	g_value_init (v, G_TYPE_GSTRING);
-	g_value_set_boxed (v, s);
-	return v;
-}
-
-static void
-construct_db (RBShell *shell)
-{
-	char *pathname;
-
-	/* Initialize the database */
-	rb_debug ("creating database object");
-	rb_profile_start ("creating database object");
-
-	if (shell->priv->rhythmdb_file) {
-		pathname = g_strdup (shell->priv->rhythmdb_file);
-	} else {
-		pathname = rb_find_user_data_file ("rhythmdb.xml");
-	}
-
-#ifdef WITH_RHYTHMDB_TREE
-	shell->priv->db = rhythmdb_tree_new (pathname);
-#elif defined(WITH_RHYTHMDB_GDA)
-	shell->priv->db = rhythmdb_gda_new (pathname);
-#endif
-	g_free (pathname);
-
-	if (shell->priv->dry_run)
-		g_object_set (shell->priv->db, "dry-run", TRUE, NULL);
-	if (shell->priv->no_update)
-		g_object_set (shell->priv->db, "no-update", TRUE, NULL);
-
-	g_signal_connect_object (G_OBJECT (shell->priv->db), "load-complete",
-				 G_CALLBACK (rb_shell_load_complete_cb), shell,
-				 0);
-	g_signal_connect_object (G_OBJECT (shell->priv->db), "create-mount-op",
-				 G_CALLBACK (rb_shell_create_mount_op_cb), shell,
-				 0);
-
-	shell->priv->art_store = rb_ext_db_new ("album-art");
-	g_signal_connect (shell->priv->art_store, "load", G_CALLBACK (load_external_art_cb), shell);
-	g_signal_connect (shell->priv->art_store, "store", G_CALLBACK (store_external_art_cb), shell);
-
-	rb_profile_end ("creating database object");
-}
-
-static void
-construct_widgets (RBShell *shell)
-{
-	GtkWindow *win;
-
-	rb_profile_start ("constructing widgets");
-
-	/* initialize UI */
-	win = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
-	gtk_window_set_title (win, _("Rhythmbox"));
-
-	shell->priv->window = GTK_WIDGET (win);
-	shell->priv->iconified = FALSE;
-	g_signal_connect_object (G_OBJECT (win), "window-state-event",
-				 G_CALLBACK (rb_shell_window_state_cb),
-				 shell, 0);
-
-	g_signal_connect_object (G_OBJECT (win), "configure-event",
-				 G_CALLBACK (rb_shell_window_configure_cb),
-				 shell, 0);
-
-	/* connect after, so that things can affect behaviour */
-	g_signal_connect_object (G_OBJECT (win), "delete_event",
-				 G_CALLBACK (rb_shell_window_delete_cb),
-				 shell, G_CONNECT_AFTER);
-
-	gtk_widget_add_events (GTK_WIDGET (win), GDK_KEY_PRESS_MASK);
-	g_signal_connect_object (G_OBJECT(win), "key_press_event",
-				 G_CALLBACK (rb_shell_key_press_event_cb), shell, 0);
-
-	rb_debug ("shell: initializing shell services");
-
-	shell->priv->podcast_manager = rb_podcast_manager_new (shell->priv->db);
-	shell->priv->track_transfer_queue = rb_track_transfer_queue_new (shell);
-	shell->priv->ui_manager = gtk_ui_manager_new ();
-	shell->priv->source_ui_merge_id = gtk_ui_manager_new_merge_id (shell->priv->ui_manager);
-
-	shell->priv->player_shell = rb_shell_player_new (shell->priv->db,
-							 shell->priv->ui_manager,
-							 shell->priv->actiongroup);
-	g_signal_connect_object (G_OBJECT (shell->priv->player_shell),
-				 "playing-source-changed",
-				 G_CALLBACK (rb_shell_playing_source_changed_cb),
-				 shell, 0);
-	g_signal_connect_object (G_OBJECT (shell->priv->player_shell),
-				 "notify::playing-from-queue",
-				 G_CALLBACK (rb_shell_playing_from_queue_cb),
-				 shell, 0);
-	g_signal_connect_object (G_OBJECT (shell->priv->player_shell),
-				 "window_title_changed",
-				 G_CALLBACK (rb_shell_player_window_title_changed_cb),
-				 shell, 0);
-	shell->priv->clipboard_shell = rb_shell_clipboard_new (shell->priv->actiongroup,
-							       shell->priv->ui_manager,
-							       shell->priv->db);
-
-	shell->priv->display_page_tree = rb_display_page_tree_new (shell);
-	gtk_widget_show_all (GTK_WIDGET (shell->priv->display_page_tree));
-	g_signal_connect_object (shell->priv->display_page_tree, "drop-received",
-				 G_CALLBACK (display_page_tree_drag_received_cb), shell, 0);
-	g_object_get (shell->priv->display_page_tree, "model", &shell->priv->display_page_model, NULL);
-	rb_display_page_group_add_core_groups (G_OBJECT (shell), shell->priv->display_page_model);
-
-	shell->priv->statusbar = rb_statusbar_new (shell->priv->db,
-						   shell->priv->ui_manager,
-						   shell->priv->track_transfer_queue);
-	g_object_set (shell->priv->player_shell, "statusbar", shell->priv->statusbar, NULL);
-	gtk_widget_show (GTK_WIDGET (shell->priv->statusbar));
-
-	g_signal_connect_object (shell->priv->display_page_tree, "selected",
-				 G_CALLBACK (display_page_selected_cb), shell, 0);
-
-	shell->priv->notebook = gtk_notebook_new ();
-	gtk_widget_show (shell->priv->notebook);
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (shell->priv->notebook), FALSE);
-	gtk_notebook_set_show_border (GTK_NOTEBOOK (shell->priv->notebook), FALSE);
-	g_signal_connect_object (shell->priv->display_page_tree,
-				 "size-allocate",
-				 G_CALLBACK (paned_size_allocate_cb),
-				 shell, 0);
-
-	shell->priv->queue_source = RB_PLAYLIST_SOURCE (rb_play_queue_source_new (shell));
-	g_object_set (shell->priv->player_shell, "queue-source", shell->priv->queue_source, NULL);
-	g_object_set (shell->priv->clipboard_shell, "queue-source", shell->priv->queue_source, NULL);
-	rb_shell_append_display_page (shell, RB_DISPLAY_PAGE (shell->priv->queue_source), RB_DISPLAY_PAGE_GROUP_LIBRARY);
-	g_object_get (shell->priv->queue_source, "sidebar", &shell->priv->queue_sidebar, NULL);
-	gtk_widget_show_all (shell->priv->queue_sidebar);
-	gtk_widget_set_no_show_all (shell->priv->queue_sidebar, TRUE);
-
-	/* places for plugins to put UI */
-	shell->priv->top_container = GTK_BOX (gtk_vbox_new (FALSE, 0));
-	shell->priv->bottom_container = GTK_BOX (gtk_vbox_new (FALSE, 0));
-	shell->priv->sidebar_container = GTK_BOX (gtk_vbox_new (FALSE, 0));
-	shell->priv->right_sidebar_container = GTK_BOX (gtk_vbox_new (FALSE, 0));
-
-	/* set up sidebars */
-	shell->priv->paned = gtk_hpaned_new ();
-	shell->priv->right_paned = gtk_hpaned_new ();
-	gtk_widget_show_all (shell->priv->right_paned);
-	g_signal_connect_object (G_OBJECT (shell->priv->right_paned),
-				 "size-allocate",
-				 G_CALLBACK (paned_size_allocate_cb),
-				 shell, 0);
-	gtk_widget_set_no_show_all (shell->priv->right_paned, TRUE);
-	{
-		GtkWidget *vbox2 = gtk_vbox_new (FALSE, 0);
-
-		shell->priv->queue_paned = gtk_vpaned_new ();
-		gtk_paned_pack1 (GTK_PANED (shell->priv->queue_paned),
-				 GTK_WIDGET (shell->priv->display_page_tree),
-				 FALSE, TRUE);
-		gtk_paned_pack2 (GTK_PANED (shell->priv->queue_paned),
-				 shell->priv->queue_sidebar,
-				 TRUE, TRUE);
-		gtk_container_child_set (GTK_CONTAINER (shell->priv->queue_paned),
-					 GTK_WIDGET (shell->priv->display_page_tree),
-					 "resize", FALSE,
-					 NULL);
-
-		gtk_box_pack_start (GTK_BOX (vbox2),
-				    shell->priv->notebook,
-				    TRUE, TRUE, 0);
-		gtk_box_pack_start (GTK_BOX (vbox2),
-				    GTK_WIDGET (shell->priv->bottom_container),
-				    FALSE, FALSE, 0);
-
-		gtk_paned_pack1 (GTK_PANED (shell->priv->right_paned),
-				 vbox2, TRUE, TRUE);
-		gtk_paned_pack2 (GTK_PANED (shell->priv->right_paned),
-				 GTK_WIDGET (shell->priv->right_sidebar_container),
-				 FALSE, FALSE);
-		gtk_widget_hide (GTK_WIDGET(shell->priv->right_sidebar_container));
-
-		gtk_box_pack_start (shell->priv->sidebar_container,
-				    shell->priv->queue_paned,
-				    TRUE, TRUE, 0);
-		gtk_paned_pack1 (GTK_PANED (shell->priv->paned),
-				 GTK_WIDGET (shell->priv->sidebar_container),
-				 FALSE, TRUE);
-		gtk_paned_pack2 (GTK_PANED (shell->priv->paned),
-				 shell->priv->right_paned,
-				 TRUE, TRUE);
-		gtk_widget_show (vbox2);
-	}
-
-	g_signal_connect_object (G_OBJECT (shell->priv->queue_paned),
-				 "size-allocate",
-				 G_CALLBACK (paned_size_allocate_cb),
-				 shell, 0);
-	gtk_widget_show (shell->priv->paned);
-
-	shell->priv->main_vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (shell->priv->main_vbox), 0);
-	gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), GTK_WIDGET (shell->priv->player_shell), FALSE, TRUE, 6);
-	gtk_widget_show (GTK_WIDGET (shell->priv->player_shell));
-
-	gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), GTK_WIDGET (shell->priv->top_container), FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), shell->priv->paned, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), GTK_WIDGET (shell->priv->statusbar), FALSE, TRUE, 0);
-	gtk_widget_show_all (shell->priv->main_vbox);
-
-	gtk_container_add (GTK_CONTAINER (win), shell->priv->main_vbox);
-
-	rb_profile_end ("constructing widgets");
-}
-
-static void
-construct_sources (RBShell *shell)
-{
-	RBDisplayPage *page_group;
-	char *pathname;
-
-	rb_profile_start ("constructing sources");
-
-	page_group = RB_DISPLAY_PAGE_GROUP_LIBRARY;
-	shell->priv->library_source = RB_LIBRARY_SOURCE (rb_library_source_new (shell));
-	shell->priv->podcast_source = RB_PODCAST_SOURCE (rb_podcast_main_source_new (shell, shell->priv->podcast_manager));
-	shell->priv->missing_files_source = rb_missing_files_source_new (shell, shell->priv->library_source);
-
-	shell->priv->import_errors_source = rb_import_errors_source_new (shell,
-									 RHYTHMDB_ENTRY_TYPE_IMPORT_ERROR,
-									 RHYTHMDB_ENTRY_TYPE_SONG,
-									 RHYTHMDB_ENTRY_TYPE_IGNORE);
-
-	rb_shell_append_display_page (shell, RB_DISPLAY_PAGE (shell->priv->library_source), page_group);
-	rb_shell_append_display_page (shell, RB_DISPLAY_PAGE (shell->priv->podcast_source), page_group);
-	rb_shell_append_display_page (shell, RB_DISPLAY_PAGE (shell->priv->missing_files_source), page_group);
-	rb_shell_append_display_page (shell, RB_DISPLAY_PAGE (shell->priv->import_errors_source), page_group);
-
-	rb_auto_playlist_source_create_actions (shell);
-	rb_static_playlist_source_create_actions (shell);
-
-	rb_podcast_main_source_add_subsources (RB_PODCAST_MAIN_SOURCE (shell->priv->podcast_source));
-
-	/* Find the playlist name if none supplied */
-	if (shell->priv->playlists_file) {
-		pathname = g_strdup (shell->priv->playlists_file);
-	} else {
-		pathname = rb_find_user_data_file ("playlists.xml");
-	}
-
-	/* Initialize playlist manager */
-	rb_debug ("shell: creating playlist manager");
-	shell->priv->playlist_manager = rb_playlist_manager_new (shell,
-								 shell->priv->display_page_model,
-								 shell->priv->display_page_tree,
-								 pathname);
-
-	g_object_set (shell->priv->clipboard_shell,
-		      "playlist-manager", shell->priv->playlist_manager,
-		      NULL);
-
-	g_signal_connect_object (G_OBJECT (shell->priv->playlist_manager), "playlist_added",
-				 G_CALLBACK (rb_shell_playlist_added_cb), shell, 0);
-	g_signal_connect_object (G_OBJECT (shell->priv->playlist_manager), "playlist_created",
-				 G_CALLBACK (rb_shell_playlist_created_cb), shell, 0);
-
-	/* Initialize removable media manager */
-	rb_debug ("shell: creating removable media manager");
-	shell->priv->removable_media_manager = rb_removable_media_manager_new (shell);
-
-	g_signal_connect_object (G_OBJECT (shell->priv->removable_media_manager), "medium_added",
-				 G_CALLBACK (rb_shell_medium_added_cb), shell, 0);
-
-
-	g_free (pathname);
-
-	rb_profile_end ("constructing sources");
-}
-
-static void
-construct_load_ui (RBShell *shell)
-{
-	GtkWidget *menubar;
-	GtkWidget *toolbar;
-	GtkToolItem *tool_item;
-	GError *error = NULL;
-
-	rb_debug ("shell: loading ui");
-	rb_profile_start ("loading ui");
-
-	gtk_ui_manager_insert_action_group (shell->priv->ui_manager,
-					    shell->priv->actiongroup, 0);
-	gtk_ui_manager_add_ui_from_file (shell->priv->ui_manager,
-					 rb_file ("rhythmbox-ui.xml"), &error);
-
-	gtk_ui_manager_ensure_update (shell->priv->ui_manager);
-	gtk_window_add_accel_group (GTK_WINDOW (shell->priv->window),
-				    gtk_ui_manager_get_accel_group (shell->priv->ui_manager));
-	menubar = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/MenuBar");
-
-	gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), menubar, FALSE, FALSE, 0);
-	gtk_box_reorder_child (GTK_BOX (shell->priv->main_vbox), menubar, 0);
-
-	toolbar = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/ToolBar");
-	gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
-				     GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
-	g_settings_bind (shell->priv->settings, "toolbar-visible",
-			 toolbar, "visible",
-			 G_SETTINGS_BIND_DEFAULT);
-	gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), toolbar, FALSE, FALSE, 0);
-	gtk_box_reorder_child (GTK_BOX (shell->priv->main_vbox), toolbar, 1);
-
-	shell->priv->volume_button = gtk_volume_button_new ();
-	g_signal_connect (shell->priv->volume_button, "value-changed",
-			  G_CALLBACK (rb_shell_volume_widget_changed_cb),
-			  shell);
-	g_signal_connect (shell->priv->player_shell, "notify::volume",
-			  G_CALLBACK (rb_shell_player_volume_changed_cb),
-			  shell);
-	rb_shell_player_volume_changed_cb (shell->priv->player_shell, NULL, shell);
-
-	tool_item = gtk_tool_item_new ();
-	gtk_tool_item_set_expand (tool_item, TRUE);
-	gtk_widget_show (GTK_WIDGET (tool_item));
-	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
-
-	tool_item = gtk_tool_item_new ();
-	gtk_container_add (GTK_CONTAINER (tool_item), shell->priv->volume_button);
-	gtk_widget_show_all (GTK_WIDGET (tool_item));
-	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), tool_item, -1);
-
-	gtk_widget_set_tooltip_text (shell->priv->volume_button,
-				     _("Change the music volume"));
-
-	if (error != NULL) {
-		g_warning ("Couldn't merge %s: %s",
-			   rb_file ("rhythmbox-ui.xml"), error->message);
-		g_clear_error (&error);
-	}
-
-	rb_profile_end ("loading ui");
-}
-
-static void
-extension_added_cb (PeasExtensionSet *set, PeasPluginInfo *info, PeasExtension *extension, RBShell *shell)
-{
-	rb_debug ("activating extension %s", peas_plugin_info_get_name (info));
-	peas_extension_call (extension, "activate");
-}
-
-static void
-extension_removed_cb (PeasExtensionSet *set, PeasPluginInfo *info, PeasExtension *extension, RBShell *shell)
-{
-	rb_debug ("deactivating extension %s", peas_plugin_info_get_name (info));
-	peas_extension_call (extension, "deactivate");
-}
-
-static void
-construct_plugins (RBShell *shell)
-{
-	char *typelib_dir;
-	char *plugindir;
-	char *plugindatadir;
-	const GList *plugins;
-	const GList *l;
-	GError *error = NULL;
-
-	if (shell->priv->disable_plugins) {
-		return;
-	}
-
-	rb_profile_start ("loading plugins");
-	shell->priv->plugin_settings = g_settings_new ("org.gnome.rhythmbox.plugins");
-
-	shell->priv->plugin_engine = peas_engine_new ();
-	/* need an #ifdef for this? */
-	peas_engine_enable_loader (shell->priv->plugin_engine, "python");
-
-	typelib_dir = g_build_filename (LIBDIR,
-					"girepository-1.0",
-					NULL);
-	if (g_irepository_require_private (g_irepository_get_default (),
-					   typelib_dir, "MPID", "3.0", 0, &error) == FALSE) {
-		g_clear_error (&error);
-		if (g_irepository_require (g_irepository_get_default (), "MPID", "3.0", 0, &error) == FALSE) {
-			g_warning ("Could not load MPID typelib: %s", error->message);
-			g_clear_error (&error);
-		}
-	}
-
-	if (g_irepository_require_private (g_irepository_get_default (),
-					   typelib_dir, "RB", "3.0", 0, &error) == FALSE) {
-		g_clear_error (&error);
-		if (g_irepository_require (g_irepository_get_default (), "RB", "3.0", 0, &error) == FALSE) {
-			g_warning ("Could not load RB typelib: %s", error->message);
-			g_clear_error (&error);
-		}
-	}
-	g_free (typelib_dir);
-
-	if (g_irepository_require (g_irepository_get_default (), "Peas", "1.0", 0, &error) == FALSE) {
-		g_warning ("Could not load Peas typelib: %s", error->message);
-		g_clear_error (&error);
-	}
-
-	if (g_irepository_require (g_irepository_get_default (), "PeasGtk", "1.0", 0, &error) == FALSE) {
-		g_warning ("Could not load PeasGtk typelib: %s", error->message);
-		g_clear_error (&error);
-	}
-
-	plugindir = g_build_filename (rb_user_data_dir (), "plugins", NULL);
-	rb_debug ("plugin search path: %s", plugindir);
-	peas_engine_add_search_path (shell->priv->plugin_engine,
-				     plugindir,
-				     plugindir);
-	g_free (plugindir);
-
-	plugindir = g_build_filename (LIBDIR, "rhythmbox", "plugins", NULL);
-	plugindatadir = g_build_filename (DATADIR, "rhythmbox", "plugins", NULL);
-	rb_debug ("plugin search path: %s / %s", plugindir, plugindatadir);
-	peas_engine_add_search_path (shell->priv->plugin_engine,
-				     plugindir,
-				     plugindatadir);
-	g_free (plugindir);
-	g_free (plugindatadir);
-
-#ifdef USE_UNINSTALLED_DIRS
-	plugindir = g_build_filename (SHARE_UNINSTALLED_BUILDDIR, "..", UNINSTALLED_PLUGINS_LOCATION, NULL);
-	rb_debug ("plugin search path: %s", plugindir);
-	peas_engine_add_search_path (shell->priv->plugin_engine,
-				     plugindir,
-				     plugindir);
-	g_free (plugindir);
-#endif
-
-	shell->priv->activatable = peas_extension_set_new (shell->priv->plugin_engine,
-							   PEAS_TYPE_ACTIVATABLE,
-							   "object", shell,
-							   NULL);
-	g_signal_connect (shell->priv->activatable, "extension-added", G_CALLBACK (extension_added_cb), shell);
-	g_signal_connect (shell->priv->activatable, "extension-removed", G_CALLBACK (extension_removed_cb), shell);
-
-	g_settings_bind (shell->priv->plugin_settings,
-			 "active-plugins",
-			 shell->priv->plugin_engine,
-			 "loaded-plugins",
-			 G_SETTINGS_BIND_DEFAULT);
-
-	/* load builtin plugins */
-	plugins = peas_engine_get_plugin_list (shell->priv->plugin_engine);
-	for (l = plugins; l != NULL; l = l->next) {
-		PeasPluginInfo *info = PEAS_PLUGIN_INFO (l->data);
-		if (peas_plugin_info_is_builtin (info) &&
-		    g_strcmp0 (peas_plugin_info_get_module_name (info), "rb") != 0) {
-			peas_engine_load_plugin (shell->priv->plugin_engine, info);
-		}
-	}
-
-	rb_profile_end ("loading plugins");
-}
-
-static void
-emit_action_state_update (RBShell *shell, const char *action)
-{
-	GDBusConnection *bus;
-	GVariant *state;
-
-
-	bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-
-	state = g_action_group_get_action_state (G_ACTION_GROUP (shell), action);
-	g_signal_emit_by_name (shell, "action-state-changed::LoadURI", "LoadURI", state);
-	if (bus != NULL) {
-		g_dbus_connection_emit_signal (bus,
-					       NULL,
-					       "/org/gnome/Rhythmbox3",
-					       "org.gtk.Actions",
-					       "StateChanged",
-					       g_variant_new ("(sv)", action, state),
-					       NULL);
-		g_object_unref (bus);
-	}
-	g_variant_unref (state);
-}
-
-static gboolean
-_scan_idle (RBShell *shell)
-{
-	gboolean loaded, scanned;
-
-	GDK_THREADS_ENTER ();
-	rb_removable_media_manager_scan (shell->priv->removable_media_manager);
-	GDK_THREADS_LEAVE ();
-
-	if (shell->priv->no_registration == FALSE) {
-		g_variant_get (g_action_group_get_action_state (G_ACTION_GROUP (shell), "LoadURI"), "(bb)", &loaded, &scanned);
-		g_action_group_change_action_state (G_ACTION_GROUP (shell), "LoadURI", g_variant_new ("(bb)", loaded, TRUE));
-		emit_action_state_update (shell, "LoadURI");
-	}
-
-	return FALSE;
-}
-
-static void
-rb_shell_startup (GApplication *app)
-{
-	RBShell *shell = RB_SHELL (app);
-	GtkAction *gtkaction;
-
-	rb_debug ("Constructing shell");
-	rb_profile_start ("constructing shell");
-
-	g_signal_connect_object (shell->priv->settings, "changed", G_CALLBACK (settings_changed_cb), shell, 0);
-
-	gtkaction = gtk_action_group_get_action (shell->priv->actiongroup, "ViewSidePane");
-	g_settings_bind (shell->priv->settings, "display-page-tree-visible",
-			 gtkaction, "active",
-			 G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (shell->priv->settings, "display-page-tree-visible",
-			 shell->priv->sidebar_container, "visible",
-			 G_SETTINGS_BIND_DEFAULT);
-
-	gtkaction = gtk_action_group_get_action (shell->priv->actiongroup, "ViewToolbar");
-	g_settings_bind (shell->priv->settings, "toolbar-visible",
-			 gtkaction, "active",
-			 G_SETTINGS_BIND_DEFAULT);
-
-	rb_debug ("shell: syncing with settings");
-	rb_shell_sync_pane_visibility (shell);
-
-	g_signal_connect_object (G_OBJECT (shell->priv->db), "save-error",
-				 G_CALLBACK (rb_shell_db_save_error_cb), shell, 0);
-
-	construct_sources (shell);
-
-	construct_load_ui (shell);
-
-	construct_plugins (shell);
-
-	rb_shell_sync_window_state (shell, FALSE);
-	rb_shell_sync_smalldisplay (shell);
-	rb_shell_sync_party_mode (shell);
-	rb_shell_sync_toolbar_state (shell);
-
-	rb_shell_select_page (shell, RB_DISPLAY_PAGE (shell->priv->library_source));
-
-	/* by now we've added the built in sources and any sources from plugins,
-	 * so we can consider the fixed page groups loaded
-	 */
-	rb_display_page_group_loaded (RB_DISPLAY_PAGE_GROUP (RB_DISPLAY_PAGE_GROUP_LIBRARY));
-	rb_display_page_group_loaded (RB_DISPLAY_PAGE_GROUP (RB_DISPLAY_PAGE_GROUP_STORES));
-
-	rb_missing_plugins_init (GTK_WINDOW (shell->priv->window));
-
-	g_idle_add ((GSourceFunc)_scan_idle, shell);
-
-	/* GO GO GO! */
-	rb_debug ("loading database");
-	rhythmdb_load (shell->priv->db);
-
-	rb_debug ("shell: syncing window state");
-	rb_shell_sync_paned (shell);
-
-	/* set initial visibility */
-	rb_shell_set_visibility (shell, TRUE, TRUE);
-
-	gdk_notify_startup_complete ();
-
-	/* focus play if small, the entry view if not */
-	if (g_settings_get_boolean (shell->priv->settings, "small-display")) {
-		GtkWidget *play_button;
-
-		play_button = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/ToolBar/Play");
-		gtk_widget_grab_focus (play_button);
-	} else {
-		RBEntryView *view;
-
-		view = rb_source_get_entry_view (RB_SOURCE (shell->priv->library_source));
-		if (view != NULL) {
-			gtk_widget_grab_focus (GTK_WIDGET (view));
-		}
-	}
-
-	rb_profile_end ("constructing shell");
-
-	/* window-based usage counting doesn't work for us, just hold the app until
-	 * we're asked to quit.
-	 */
-	g_application_hold (app);
-}
-
-static gboolean
-rb_shell_local_command_line (GApplication *app, gchar ***args, int *exit_status)
-{
-	RBShell *shell;
-	GError *error = NULL;
-	gboolean scanned;
-	gboolean loaded;
-	GPtrArray *files;
-	int n_files;
-	int i;
-
-	n_files = g_strv_length (*args) - 1;
-
-	shell = RB_SHELL (app);
-	if (shell->priv->no_registration) {
-		if (n_files > 0) {
-			g_warning ("Unable to open files on the commandline with --no-registration");
-		}
-		rb_shell_startup (app);
-		return TRUE;
-	}
-
-	if (!g_application_register (app, NULL, &error)) {
-		g_critical ("%s", error->message);
-		g_error_free (error);
-		*exit_status = 1;
-		return TRUE;
-	}
-
-	if (n_files <= 0) {
-		g_application_activate (app);
-		*exit_status = 0;
-		return TRUE;
-	}
-
-	files = g_ptr_array_new_with_free_func (g_object_unref);
-	for (i = 0; i < n_files; i++) {
-		g_ptr_array_add (files, g_file_new_for_commandline_arg ((*args)[i + 1]));
-	}
-
-	g_variant_get (g_action_group_get_action_state (G_ACTION_GROUP (app), "LoadURI"), "(bb)", &loaded, &scanned);
-	if (loaded) {
-		rb_debug ("opening files immediately");
-		g_application_open (app, (GFile **)files->pdata, files->len, "");
-		g_ptr_array_free (files, TRUE);
-	} else {
-		rb_debug ("opening files once db is loaded");
-		g_signal_connect (app, "action-state-changed::LoadURI", G_CALLBACK (load_state_changed_cb), files);
-	}
-
-	return TRUE;
-}
-static void
-rb_shell_class_init (RBShellClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GApplicationClass *app_class = G_APPLICATION_CLASS (klass);
-
-	object_class->set_property = rb_shell_set_property;
-	object_class->get_property = rb_shell_get_property;
-        object_class->finalize = rb_shell_finalize;
-	object_class->constructed = rb_shell_constructed;
-
-	app_class->activate = rb_shell_activate;
-	app_class->open = rb_shell_open;
-	app_class->local_command_line = rb_shell_local_command_line;
-	app_class->startup = rb_shell_startup;
-
-	klass->visibility_changing = rb_shell_visibility_changing;
-
-	/**
-	 * RBShell:no-registration:
-	 *
-	 * If %TRUE, disable single-instance features.
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_NO_REGISTRATION,
-					 g_param_spec_boolean ("no-registration",
-							       "no-registration",
-							       "Whether or not to register",
-							       FALSE,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-	/**
-	 * RBShell:no-update:
-	 *
-	 * If %TRUE, don't update the database.
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_NO_UPDATE,
-					 g_param_spec_boolean ("no-update",
-							       "no-update",
-							       "Whether or not to update the library",
-							       FALSE,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-	/**
-	 * RBShell:dry-run:
-	 *
-	 * If TRUE, don't write back file metadata changes.
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_DRY_RUN,
-					 g_param_spec_boolean ("dry-run",
-							       "dry-run",
-							       "Whether or not this is a dry run",
-							       FALSE,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-	/**
-	 * RBShell:rhythmdb-file:
-	 *
-	 * The path to the rhythmdb file
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_RHYTHMDB_FILE,
-					 g_param_spec_string ("rhythmdb-file",
-							      "rhythmdb-file",
-							      "The RhythmDB file to use",
-							      "rhythmdb.xml",
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-	/**
-	 * RBShell:playlists-file:
-	 *
-	 * The path to the playlist file
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_PLAYLISTS_FILE,
-					 g_param_spec_string ("playlists-file",
-							      "playlists-file",
-							      "The playlists file to use",
-							      "playlists.xml",
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-	/**
-	 * RBShell:selected-page:
-	 *
-	 * The currently selected display page
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_SELECTED_PAGE,
-					 g_param_spec_object ("selected-page",
-							      "selected-page",
-							      "Display page which is currently selected",
-							      RB_TYPE_DISPLAY_PAGE,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:db:
-	 *
-	 * The #RhythmDB instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_DB,
-					 g_param_spec_object ("db",
-							      "RhythmDB",
-							      "RhythmDB object",
-							      RHYTHMDB_TYPE,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:ui-manager:
-	 *
-	 * The #GtkUIManager instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_UI_MANAGER,
-					 g_param_spec_object ("ui-manager",
-							      "GtkUIManager",
-							      "GtkUIManager object",
-							      GTK_TYPE_UI_MANAGER,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:clipboard:
-	 *
-	 * The #RBShellClipboard instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_CLIPBOARD,
-					 g_param_spec_object ("clipboard",
-							      "RBShellClipboard",
-							      "RBShellClipboard object",
-							      RB_TYPE_SHELL_CLIPBOARD,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:playlist-manager:
-	 *
-	 * The #RBPlaylistManager instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_PLAYLIST_MANAGER,
-					 g_param_spec_object ("playlist-manager",
-							      "RBPlaylistManager",
-							      "RBPlaylistManager object",
-							      RB_TYPE_PLAYLIST_MANAGER,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:shell-player:
-	 *
-	 * The #RBShellPlayer instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_SHELL_PLAYER,
-					 g_param_spec_object ("shell-player",
-							      "RBShellPlayer",
-							      "RBShellPlayer object",
-							      RB_TYPE_SHELL_PLAYER,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:removable-media-manager:
-	 *
-	 * The #RBRemovableMediaManager instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_REMOVABLE_MEDIA_MANAGER,
-					 g_param_spec_object ("removable-media-manager",
-							      "RBRemovableMediaManager",
-							      "RBRemovableMediaManager object",
-							      RB_TYPE_REMOVABLE_MEDIA_MANAGER,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:window:
-	 *
-	 * The main Rhythmbox window.
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_WINDOW,
-					 g_param_spec_object ("window",
-							      "GtkWindow",
-							      "GtkWindow object",
-							      GTK_TYPE_WINDOW,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:prefs:
-	 *
-	 * The #RBShellPreferences instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_PREFS,
-					 g_param_spec_object ("prefs",
-							      "RBShellPreferences",
-							      "RBShellPreferences object",
-							      RB_TYPE_SHELL_PREFERENCES,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:queue-source:
-	 *
-	 * The play queue source
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_QUEUE_SOURCE,
-					 g_param_spec_object ("queue-source",
-							      "queue-source",
-							      "Queue source",
-							      RB_TYPE_PLAY_QUEUE_SOURCE,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:library-source:
-	 *
-	 * The library source
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_LIBRARY_SOURCE,
-					 g_param_spec_object ("library-source",
-							      "library-source",
-							      "Library source",
-							      RB_TYPE_LIBRARY_SOURCE,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:display-page-model:
-	 *
-	 * The model underlying the display page tree
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_DISPLAY_PAGE_MODEL,
-					 g_param_spec_object ("display-page-model",
-							      "display-page-model",
-							      "RBDisplayPageModel",
-							      RB_TYPE_DISPLAY_PAGE_MODEL,
-							      G_PARAM_READABLE));
-
-	/**
-	 * RBShell:display-page-tree:
-	 *
-	 * The #RBDisplayPageTree instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_DISPLAY_PAGE_TREE,
-					 g_param_spec_object ("display-page-tree",
-							      "display-page-tree",
-							      "RBDisplayPageTree",
-							      RB_TYPE_DISPLAY_PAGE_TREE,
-							      G_PARAM_READABLE));
-
-	/**
-	 * RBShell:visibility:
-	 *
-	 * Whether the main window is currently visible.
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_VISIBILITY,
-					 g_param_spec_boolean ("visibility",
-							       "visibility",
-							       "Current window visibility",
-							       TRUE,
-							       G_PARAM_READWRITE));
-	/**
-	 * RBShell:track-transfer-queue:
-	 *
-	 * The #RBTrackTransferQueue instance
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_TRACK_TRANSFER_QUEUE,
-					 g_param_spec_object ("track-transfer-queue",
-							      "RBTrackTransferQueue",
-							      "RBTrackTransferQueue object",
-							      RB_TYPE_TRACK_TRANSFER_QUEUE,
-							      G_PARAM_READABLE));
-	/**
-	 * RBShell:autostarted:
-	 *
-	 * Whether Rhythmbox was automatically started by the session manager
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_AUTOSTARTED,
-					 g_param_spec_boolean ("autostarted",
-							       "autostarted",
-							       "TRUE if autostarted",
-							       FALSE,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-	/**
-	 * RBShell:disable-plugins:
-	 *
-	 * If %TRUE, disable plugins
-	 */
-	g_object_class_install_property (object_class,
-					 PROP_DISABLE_PLUGINS,
-					 g_param_spec_boolean ("disable-plugins",
-							       "disable-plugins",
-							       "Whether or not to disable plugins",
-							       FALSE,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-	/**
-	 * RBShell::visibility-changed:
-	 * @shell: the #RBShell
-	 * @visibile: new visibility
-	 *
-	 * Emitted after the visibility of the main Rhythmbox window has
-	 * changed.
-	 */
-	rb_shell_signals[VISIBILITY_CHANGED] =
-		g_signal_new ("visibility_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (RBShellClass, visibility_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOOLEAN,
-			      G_TYPE_NONE,
-			      1,
-			      G_TYPE_BOOLEAN);
-	/**
-	 * RBShell::visibility-changing:
-	 * @shell: the #RBShell
-	 * @initial: if %TRUE, this is the initial visibility for the window
-	 * @visible: new shell visibility
-	 *
-	 * Emitted before the visibility of the main window changes.  The return
-	 * value overrides the visibility setting.  If multiple signal handlers
-	 * are attached, the last one wins.
-	 */
-	rb_shell_signals[VISIBILITY_CHANGING] =
-		g_signal_new ("visibility_changing",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (RBShellClass, visibility_changing),
-			      NULL, NULL,
-			      rb_marshal_BOOLEAN__BOOLEAN_BOOLEAN,
-			      G_TYPE_BOOLEAN,
-			      2,
-			      G_TYPE_BOOLEAN,
-			      G_TYPE_BOOLEAN);
-
-	/**
-	 * RBShell::create-song-info:
-	 * @shell: the #RBShell
-	 * @song_info: the new #RBSongInfo window
-	 * @multi: if %TRUE, the song info window is for multiple entries
-	 *
-	 * Emitted when creating a new #RBSongInfo window.  Signal handlers can
-	 * add pages to the song info window notebook to display additional
-	 * information.
-	 */
-	rb_shell_signals[CREATE_SONG_INFO] =
-		g_signal_new ("create_song_info",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (RBShellClass, create_song_info),
-			      NULL, NULL,
-			      rb_marshal_VOID__OBJECT_BOOLEAN,
-			      G_TYPE_NONE,
-			      2,
-			      RB_TYPE_SONG_INFO, G_TYPE_BOOLEAN);
-	/**
-	 * RBShell::notify-playing-entry:
-	 * @shell: the #RBShell
-	 *
-	 * Emitted when a notification should be displayed showing the current
-	 * playing entry.
-	 */
-	rb_shell_signals[NOTIFY_PLAYING_ENTRY] =
-		g_signal_new ("notify-playing-entry",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOOLEAN,
-			      G_TYPE_NONE,
-			      1,
-			      G_TYPE_BOOLEAN);
-	/**
-	 * RBShell::notify-custom:
-	 * @shell: the #RBShell
-	 * @timeout: length of time (in seconds) to display the notification
-	 * @primary: main notification text
-	 * @secondary: secondary notification text
-	 * @image_uri: URI for an image to include in the notification (optional)
-	 * @requested: if %TRUE, the notification was triggered by an explicit user action
-	 *
-	 * Emitted when a custom notification should be displayed to the user.
-	 */
-	rb_shell_signals[NOTIFY_CUSTOM] =
-		g_signal_new ("notify-custom",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      rb_marshal_VOID__UINT_STRING_STRING_STRING_BOOLEAN,
-			      G_TYPE_NONE,
-			      5,
-			      G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-	g_type_class_add_private (klass, sizeof (RBShellPrivate));
-}
-
-static void
-rb_shell_init (RBShell *shell)
-{
-	shell->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell, RB_TYPE_SHELL, RBShellPrivate);
-
-	rb_user_data_dir ();
-	rb_refstring_system_init ();
-
-#ifdef USE_UNINSTALLED_DIRS
-	rb_file_helpers_init (TRUE);
-#else
-	rb_file_helpers_init (FALSE);
-#endif
-	rb_stock_icons_init ();
-
-        rb_shell_session_init (shell);
-
-	g_setenv ("PULSE_PROP_media.role", "music", TRUE);
-}
-
-static void
-rb_shell_set_property (GObject *object,
-		       guint prop_id,
-		       const GValue *value,
-		       GParamSpec *pspec)
-{
-	RBShell *shell = RB_SHELL (object);
-
-	switch (prop_id)
-	{
-	case PROP_NO_REGISTRATION:
-		shell->priv->no_registration = g_value_get_boolean (value);
-		break;
-	case PROP_NO_UPDATE:
-		shell->priv->no_update = g_value_get_boolean (value);
-		break;
-	case PROP_DRY_RUN:
-		shell->priv->dry_run = g_value_get_boolean (value);
-		if (shell->priv->dry_run)
-			shell->priv->no_registration = TRUE;
-		break;
-	case PROP_RHYTHMDB_FILE:
-		g_free (shell->priv->rhythmdb_file);
-		shell->priv->rhythmdb_file = g_value_dup_string (value);
-		break;
-	case PROP_PLAYLISTS_FILE:
-		g_free (shell->priv->playlists_file);
-		shell->priv->playlists_file = g_value_dup_string (value);
-		break;
-	case PROP_VISIBILITY:
-		rb_shell_set_visibility (shell, FALSE, g_value_get_boolean (value));
-		break;
-	case PROP_AUTOSTARTED:
-		shell->priv->autostarted = g_value_get_boolean (value);
-		break;
-	case PROP_DISABLE_PLUGINS:
-		shell->priv->disable_plugins = g_value_get_boolean (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-rb_shell_get_property (GObject *object,
-		       guint prop_id,
-		       GValue *value,
-		       GParamSpec *pspec)
-{
-	RBShell *shell = RB_SHELL (object);
-
-	switch (prop_id)
-	{
-	case PROP_NO_REGISTRATION:
-		g_value_set_boolean (value, shell->priv->no_registration);
-		break;
-	case PROP_NO_UPDATE:
-		g_value_set_boolean (value, shell->priv->no_update);
-		break;
-	case PROP_DRY_RUN:
-		g_value_set_boolean (value, shell->priv->dry_run);
-		break;
-	case PROP_RHYTHMDB_FILE:
-		g_value_set_string (value, shell->priv->rhythmdb_file);
-		break;
-	case PROP_PLAYLISTS_FILE:
-		g_value_set_string (value, shell->priv->playlists_file);
-		break;
-	case PROP_DB:
-		g_value_set_object (value, shell->priv->db);
-		break;
-	case PROP_UI_MANAGER:
-		g_value_set_object (value, shell->priv->ui_manager);
-		break;
-	case PROP_CLIPBOARD:
-		g_value_set_object (value, shell->priv->clipboard_shell);
-		break;
-	case PROP_PLAYLIST_MANAGER:
-		g_value_set_object (value, shell->priv->playlist_manager);
-		break;
-	case PROP_SHELL_PLAYER:
-		g_value_set_object (value, shell->priv->player_shell);
-		break;
-	case PROP_REMOVABLE_MEDIA_MANAGER:
-		g_value_set_object (value, shell->priv->removable_media_manager);
-		break;
-	case PROP_SELECTED_PAGE:
-		g_value_set_object (value, shell->priv->selected_page);
-		break;
-	case PROP_WINDOW:
-		g_value_set_object (value, shell->priv->window);
-		break;
-	case PROP_PREFS:
-		/* create the preferences window the first time we need it */
-		if (shell->priv->prefs == NULL) {
-			GtkWidget *content;
-
-			shell->priv->prefs = rb_shell_preferences_new (shell->priv->sources);
-
-			gtk_window_set_transient_for (GTK_WINDOW (shell->priv->prefs),
-						      GTK_WINDOW (shell->priv->window));
-			content = gtk_dialog_get_content_area (GTK_DIALOG (shell->priv->prefs));
-			gtk_widget_show_all (content);
-		}
-		g_value_set_object (value, shell->priv->prefs);
-		break;
-	case PROP_QUEUE_SOURCE:
-		g_value_set_object (value, shell->priv->queue_source);
-		break;
-	case PROP_LIBRARY_SOURCE:
-		g_value_set_object (value, shell->priv->library_source);
-		break;
-	case PROP_DISPLAY_PAGE_MODEL:
-		g_value_set_object (value, shell->priv->display_page_model);
-		break;
-	case PROP_DISPLAY_PAGE_TREE:
-		g_value_set_object (value, shell->priv->display_page_tree);
-		break;
-	case PROP_VISIBILITY:
-		g_value_set_boolean (value, rb_shell_get_visibility (shell));
-		break;
-	case PROP_TRACK_TRANSFER_QUEUE:
-		g_value_set_object (value, shell->priv->track_transfer_queue);
-		break;
-	case PROP_AUTOSTARTED:
-		g_value_set_boolean (value, shell->priv->autostarted);
-		break;
-	case PROP_DISABLE_PLUGINS:
-		g_value_set_boolean (value, shell->priv->disable_plugins);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static gboolean
-rb_shell_sync_state (RBShell *shell)
-{
-	if (shell->priv->dry_run) {
-		rb_debug ("in dry-run mode, not syncing state");
-		return FALSE;
-	}
-
-	if (!shell->priv->load_complete) {
-		rb_debug ("load incomplete, not syncing state");
-		return FALSE;
-	}
-
-	rb_debug ("saving playlists");
-	rb_playlist_manager_save_playlists (shell->priv->playlist_manager,
-					    TRUE);
-
-	rb_debug ("saving db");
-	rhythmdb_save (shell->priv->db);
-	return FALSE;
-}
-
-static gboolean
-idle_save_rhythmdb (RBShell *shell)
-{
-	rhythmdb_save (shell->priv->db);
-
-	shell->priv->save_db_id = 0;
-
-	return FALSE;
-}
-
-static gboolean
-idle_save_playlist_manager (RBShell *shell)
-{
-	GDK_THREADS_ENTER ();
-	rb_playlist_manager_save_playlists (shell->priv->playlist_manager,
-					    FALSE);
-	GDK_THREADS_LEAVE ();
-
-	return TRUE;
-}
-
-static void
-rb_shell_shutdown (RBShell *shell)
-{
-	GdkDisplay *display;
-
-	if (shell->priv->shutting_down)
-		return;
-	shell->priv->shutting_down = TRUE;
-
-	/* Hide the main window and tray icon as soon as possible */
-	display = gtk_widget_get_display (shell->priv->window);
-	gtk_widget_hide (shell->priv->window);
-	gdk_display_sync (display);
-
-	if (shell->priv->plugin_engine != NULL) {
-		g_object_unref (shell->priv->plugin_engine);
-		shell->priv->plugin_engine = NULL;
-	}
-	if (shell->priv->activatable != NULL) {
-		g_object_unref (shell->priv->activatable);
-		shell->priv->activatable = NULL;
-	}
-	if (shell->priv->plugin_settings != NULL) {
-		g_object_unref (shell->priv->plugin_settings);
-		shell->priv->plugin_settings = NULL;
-	}
-}
-
-static void
-rb_shell_finalize (GObject *object)
-{
-        RBShell *shell = RB_SHELL (object);
-
-	rb_debug ("Finalizing shell");
-
-	rb_shell_player_stop (shell->priv->player_shell);
-
-	if (shell->priv->settings != NULL) {
-		rb_settings_delayed_sync (shell->priv->settings, NULL, NULL, NULL);
-		g_object_unref (shell->priv->settings);
-	}
-
-	g_free (shell->priv->cached_title);
-
-	if (shell->priv->save_playlist_id > 0) {
-		g_source_remove (shell->priv->save_playlist_id);
-		shell->priv->save_playlist_id = 0;
-	}
-
-	if (shell->priv->save_db_id > 0) {
-		g_source_remove (shell->priv->save_db_id);
-		shell->priv->save_db_id = 0;
-	}
-
-	if (shell->priv->queue_sidebar != NULL) {
-		g_object_unref (shell->priv->queue_sidebar);
-	}
-
-	if (shell->priv->playlist_manager != NULL) {
-		rb_debug ("shutting down playlist manager");
-		rb_playlist_manager_shutdown (shell->priv->playlist_manager);
-
-		rb_debug ("unreffing playlist manager");
-		g_object_unref (shell->priv->playlist_manager);
-	}
-
-	if (shell->priv->removable_media_manager != NULL) {
-		rb_debug ("unreffing removable media manager");
-		g_object_unref (shell->priv->removable_media_manager);
-		g_object_unref (shell->priv->track_transfer_queue);
-	}
-
-	if (shell->priv->podcast_manager != NULL) {
-		rb_debug ("unreffing podcast manager");
-		g_object_unref (shell->priv->podcast_manager);
-	}
-
-	if (shell->priv->clipboard_shell != NULL) {
-		rb_debug ("unreffing clipboard shell");
-		g_object_unref (shell->priv->clipboard_shell);
-	}
-
-	if (shell->priv->prefs != NULL) {
-		rb_debug ("destroying prefs");
-		gtk_widget_destroy (shell->priv->prefs);
-	}
-
-	g_free (shell->priv->rhythmdb_file);
-
-	g_free (shell->priv->playlists_file);
-
-	rb_debug ("destroying window");
-	gtk_widget_destroy (shell->priv->window);
-
-	g_list_free (shell->priv->sources);
-	shell->priv->sources = NULL;
-
-	if (shell->priv->sources_hash != NULL) {
-		g_hash_table_destroy (shell->priv->sources_hash);
-	}
-
-	if (shell->priv->db != NULL) {
-		rb_debug ("shutting down DB");
-		rhythmdb_shutdown (shell->priv->db);
-
-		rb_debug ("unreffing DB");
-		g_object_unref (shell->priv->db);
-	}
-	if (shell->priv->art_store != NULL) {
-		g_object_unref (shell->priv->art_store);
-		shell->priv->art_store = NULL;
-	}
-
-	rb_file_helpers_shutdown ();
-	rb_stock_icons_shutdown ();
-	rb_refstring_system_shutdown ();
-
-        G_OBJECT_CLASS (rb_shell_parent_class)->finalize (object);
-
-	rb_debug ("shell shutdown complete");
-}
-
-/**
- * rb_shell_new:
- * @autostarted: %TRUE if autostarted by the session manager
- * @argc: a pointer to the number of command line arguments
- * @argv: a pointer to the array of command line arguments
- *
- * Creates the Rhythmbox shell.  This is effectively a singleton, so it doesn't
- * make sense to call this from anywhere other than main.c.
- *
- * Return value: the #RBShell instance
- */
-RBShell *
-rb_shell_new (gboolean autostarted, int *argc, char ***argv)
-{
-	GOptionContext *context;
-	gboolean debug = FALSE;
-	char *debug_match = NULL;
-	gboolean no_update = FALSE;
-	gboolean no_registration = FALSE;
-	gboolean dry_run = FALSE;
-	gboolean disable_plugins = FALSE;
-	char *rhythmdb_file = NULL;
-	char *playlists_file = NULL;
-	GError *error = NULL;
-
-	const GOptionEntry options []  = {
-		{ "debug",           'd', 0, G_OPTION_ARG_NONE,         &debug,           N_("Enable debug output"), NULL },
-		{ "debug-match",     'D', 0, G_OPTION_ARG_STRING,       &debug_match,     N_("Enable debug output matching a specified string"), NULL },
-		{ "no-update",	       0, 0, G_OPTION_ARG_NONE,         &no_update,       N_("Do not update the library with file changes"), NULL },
-		{ "no-registration", 'n', 0, G_OPTION_ARG_NONE,         &no_registration, N_("Do not register the shell"), NULL },
-		{ "dry-run",	       0, 0, G_OPTION_ARG_NONE,         &dry_run,         N_("Don't save any data permanently (implies --no-registration)"), NULL },
-		{ "disable-plugins",   0, 0, G_OPTION_ARG_NONE,		&disable_plugins, N_("Disable loading of plugins"), NULL },
-		{ "rhythmdb-file",     0, 0, G_OPTION_ARG_STRING,       &rhythmdb_file,   N_("Path for database file to use"), NULL },
-		{ "playlists-file",    0, 0, G_OPTION_ARG_STRING,       &playlists_file,   N_("Path for playlists file to use"), NULL },
-		{ NULL }
-	};
-
-	context = g_option_context_new (NULL);
-	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
-	g_option_context_add_group (context, gst_init_get_option_group ());
-	g_option_context_add_group (context, egg_sm_client_get_option_group ());
-	g_option_context_add_group (context, gtk_get_option_group (TRUE));
-
-	if (g_option_context_parse (context, argc, argv, &error) == FALSE) {
-		g_print (_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
-			 error->message, (*argv)[0]);
-		g_error_free (error);
-		g_option_context_free (context);
-		exit (1);
-	}
-	g_option_context_free (context);
-
-	if (!debug && debug_match)
-		rb_debug_init_match (debug_match);
-	else
-		rb_debug_init (debug);
-
-	return g_object_new (RB_TYPE_SHELL,
-			     "application-id", "org.gnome.Rhythmbox3",
-			     "flags", G_APPLICATION_HANDLES_OPEN,
-			     "autostarted", autostarted,
-			     "no-registration", no_registration,
-			     "no-update", no_update,
-			     "dry-run", dry_run,
-			     "rhythmdb-file", rhythmdb_file,
-			     "playlists-file", playlists_file,
-			     "disable-plugins", disable_plugins,
-			     NULL);
-}
-
-static void
-load_uri_action_cb (GSimpleAction *action, GVariant *parameters, RBShell *shell)
-{
-	const char *uri;
-	gboolean play;
-
-	g_variant_get (parameters, "(&sb)", &uri, &play);
-
-	rb_shell_load_uri (shell, uri, play, NULL);
-}
-
-static void
-activate_source_action_cb (GSimpleAction *action, GVariant *parameters, RBShell *shell)
-{
-	const char *source;
-	guint play;
-
-	g_variant_get (parameters, "(&su)", &source, &play);
-	rb_shell_activate_source_by_uri (shell, source, play, NULL);
-}
-
-static void
-quit_action_cb (GSimpleAction *action, GVariant *parameters, RBShell *shell)
-{
-	rb_shell_quit (shell, NULL);
-}
-
-static void
-rb_shell_constructed (GObject *object)
-{
-	RBShell *shell;
-	GSimpleActionGroup *actions;
-	GSimpleAction *action;
-
-	gtk_init (NULL, NULL);
-
-	RB_CHAIN_GOBJECT_METHOD (rb_shell_parent_class, constructed, object);
-
-	shell = RB_SHELL (object);
-
-	/* create application actions */
-	actions = g_simple_action_group_new ();
-	action = g_simple_action_new_stateful ("LoadURI", G_VARIANT_TYPE ("(sb)"), g_variant_new ("(bb)", FALSE, FALSE));
-	g_signal_connect_object (action, "activate", G_CALLBACK (load_uri_action_cb), shell, 0);
-	g_simple_action_group_insert (actions, G_ACTION (action));
-	g_object_unref (action);
-
-	action = g_simple_action_new ("ActivateSource", G_VARIANT_TYPE ("(su)"));
-	g_signal_connect_object (action, "activate", G_CALLBACK (activate_source_action_cb), shell, 0);
-	g_simple_action_group_insert (actions, G_ACTION (action));
-	g_object_unref (action);
-
-	action = g_simple_action_new ("Quit", NULL);
-	g_signal_connect_object (action, "activate", G_CALLBACK (quit_action_cb), shell, 0);
-	g_simple_action_group_insert (actions, G_ACTION (action));
-	g_object_unref (action);
-
-	g_application_set_action_group (G_APPLICATION (shell), G_ACTION_GROUP (actions));
-
-	/* construct enough of the rest of it to display the window if required */
-
-	shell->priv->settings = g_settings_new ("org.gnome.rhythmbox");
-
-	shell->priv->actiongroup = gtk_action_group_new ("MainActions");
-	gtk_action_group_set_translation_domain (shell->priv->actiongroup,
-						 GETTEXT_PACKAGE);
-	gtk_action_group_add_actions (shell->priv->actiongroup,
-				      rb_shell_actions,
-				      rb_shell_n_actions, shell);
-	gtk_action_group_add_toggle_actions (shell->priv->actiongroup,
-					     rb_shell_toggle_entries,
-					     rb_shell_n_toggle_entries,
-					     shell);
-
-	/* Translators: this is the short label for the 'import folder' action */
-	gtk_action_set_short_label (gtk_action_group_get_action (shell->priv->actiongroup, "MusicImportFolder"), C_("Library", "Import"));
-	/* Translators: this is the short label for the 'view all tracks' action */
-	gtk_action_set_short_label (gtk_action_group_get_action (shell->priv->actiongroup, "ViewAll"), _("Show All"));
-
-	construct_db (shell);
-
-	construct_widgets (shell);
-}
-
-static gboolean
-rb_shell_window_state_cb (GtkWidget *widget,
-			  GdkEventWindowState *event,
-			  RBShell *shell)
-{
-	shell->priv->iconified = ((event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) != 0);
-
-	if (event->changed_mask & (GDK_WINDOW_STATE_WITHDRAWN | GDK_WINDOW_STATE_ICONIFIED)) {
-		g_signal_emit (shell, rb_shell_signals[VISIBILITY_CHANGED], 0,
-			       rb_shell_get_visibility (shell));
-	}
-
-	/* don't save maximized state when is hidden */
-	if (!gtk_widget_get_visible (shell->priv->window))
-		return FALSE;
-
-	if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
-		gboolean maximised = ((event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0);
-
-		if (!g_settings_get_boolean (shell->priv->settings, "small-display")) {
-			g_settings_set_boolean (shell->priv->settings,
-						"maximized",
-						maximised);
-		}
-		rb_shell_sync_window_state (shell, TRUE);
-		rb_shell_sync_paned (shell);
-	}
-
-	return FALSE;
-}
-
-static gboolean
-rb_shell_visibility_changing (RBShell *shell, gboolean initial, gboolean visible)
-{
-	return visible;
-}
-
-static gboolean
-rb_shell_get_visibility (RBShell *shell)
-{
-	GdkWindowState state;
-
-	if (!gtk_widget_get_realized (shell->priv->window))
-		return FALSE;
-	if (shell->priv->iconified)
-		return FALSE;
-
-	state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (shell->priv->window)));
-	if (state & (GDK_WINDOW_STATE_WITHDRAWN | GDK_WINDOW_STATE_ICONIFIED))
-		return FALSE;
-
-	return TRUE;
-}
-
-static void
-rb_shell_set_visibility (RBShell *shell,
-			 gboolean initial,
-			 gboolean visible)
-{
-	gboolean really_visible;
-
-	rb_profile_start ("changing shell visibility");
-
-	if (visible == rb_shell_get_visibility (shell)) {
-		rb_profile_end ("changing shell visibility");
-		return;
-	}
-
-	really_visible = visible;
-	g_signal_emit (shell, rb_shell_signals[VISIBILITY_CHANGING], 0, initial, visible, &really_visible);
-
-	if (really_visible) {
-		rb_debug ("showing main window");
-		rb_shell_sync_window_state (shell, FALSE);
-
-		gtk_widget_show (GTK_WIDGET (shell->priv->window));
-		gtk_window_deiconify (GTK_WINDOW (shell->priv->window));
-
-		if (gtk_widget_get_realized (GTK_WIDGET (shell->priv->window)))
-			rb_shell_present (shell, gtk_get_current_event_time (), NULL);
-		else
-			gtk_widget_show_all (GTK_WIDGET (shell->priv->window));
-
-		g_signal_emit (shell, rb_shell_signals[VISIBILITY_CHANGED], 0, visible);
-	} else {
-		rb_debug ("hiding main window");
-		shell->priv->iconified = TRUE;
-		gtk_window_iconify (GTK_WINDOW (shell->priv->window));
-
-		g_signal_emit (shell, rb_shell_signals[VISIBILITY_CHANGED], 0, FALSE);
-	}
-
-	rb_profile_end ("changing shell visibility");
-}
-
-static void
-sync_window_settings (GSettings *settings, RBShell *shell)
-{
-	int width, height;
-	int oldx, oldy;
-	int x, y;
-	int pos;
-
-	gtk_window_get_size (GTK_WINDOW (shell->priv->window), &width, &height);
-	if (g_settings_get_boolean (shell->priv->settings, "small-display")) {
-		if (width != g_settings_get_int (shell->priv->settings, "small-width")) {
-			rb_debug ("storing small window width of %d", width);
-			g_settings_set_int (shell->priv->settings, "small-width", width);
-		}
-	} else {
-		int oldwidth, oldheight;
-
-		g_settings_get (shell->priv->settings, "size", "(ii)", &oldwidth, &oldheight);
-		if ((width != oldwidth) || (height != oldheight)) {
-			rb_debug ("storing window size of %d:%d", width, height);
-			g_settings_set (shell->priv->settings, "size", "(ii)", width, height);
-		}
-	}
-
-	gtk_window_get_position (GTK_WINDOW(shell->priv->window), &x, &y);
-	g_settings_get (shell->priv->settings, "position", "(ii)", &oldx, &oldy);
-	if ((x != oldx) || (y != oldy)) {
-		rb_debug ("storing window position of %d:%d", x, y);
-		g_settings_set (shell->priv->settings, "position", "(ii)", x, y);
-	}
-
-	pos = gtk_paned_get_position (GTK_PANED (shell->priv->paned));
-	rb_debug ("paned position %d", pos);
-
-	if (pos != g_settings_get_int (shell->priv->settings, "paned-position")) {
-		g_settings_set_int (shell->priv->settings, "paned-position", pos);
-	}
-
-	pos = gtk_paned_get_position (GTK_PANED (shell->priv->right_paned));
-	rb_debug ("right_paned position %d", pos);
-
-	if (pos != g_settings_get_int (shell->priv->settings, "right-paned-position")) {
-		g_settings_set_int (shell->priv->settings, "right-paned-position", pos);
-	}
-
-	pos = gtk_paned_get_position (GTK_PANED (shell->priv->queue_paned));
-	rb_debug ("sidebar paned position %d", pos);
-
-	if (pos != g_settings_get_int (shell->priv->settings, "display-page-tree-height")) {
-		g_settings_set_int (shell->priv->settings, "display-page-tree-height", pos);
-	}
-}
-
-static gboolean
-rb_shell_window_configure_cb (GtkWidget *win,
-			      GdkEventConfigure *event,
-			      RBShell *shell)
-{
-	if (g_settings_get_boolean (shell->priv->settings, "maximized") || shell->priv->iconified)
-		return FALSE;
-
-	rb_settings_delayed_sync (shell->priv->settings,
-				  (RBDelayedSyncFunc) sync_window_settings,
-				  g_object_ref (shell),
-				  g_object_unref);
-	return FALSE;
-}
-
-static gboolean
-rb_shell_window_delete_cb (GtkWidget *win,
-			   GdkEventAny *event,
-			   RBShell *shell)
-{
-	if (shell->priv->party_mode) {
-		return TRUE;
-	}
-
-	rb_shell_quit (shell, NULL);
-
-	return TRUE;
-}
-
-static gboolean
-rb_shell_key_press_event_cb (GtkWidget *win,
-			     GdkEventKey *event,
-			     RBShell *shell)
-{
-#ifndef HAVE_MMKEYS
-	return FALSE;
-#else
-
-	gboolean retval = TRUE;
-
-	switch (event->keyval) {
-	case XF86XK_Back:
-		rb_shell_player_do_previous (shell->priv->player_shell, NULL);
-		break;
-	case XF86XK_Forward:
-		rb_shell_player_do_next (shell->priv->player_shell, NULL);
-		break;
-	default:
-		retval = FALSE;
-	}
-
-	return retval;
-#endif /* !HAVE_MMKEYS */
-}
-
-static void
-rb_shell_sync_window_state (RBShell *shell,
-			    gboolean dont_maximise)
-{
-	GdkGeometry hints;
-	int x, y;
-
-	rb_profile_start ("syncing window state");
-
-	if (g_settings_get_boolean (shell->priv->settings, "small-display")) {
-		int width;
-
-		width = g_settings_get_int (shell->priv->settings, "small-width");
-		hints.min_height = -1;
-		hints.min_width = -1;
-		hints.max_height = -1;
-		hints.max_width = 3000;
-		gtk_window_set_default_size (GTK_WINDOW (shell->priv->window), width, 0);
-		gtk_window_resize (GTK_WINDOW (shell->priv->window), width, 1);
-		gtk_window_set_geometry_hints (GTK_WINDOW (shell->priv->window),
-						NULL,
-						&hints,
-						GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
-		gtk_window_unmaximize (GTK_WINDOW (shell->priv->window));
-		rb_debug ("syncing small window width to %d", width);
-	} else {
-		int width, height;
-		if (!dont_maximise) {
-			if (g_settings_get_boolean (shell->priv->settings, "maximized"))
-				gtk_window_maximize (GTK_WINDOW (shell->priv->window));
-			else
-				gtk_window_unmaximize (GTK_WINDOW (shell->priv->window));
-		}
-
-		g_settings_get (shell->priv->settings, "size", "(ii)", &width, &height);
-
-		gtk_window_set_default_size (GTK_WINDOW (shell->priv->window), width, height);
-		gtk_window_resize (GTK_WINDOW (shell->priv->window), width, height);
-		gtk_window_set_geometry_hints (GTK_WINDOW (shell->priv->window),
-						NULL,
-						&hints,
-						0);
-	}
-
-	g_settings_get (shell->priv->settings, "position", "(ii)", &x, &y);
-	gtk_window_move (GTK_WINDOW (shell->priv->window), x, y);
-	rb_profile_end ("syncing window state");
-}
-
-static void
-display_page_selected_cb (RBDisplayPageTree *display_page_tree,
-			  RBDisplayPage *page,
-			  RBShell *shell)
-{
-	rb_debug ("page selected");
-	rb_shell_select_page (shell, page);
-}
-
-gboolean
-rb_shell_activate_source (RBShell *shell, RBSource *source, guint play, GError **error)
-{
-	RhythmDBEntry *entry;
-	/* FIXME
-	 *
-	 * this doesn't work correctly yet, but it's still an improvement on the
-	 * previous behaviour.
-	 *
-	 * with crossfading enabled, this fades out the current song, but
-	 * doesn't start the new one.
-	 */
-
-	/* Select the new one, and optionally start it playing */
-	rb_shell_select_page (shell, RB_DISPLAY_PAGE (source));
-
-	switch (play) {
-	case RB_SHELL_ACTIVATION_SELECT:
-		return TRUE;
-
-	case RB_SHELL_ACTIVATION_PLAY:
-		entry = rb_shell_player_get_playing_entry (shell->priv->player_shell);
-		if (entry != NULL) {
-			rhythmdb_entry_unref (entry);
-			return TRUE;
-		}
-		/* fall through */
-	case RB_SHELL_ACTIVATION_ALWAYS_PLAY:
-		rb_shell_player_set_playing_source (shell->priv->player_shell, source);
-		return rb_shell_player_playpause (shell->priv->player_shell, FALSE, error);
-
-	default:
-		return FALSE;
-	}
-}
-
-static void
-rb_shell_db_save_error_cb (RhythmDB *db,
-			   const char *uri, const GError *error,
-			   RBShell *shell)
-{
-	rb_error_dialog (GTK_WINDOW (shell->priv->window),
-			 _("Error while saving song information"),
-			 "%s", error->message);
-}
-
-/**
- * rb_shell_get_source_by_entry_type:
- * @shell: the #RBShell
- * @type: entry type for which to find a source
- *
- * Looks up and returns the source that owns entries of the specified
- * type.
- *
- * Return value: (transfer none): source instance, if any
- */
-RBSource *
-rb_shell_get_source_by_entry_type (RBShell *shell,
-				   RhythmDBEntryType *type)
-{
-	return g_hash_table_lookup (shell->priv->sources_hash, type);
-}
-
-/**
- * rb_shell_register_entry_type_for_source:
- * @shell: the #RBShell
- * @source: the #RBSource to register
- * @type: the #RhythmDBEntryType to register for
- *
- * Registers a source as the owner of entries of the specified type.
- * The main effect of this is that calling #rb_shell_get_source_by_entry_type
- * with the same entry type will return the source.  A source should only
- * be registered as the owner of a single entry type.
- */
-void
-rb_shell_register_entry_type_for_source (RBShell *shell,
-					 RBSource *source,
-					 RhythmDBEntryType *type)
-{
-	if (shell->priv->sources_hash == NULL) {
-		shell->priv->sources_hash = g_hash_table_new (g_direct_hash,
-							      g_direct_equal);
-	}
-	g_assert (g_hash_table_lookup (shell->priv->sources_hash, type) == NULL);
-	g_hash_table_insert (shell->priv->sources_hash, type, source);
-}
-
-/**
- * rb_shell_append_display_page:
- * @shell: the #RBShell
- * @page: the new #RBDisplayPage
- * @parent: (allow-none): the parent page for the new page
- *
- * Adds a new display page to the shell.
- */
-void
-rb_shell_append_display_page (RBShell *shell, RBDisplayPage *page, RBDisplayPage *parent)
-{
-	if (RB_IS_SOURCE (page)) {
-		shell->priv->sources = g_list_append (shell->priv->sources, RB_SOURCE (page));
-	}
-
-	g_signal_connect_object (G_OBJECT (page), "deleted",
-				 G_CALLBACK (rb_shell_display_page_deleted_cb), shell, 0);
-
-	gtk_notebook_append_page (GTK_NOTEBOOK (shell->priv->notebook),
-				  GTK_WIDGET (page),
-				  gtk_label_new (""));
-	gtk_widget_show (GTK_WIDGET (page));
-
-	rb_display_page_model_add_page (shell->priv->display_page_model, page, parent);
-}
-
-static void
-rb_shell_playlist_added_cb (RBPlaylistManager *mgr,
-			    RBSource *source,
-			    RBShell *shell)
-{
-	rb_shell_append_display_page (shell, RB_DISPLAY_PAGE (source), RB_DISPLAY_PAGE_GROUP_PLAYLISTS);
-}
-
-static void
-rb_shell_playlist_created_cb (RBPlaylistManager *mgr,
-			      RBSource *source,
-			      RBShell *shell)
-{
-	g_settings_set_boolean (shell->priv->settings, "small-display", FALSE);
-	g_settings_set_boolean (shell->priv->settings, "display-page-tree-visible", TRUE);
-
-	rb_shell_sync_window_state (shell, FALSE);
-}
-
-static void
-rb_shell_medium_added_cb (RBRemovableMediaManager *mgr,
-			  RBSource *source,
-			  RBShell *shell)
-{
-	rb_shell_append_display_page (shell, RB_DISPLAY_PAGE (source), RB_DISPLAY_PAGE_GROUP_DEVICES);
-}
-
-static void
-rb_shell_display_page_deleted_cb (RBDisplayPage *page, RBShell *shell)
-{
-
-	rb_debug ("display page deleted");
-
-	if (RB_IS_SOURCE (page)) {
-		RhythmDBEntryType *entry_type;
-		RBSource *source = RB_SOURCE (page);
-
-		/* remove from the map if the source owns the type */
-		g_object_get (source, "entry-type", &entry_type, NULL);
-		if (rb_shell_get_source_by_entry_type (shell, entry_type) == source) {
-			g_hash_table_remove (shell->priv->sources_hash, entry_type);
-		}
-		g_object_unref (entry_type);
-
-		if (source == rb_shell_player_get_playing_source (shell->priv->player_shell) ||
-		    source == rb_shell_player_get_active_source (shell->priv->player_shell)) {
-			rb_shell_player_stop (shell->priv->player_shell);
-		}
-
-		shell->priv->sources = g_list_remove (shell->priv->sources, source);
-	}
-
-	if (page == shell->priv->selected_page) {
-		if (page != RB_DISPLAY_PAGE (shell->priv->library_source)) {
-			rb_shell_select_page (shell, RB_DISPLAY_PAGE (shell->priv->library_source));
-		} else {
-			rb_shell_select_page (shell, NULL);
-		}
-	}
-
-	rb_display_page_model_remove_page (shell->priv->display_page_model, page);
-	gtk_notebook_remove_page (GTK_NOTEBOOK (shell->priv->notebook),
-				  gtk_notebook_page_num (GTK_NOTEBOOK (shell->priv->notebook),
-							 GTK_WIDGET (page)));
-}
-
-static void
-rb_shell_playing_source_changed_cb (RBShellPlayer *player,
-				    RBSource *source,
-				    RBShell *shell)
-{
-	rb_debug ("playing source changed");
-	if (source != RB_SOURCE (shell->priv->queue_source)) {
-		rb_display_page_model_set_playing_source (shell->priv->display_page_model, RB_DISPLAY_PAGE (source));
-	}
-}
-
-static void
-rb_shell_playing_from_queue_cb (RBShellPlayer *player,
-				GParamSpec *param,
-				RBShell *shell)
-{
-	gboolean from_queue;
-
-	g_object_get (player, "playing-from-queue", &from_queue, NULL);
-	if (!g_settings_get_boolean (shell->priv->settings, "queue-as-sidebar")) {
-		RBSource *source;
-		source = rb_shell_player_get_playing_source (shell->priv->player_shell);
-		rb_display_page_model_set_playing_source (shell->priv->display_page_model, RB_DISPLAY_PAGE (source));
-	} else {
-		RBSource *source;
-		RhythmDBEntry *entry;
-		RhythmDBEntryType *entry_type;
-
-		/* if playing from the queue, show the playing entry as playing in the
-		 * registered source for its type, so it makes sense when 'jump to current'
-		 * jumps to it there.
-		 */
-		entry = rb_shell_player_get_playing_entry (shell->priv->player_shell);
-		if (entry == NULL)
-			return;
-
-		entry_type = rhythmdb_entry_get_entry_type (entry);
-		source = rb_shell_get_source_by_entry_type (shell, entry_type);
-		if (source != NULL) {
-			RBEntryViewState state;
-			RBEntryView *songs;
-
-			songs = rb_source_get_entry_view (source);
-			if (songs != NULL) {
-				state = from_queue ? RB_ENTRY_VIEW_PLAYING : RB_ENTRY_VIEW_NOT_PLAYING;
-				rb_entry_view_set_state (songs, state);
-			}
-		}
-		rhythmdb_entry_unref (entry);
-
-		source = rb_shell_player_get_active_source (shell->priv->player_shell);
-		rb_display_page_model_set_playing_source (shell->priv->display_page_model, RB_DISPLAY_PAGE (source));
-	}
-}
-
-static void
-rb_shell_select_page (RBShell *shell, RBDisplayPage *page)
-{
-	int pagenum;
-
-	if (shell->priv->selected_page == page)
-		return;
-
-	rb_debug ("selecting page %p", page);
-
-	if (shell->priv->selected_page) {
-		rb_display_page_deselected (shell->priv->selected_page);
-		gtk_ui_manager_remove_ui (shell->priv->ui_manager, shell->priv->source_ui_merge_id);
-	}
-
-	shell->priv->selected_page = page;
-	rb_display_page_selected (shell->priv->selected_page);
-
-	/* show page */
-	pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (shell->priv->notebook),
-					 GTK_WIDGET (page));
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (shell->priv->notebook), pagenum);
-
-	g_signal_handlers_block_by_func (shell->priv->display_page_tree,
-					 G_CALLBACK (display_page_selected_cb),
-					 shell);
-	rb_display_page_tree_select (shell->priv->display_page_tree, page);
-	g_signal_handlers_unblock_by_func (shell->priv->display_page_tree,
-					   G_CALLBACK (display_page_selected_cb),
-					   shell);
-
-	/* update services */
-	if (RB_IS_SOURCE (page)) {
-		RBSource *source = RB_SOURCE (page);
-		rb_shell_clipboard_set_source (shell->priv->clipboard_shell, source);
-		rb_shell_player_set_selected_source (shell->priv->player_shell, source);
-		g_object_set (shell->priv->playlist_manager, "source", source, NULL);
-		g_object_set (shell->priv->removable_media_manager, "source", source, NULL);
-	} else {
-		rb_shell_clipboard_set_source (shell->priv->clipboard_shell, NULL);
-		rb_shell_player_set_selected_source (shell->priv->player_shell, NULL);	/* ? */
-
-		/* clear playlist-manager:source? */
-		/* clear removable-media-manager:source? */
-	}
-	rb_statusbar_set_page (shell->priv->statusbar, page);
-
-	g_object_notify (G_OBJECT (shell), "selected-page");
-}
-
-static void
-rb_shell_player_window_title_changed_cb (RBShellPlayer *player,
-					 const char *window_title,
-					 RBShell *shell)
-{
-	rb_shell_set_window_title (shell, window_title);
-}
-
-static void
-rb_shell_set_window_title (RBShell *shell,
-			   const char *window_title)
-{
-	if (window_title == NULL) {
-		rb_debug ("clearing title");
-
-		g_free (shell->priv->cached_title);
-		shell->priv->cached_title = NULL;
-
-		gtk_window_set_title (GTK_WINDOW (shell->priv->window),
-				      _("Rhythmbox"));
-	}
-	else {
-		gboolean playing;
-		char *title;
-
-		rb_shell_player_get_playing (shell->priv->player_shell, &playing, NULL);
-
-		if (shell->priv->cached_title &&
-		    !strcmp (shell->priv->cached_title, window_title) &&
-		    playing == shell->priv->cached_playing) {
-			return;
-		}
-		g_free (shell->priv->cached_title);
-		shell->priv->cached_title = g_strdup (window_title);
-		shell->priv->cached_playing = playing;
-
-		rb_debug ("setting title to \"%s\"", window_title);
-		if (!playing) {
-			/* Translators: %s is the song name */
-			title = g_strdup_printf (_("%s (Paused)"), window_title);
-			gtk_window_set_title (GTK_WINDOW (shell->priv->window),
-					      title);
-			g_free (title);
-		} else {
-			gtk_window_set_title (GTK_WINDOW (shell->priv->window),
-					      window_title);
-		}
-	}
-}
-
-static void
-rb_shell_view_smalldisplay_changed_cb (GtkAction *action,
-				       RBShell *shell)
-{
-	GTimeVal time;
-
-	/* don't change more than once per second, it causes weirdness */
-	g_get_current_time (&time);
-	if (time.tv_sec == shell->priv->last_small_time)
-		return;
-
-	shell->priv->last_small_time = time.tv_sec;
-
-	g_settings_set_boolean (shell->priv->settings,
-				"small-display",
-				gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
-}
-
-static void
-rb_shell_view_statusbar_changed_cb (GtkAction *action,
-				    RBShell *shell)
-{
-	g_settings_set_boolean (shell->priv->settings,
-				"statusbar-hidden",
-				!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
-
-	rb_shell_sync_statusbar_visibility (shell);
-}
-
-static void
-rb_shell_view_queue_as_sidebar_changed_cb (GtkAction *action,
-					   RBShell *shell)
-{
-	gboolean queue_as_sidebar = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-	/* maybe use a settings binding? */
-	g_settings_set_boolean (shell->priv->settings,
-				"queue-as-sidebar",
-				queue_as_sidebar);
-
-	if (queue_as_sidebar &&
-	    shell->priv->selected_page == RB_DISPLAY_PAGE (shell->priv->queue_source)) {
-		/* queue no longer exists as a source, so change to the library */
-		rb_shell_select_page (shell, RB_DISPLAY_PAGE (shell->priv->library_source));
-	}
-
-	rb_shell_playing_from_queue_cb (shell->priv->player_shell, NULL, shell);
-
-	rb_shell_sync_pane_visibility (shell);
-}
-
-static void
-rb_shell_view_party_mode_changed_cb (GtkAction *action,
-				     RBShell *shell)
-{
-	shell->priv->party_mode = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-	rb_shell_sync_party_mode (shell);
-}
-
-static void
-rb_shell_cmd_about (GtkAction *action,
-		    RBShell *shell)
-{
-	const char **tem;
-	GString *comment;
-
-	const char *authors[] = {
-		"",
-#include "MAINTAINERS.tab"
-		"",
-		NULL,
-#include "MAINTAINERS.old.tab"
-		"",
-		NULL,
-#include "AUTHORS.tab"
-		NULL
-	};
-
-	const char *documenters[] = {
-#include "DOCUMENTERS.tab"
-		NULL
-	};
-
-	const char *translator_credits = _("translator-credits");
-
-	const char *license[] = {
-		N_("Rhythmbox is free software; you can redistribute it and/or modify\n"
-		   "it under the terms of the GNU General Public License as published by\n"
-		   "the Free Software Foundation; either version 2 of the License, or\n"
-		   "(at your option) any later version.\n"),
-		N_("Rhythmbox is distributed in the hope that it will be useful,\n"
-		   "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-		   "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-		   "GNU General Public License for more details.\n"),
-		N_("You should have received a copy of the GNU General Public License\n"
-		   "along with Rhythmbox; if not, write to the Free Software Foundation, Inc.,\n"
-		   "51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA\n")
-	};
-
-	char *license_trans;
-
-	authors[0] = _("Maintainers:");
-	for (tem = authors; *tem != NULL; tem++)
-		;
-	*tem = _("Former Maintainers:");
-	for (; *tem != NULL; tem++)
-		;
-	*tem = _("Contributors:");
-
-	comment = g_string_new (_("Music management and playback software for GNOME."));
-
-	license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
-				     _(license[2]), "\n", NULL);
-
-	gtk_show_about_dialog (GTK_WINDOW (shell->priv->window),
-			       "version", VERSION,
-			       "copyright", "Copyright \xc2\xa9 2005 - 2009 The Rhythmbox authors\nCopyright \xc2\xa9 2003 - 2005 Colin Walters\nCopyright \xc2\xa9 2002, 2003 Jorn Baayen",
-			       "license", license_trans,
-			       "website-label", _("Rhythmbox Website"),
-			       "website", "http://www.gnome.org/projects/rhythmbox",
-			       "comments", comment->str,
-			       "authors", (const char **) authors,
-			       "documenters", (const char **) documenters,
-			       "translator-credits", strcmp (translator_credits, "translator-credits") != 0 ? translator_credits : NULL,
-			       "logo-icon-name", "rhythmbox",
-			       NULL);
-	g_string_free (comment, TRUE);
-	g_free (license_trans);
-}
-
-/**
- * rb_shell_toggle_visibility:
- * @shell: the #RBShell
- *
- * Toggles the visibility of the main Rhythmbox window.
- */
-void
-rb_shell_toggle_visibility (RBShell *shell)
-{
-	gboolean visible;
-
-	visible = rb_shell_get_visibility (shell);
-
-	rb_shell_set_visibility (shell, FALSE, !visible);
-}
-
-static void
-rb_shell_cmd_quit (GtkAction *action,
-		   RBShell *shell)
-{
-	rb_shell_quit (shell, NULL);
-}
-
-static void
-rb_shell_cmd_contents (GtkAction *action,
-		       RBShell *shell)
-{
-	GError *error = NULL;
-
-	gtk_show_uri (gtk_widget_get_screen (shell->priv->window),
-		      "ghelp:rhythmbox",
-		      gtk_get_current_event_time (),
-		      &error);
-
-	if (error != NULL) {
-		rb_error_dialog (NULL, _("Couldn't display help"),
-				 "%s", error->message);
-		g_error_free (error);
-	}
-}
-
-static void
-rb_shell_cmd_preferences (GtkAction *action,
-		          RBShell *shell)
-{
-	RBShellPreferences *prefs;
-
-	g_object_get (shell, "prefs", &prefs, NULL);
-
-	gtk_window_present (GTK_WINDOW (prefs));
-	g_object_unref (prefs);
-}
-
-static gboolean
-rb_shell_plugins_window_delete_cb (GtkWidget *window,
-				   GdkEventAny *event,
-				   gpointer data)
-{
-	gtk_widget_hide (window);
-
-	return TRUE;
-}
-
-static void
-rb_shell_plugins_response_cb (GtkDialog *dialog,
-			      int response_id,
-			      gpointer data)
-{
-	if (response_id == GTK_RESPONSE_CLOSE)
-		gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
-static void
-rb_shell_cmd_plugins (GtkAction *action,
-		      RBShell *shell)
-{
-	if (shell->priv->plugins == NULL) {
-		GtkWidget *content_area;
-		GtkWidget *manager;
-
-		shell->priv->plugins = gtk_dialog_new_with_buttons (_("Configure Plugins"),
-								    GTK_WINDOW (shell->priv->window),
-								    GTK_DIALOG_DESTROY_WITH_PARENT,
-								    GTK_STOCK_CLOSE,
-								    GTK_RESPONSE_CLOSE,
-								    NULL);
-		content_area = gtk_dialog_get_content_area (GTK_DIALOG (shell->priv->plugins));
-		gtk_container_set_border_width (GTK_CONTAINER (shell->priv->plugins), 5);
-		gtk_box_set_spacing (GTK_BOX (content_area), 2);
-
-		g_signal_connect_object (G_OBJECT (shell->priv->plugins),
-					 "delete_event",
-					 G_CALLBACK (rb_shell_plugins_window_delete_cb),
-					 NULL, 0);
-		g_signal_connect_object (G_OBJECT (shell->priv->plugins),
-					 "response",
-					 G_CALLBACK (rb_shell_plugins_response_cb),
-					 NULL, 0);
-
-		manager = peas_gtk_plugin_manager_new (NULL);
-		gtk_widget_show_all (GTK_WIDGET (manager));
-		gtk_box_pack_start (GTK_BOX (content_area), manager, TRUE, TRUE, 0);
-		gtk_window_set_default_size (GTK_WINDOW (shell->priv->plugins), 600, 400);
-	}
-
-	gtk_window_present (GTK_WINDOW (shell->priv->plugins));
-}
-
-static void
-add_to_library_response_cb (GtkDialog *dialog,
-			    int response_id,
-			    RBShell *shell)
-{
-
-	char *current_dir = NULL;
-	GSList *uri_list = NULL, *uris = NULL;
-	GSettings *library_settings;
-
-	if (response_id != GTK_RESPONSE_ACCEPT) {
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		return;
-	}
-
-	library_settings = g_settings_new ("org.gnome.rhythmbox.library");
-	current_dir = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog));
-	g_settings_set_string (library_settings, "add-dir", current_dir);
-	g_object_unref (library_settings);
-
-	uri_list = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
-	if (uri_list == NULL) {
-		uri_list = g_slist_prepend (uri_list, g_strdup (current_dir));
-	}
-
-	for (uris = uri_list; uris; uris = uris->next) {
-		rb_shell_load_uri (shell, (char *)uris->data, FALSE, NULL);
-		g_free (uris->data);
-	}
-	g_slist_free (uri_list);
-	g_free (current_dir);
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-
-	if (shell->priv->save_db_id > 0) {
-		g_source_remove (shell->priv->save_db_id);
-	}
-	shell->priv->save_db_id = g_timeout_add_seconds (10, (GSourceFunc) idle_save_rhythmdb, shell);
-}
-
-static void
-set_current_folder_uri (RBShell *shell, GtkWidget *dialog)
-{
-	GSettings *settings;
-	char *dir;
-
-	settings = g_settings_new ("org.gnome.rhythmbox.library");
-	dir = g_settings_get_string (settings, "add-dir");
-	if (dir && dir[0] != '\0') {
-		gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),
-							 dir);
-	}
-	g_free (dir);
-	g_object_unref (settings);
-}
-
-static void
-rb_shell_cmd_add_folder_to_library (GtkAction *action,
-				    RBShell *shell)
-{
-	GtkWidget *dialog;
-
-	dialog = rb_file_chooser_new (_("Import Folder into Library"),
-			              GTK_WINDOW (shell->priv->window),
-				      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-				      FALSE);
-	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-	set_current_folder_uri (shell, dialog);
-
-	g_signal_connect_object (G_OBJECT (dialog),
-				 "response",
-				 G_CALLBACK (add_to_library_response_cb),
-				 shell, 0);
-}
-
-static void
-rb_shell_cmd_add_file_to_library (GtkAction *action,
-				  RBShell *shell)
-{
-	GtkWidget *dialog;
-
-	dialog = rb_file_chooser_new (_("Import File into Library"),
-			              GTK_WINDOW (shell->priv->window),
-				      GTK_FILE_CHOOSER_ACTION_OPEN,
-				      FALSE);
-	gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
-	set_current_folder_uri (shell, dialog);
-
-	g_signal_connect_object (G_OBJECT (dialog),
-				 "response",
-				 G_CALLBACK (add_to_library_response_cb),
-				 shell, 0);
-}
-
-static gboolean
-quit_timeout (gpointer dummy)
-{
-	GDK_THREADS_ENTER ();
-	rb_debug ("quit damn you");
-	gtk_main_quit ();
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
-/**
- * rb_shell_quit:
- * @shell: the #RBShell
- * @error: not used
- *
- * Begins the process of shutting down Rhythmbox.  This function will
- * return.  The error parameter and return value only exist because this
- * function is part of the DBus interface.
- *
- * Return value: not important
- */
-gboolean
-rb_shell_quit (RBShell *shell,
-	       GError **error)
-{
-	rb_debug ("Quitting");
-
-	/* Stop the playing source, if any */
-	rb_shell_player_stop (shell->priv->player_shell);
-
-	rb_podcast_manager_shutdown (shell->priv->podcast_manager);
-
-	rb_shell_shutdown (shell);
-	rb_shell_sync_state (shell);
-
-	g_application_release (G_APPLICATION (shell));
-
-	g_timeout_add_seconds (10, quit_timeout, NULL);
-	return TRUE;
-}
-
-static gboolean
-idle_handle_load_complete (RBShell *shell)
-{
-	gboolean loaded, scanned;
-	GDK_THREADS_ENTER ();
-
-	rb_debug ("load complete");
-
-	rb_playlist_manager_load_playlists (shell->priv->playlist_manager);
-	rb_display_page_group_loaded (RB_DISPLAY_PAGE_GROUP (RB_DISPLAY_PAGE_GROUP_PLAYLISTS));
-	shell->priv->load_complete = TRUE;
-	shell->priv->save_playlist_id = g_timeout_add_seconds (10, (GSourceFunc) idle_save_playlist_manager, shell);
-
-	if (shell->priv->no_registration == FALSE) {
-		g_variant_get (g_action_group_get_action_state (G_ACTION_GROUP (shell), "LoadURI"), "(bb)", &loaded, &scanned);
-		g_action_group_change_action_state (G_ACTION_GROUP (shell), "LoadURI", g_variant_new ("(bb)", TRUE, scanned));
-		emit_action_state_update (shell, "LoadURI");
-	}
-
-	rhythmdb_start_action_thread (shell->priv->db);
-
-	GDK_THREADS_LEAVE ();
-
-	return FALSE;
-}
-
-static void
-rb_shell_load_complete_cb (RhythmDB *db,
-			   RBShell *shell)
-{
-	g_idle_add ((GSourceFunc) idle_handle_load_complete, shell);
-}
-
-static void
-rb_shell_sync_pane_visibility (RBShell *shell)
-{
-	GtkAction *action;
-	gboolean queue_as_sidebar = g_settings_get_boolean (shell->priv->settings, "queue-as-sidebar");
-
-	if (shell->priv->queue_source != NULL) {
-		g_object_set (shell->priv->queue_source, "visibility", !queue_as_sidebar, NULL);
-	}
-
-	if (queue_as_sidebar) {
-		gtk_widget_show (shell->priv->queue_sidebar);
-	} else {
-		gtk_widget_hide (shell->priv->queue_sidebar);
-	}
-
-	action = gtk_action_group_get_action (shell->priv->actiongroup,
-					      "ViewQueueAsSidebar");
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), queue_as_sidebar);
-}
-
-static void
-rb_shell_sync_toolbar_state (RBShell *shell)
-{
-	GtkWidget *toolbar;
-	guint toolbar_style;
-
-	toolbar = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/ToolBar");
-
-	/* icons-only in small mode */
-	if (g_settings_get_boolean (shell->priv->settings, "small-display"))
-		toolbar_style = 3;
-	else
-		toolbar_style = g_settings_get_int (shell->priv->settings, "toolbar-style");
-
-	switch (toolbar_style) {
-	case 0:
-		/* default*/
-		gtk_toolbar_unset_style (GTK_TOOLBAR (toolbar));
-		break;
-	case 1:
-		/* text below icons */
-		gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH);
-		break;
-	case 2:
-		/* text beside icons */
-		gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
-		break;
-	case 3:
-		/* icons only */
-		gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
-		break;
-	case 4:
-		/* text only */
-		gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_TEXT);
-		break;
-	default:
-		g_warning ("unknown toolbar style type");
-		gtk_toolbar_unset_style (GTK_TOOLBAR (toolbar));
-	}
-}
-
-static gboolean
-window_state_event_cb (GtkWidget           *widget,
-		       GdkEventWindowState *event,
-		       RBShell             *shell)
-{
-	if (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED) {
-		rb_shell_present (shell, gtk_get_current_event_time (), NULL);
-	}
-
-	return TRUE;
-}
-
-static void
-rb_shell_sync_party_mode (RBShell *shell)
-{
-	GtkAction *action;
-
-	/* party mode does not use gsettings as a model since it
-	   should not be persistent */
-
-	/* disable/enable quit action */
-	action = gtk_action_group_get_action (shell->priv->actiongroup, "MusicQuit");
-	g_object_set (action, "sensitive", !shell->priv->party_mode, NULL);
-	action = gtk_action_group_get_action (shell->priv->actiongroup, "ViewSmallDisplay");
-	g_object_set (action, "sensitive", !shell->priv->party_mode, NULL);
-
-	/* show/hide queue as sidebar ? */
-
-	g_object_set (shell->priv->player_shell, "queue-only", shell->priv->party_mode, NULL);
-
-	/* Set playlist manager source to the current source to update properties */
-	if (shell->priv->selected_page && RB_IS_SOURCE (shell->priv->selected_page)) {
-		RBSource *source = RB_SOURCE (shell->priv->selected_page);
-		g_object_set (shell->priv->playlist_manager, "source", source, NULL);
-		rb_shell_clipboard_set_source (shell->priv->clipboard_shell, source);
-	}
-
-	gtk_window_set_keep_above (GTK_WINDOW (shell->priv->window), shell->priv->party_mode);
-	if (shell->priv->party_mode) {
-		gtk_window_fullscreen (GTK_WINDOW (shell->priv->window));
-		gtk_window_stick (GTK_WINDOW (shell->priv->window));
-		g_signal_connect (shell->priv->window, "window-state-event", G_CALLBACK (window_state_event_cb), shell);
-	} else {
-		gtk_window_unstick (GTK_WINDOW (shell->priv->window));
-		gtk_window_unfullscreen (GTK_WINDOW (shell->priv->window));
-		g_signal_handlers_disconnect_by_func (shell->priv->window, window_state_event_cb, shell);
-	}
-}
-
-static void
-rb_shell_sync_smalldisplay (RBShell *shell)
-{
-	GtkAction *action;
-	GtkAction *queue_action;
-	GtkAction *party_mode_action;
-	GtkAction *jump_to_playing_action;
-
-	rb_shell_sync_window_state (shell, FALSE);
-
-	action = gtk_action_group_get_action (shell->priv->actiongroup,
-					      "ViewSidePane");
-	queue_action = gtk_action_group_get_action (shell->priv->actiongroup,
-						    "ViewQueueAsSidebar");
-	party_mode_action = gtk_action_group_get_action (shell->priv->actiongroup,
-							 "ViewPartyMode");
-	jump_to_playing_action = gtk_action_group_get_action (shell->priv->actiongroup,
-							      "ViewJumpToPlaying");
-
-	if (g_settings_get_boolean (shell->priv->settings, "small-display")) {
-		g_object_set (action, "sensitive", FALSE, NULL);
-		g_object_set (queue_action, "sensitive", FALSE, NULL);
-		g_object_set (party_mode_action, "sensitive", FALSE, NULL);
-		g_object_set (jump_to_playing_action, "sensitive", FALSE, NULL);
-
-		gtk_widget_hide (GTK_WIDGET (shell->priv->paned));
-	} else {
-		RhythmDBEntry *playing;
-
-		g_object_set (action, "sensitive", TRUE, NULL);
-		g_object_set (queue_action, "sensitive", TRUE, NULL);
-		g_object_set (party_mode_action, "sensitive", TRUE, NULL);
-
-		playing = rb_shell_player_get_playing_entry (shell->priv->player_shell);
-		g_object_set (jump_to_playing_action, "sensitive", playing != NULL, NULL);
-		if (playing)
-			rhythmdb_entry_unref (playing);
-
-		gtk_widget_show (GTK_WIDGET (shell->priv->paned));
-	}
-	rb_shell_sync_statusbar_visibility (shell);
-	rb_shell_sync_toolbar_state (shell);
-
-	action = gtk_action_group_get_action (shell->priv->actiongroup,
-					      "ViewSmallDisplay");
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-				      g_settings_get_boolean (shell->priv->settings, "small-display"));
-}
-
-static void
-rb_shell_sync_statusbar_visibility (RBShell *shell)
-{
-	gboolean visible;
-	GtkAction *action;
-
-	visible = !g_settings_get_boolean (shell->priv->settings, "statusbar-hidden");
-
-	action = gtk_action_group_get_action (shell->priv->actiongroup, "ViewStatusbar");
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), visible);
-
-	gtk_widget_set_visible (GTK_WIDGET (shell->priv->statusbar),
-				visible && !g_settings_get_boolean (shell->priv->settings, "small-display"));
-}
-
-static void
-settings_changed_cb (GSettings *settings, const char *key, RBShell *shell)
-{
-	if (g_strcmp0 (key, "toolbar-style") == 0) {
-		rb_debug ("toolbar state changed");
-		rb_shell_sync_toolbar_state (shell);
-	} else if (g_strcmp0 (key, "small-display") == 0) {
-		rb_debug ("small display mode changed");
-		rb_shell_sync_smalldisplay (shell);
-	}
-}
-
-static void
-rb_shell_sync_paned (RBShell *shell)
-{
-	gtk_paned_set_position (GTK_PANED (shell->priv->right_paned),
-				g_settings_get_int (shell->priv->settings, "right-paned-position"));
-	gtk_paned_set_position (GTK_PANED (shell->priv->paned),
-				g_settings_get_int (shell->priv->settings, "paned-position"));
-	gtk_paned_set_position (GTK_PANED (shell->priv->queue_paned),
-				g_settings_get_int (shell->priv->settings, "display-page-tree-height"));
-}
-
-static void
-paned_size_allocate_cb (GtkWidget *widget,
-			GtkAllocation *allocation,
-		        RBShell *shell)
-{
-	rb_settings_delayed_sync (shell->priv->settings,
-				  (RBDelayedSyncFunc) sync_window_settings,
-				  g_object_ref (shell),
-				  g_object_unref);
-}
-
-static void
-display_page_tree_drag_received_cb (RBDisplayPageTree *display_page_tree,
-				    RBDisplayPage *page,
-				    GtkSelectionData *data,
-				    RBShell *shell)
-{
-        if (page == NULL) {
-		RBSource *source;
-		source = rb_playlist_manager_new_playlist_from_selection_data (shell->priv->playlist_manager,
-									       data);
-		page = RB_DISPLAY_PAGE (source);
-        }
-
-        if (page != NULL) {
-                rb_display_page_receive_drag (page, data);
-        }
-
-}
-
-static void
-rb_shell_cmd_current_song (GtkAction *action,
-			   RBShell *shell)
-{
-	rb_debug ("current song");
-
-	rb_shell_jump_to_current (shell);
-}
-
-static void
-rb_shell_cmd_view_all (GtkAction *action,
-		       RBShell *shell)
-{
-	if (RB_IS_SOURCE (shell->priv->selected_page)) {
-		RBSource *source = RB_SOURCE (shell->priv->selected_page);
-		rb_debug ("view all");
-
-		rb_source_reset_filters (source);
-	}
-}
-
-static void
-rb_shell_jump_to_entry_with_source (RBShell *shell,
-				    RBSource *source,
-				    RhythmDBEntry *entry)
-{
-	RBEntryView *songs;
-
-	g_return_if_fail (entry != NULL);
-
-	if ((source == RB_SOURCE (shell->priv->queue_source) &&
-	     g_settings_get_boolean (shell->priv->settings, "queue-as-sidebar")) ||
-	     source == NULL) {
-		RhythmDBEntryType *entry_type;
-		entry_type = rhythmdb_entry_get_entry_type (entry);
-		source = rb_shell_get_source_by_entry_type (shell, entry_type);
-	}
-	if (source == NULL)
-		return;
-
-	songs = rb_source_get_entry_view (source);
-	rb_shell_select_page (shell, RB_DISPLAY_PAGE (source));
-
-	if (songs != NULL) {
-		rb_entry_view_scroll_to_entry (songs, entry);
-		rb_entry_view_select_entry (songs, entry);
-	}
-}
-
-static void
-rb_shell_play_entry (RBShell *shell,
-		     RhythmDBEntry *entry)
-{
-	rb_shell_player_stop (shell->priv->player_shell);
-	rb_shell_jump_to_entry_with_source (shell, NULL, entry);
-	rb_shell_player_play_entry (shell->priv->player_shell, entry, NULL);
-}
-
-static void
-rb_shell_jump_to_current (RBShell *shell)
-{
-	RBSource *source;
-	RhythmDBEntry *playing;
-
-	source = rb_shell_player_get_playing_source (shell->priv->player_shell);
-
-	g_return_if_fail (source != NULL);
-
-	playing = rb_shell_player_get_playing_entry (shell->priv->player_shell);
-
-	rb_shell_jump_to_entry_with_source (shell, source, playing);
-	rhythmdb_entry_unref (playing);
-}
-
-void
-rb_shell_notify_custom (RBShell *shell,
-			guint timeout,
-			const char *primary,
-			const char *secondary,
-			const char *image_uri,
-			gboolean requested)
-{
-	g_signal_emit (shell, rb_shell_signals[NOTIFY_CUSTOM], 0, timeout, primary, secondary, image_uri, requested);
-}
-
-/**
- * rb_shell_do_notify:
- * @shell: the #RBShell
- * @requested: if %TRUE, the notification was requested by some explicit user action
- * @error: not used
- *
- * Displays a notification of the current playing track.
- *
- * Return value: not important
- */
-gboolean
-rb_shell_do_notify (RBShell *shell, gboolean requested, GError **error)
-{
-	g_signal_emit (shell, rb_shell_signals[NOTIFY_PLAYING_ENTRY], 0, requested);
-	return TRUE;
-}
-
-/**
- * rb_shell_error_quark:
- *
- * Returns the #GQuark used for #RBShell errors
- *
- * Return value: shell error #GQuark
- */
-GQuark
-rb_shell_error_quark (void)
-{
-	static GQuark quark = 0;
-	if (!quark)
-		quark = g_quark_from_static_string ("rb_shell_error");
-
-	return quark;
-}
-
-static void
-session_save_state_cb (EggSMClient *client,
-		       GKeyFile *key_file,
-		       RBShell *shell)
-{
-	rb_debug ("session save-state");
-	rb_shell_sync_state (shell);
-}
-
-static void
-session_quit_cb (EggSMClient *client,
-		 RBShell *shell)
-{
-	rb_debug ("session quit");
-	rb_shell_quit (shell, NULL);
-}
-
-static void
-rb_shell_session_init (RBShell *shell)
-{
-	EggSMClient *sm_client;
-
-	sm_client = egg_sm_client_get ();
-	g_signal_connect (sm_client, "save-state", G_CALLBACK (session_save_state_cb), shell);
-	g_signal_connect (sm_client, "quit", G_CALLBACK (session_quit_cb), shell);
-}
-
-/**
- * rb_shell_guess_source_for_uri:
- * @shell: the #RBSource
- * @uri: the URI to guess a source for
- *
- * Attempts to locate the source that should handle the specified URI.
- * This iterates through all sources, calling #rb_source_want_uri,
- * returning the source that returns the highest value.
- *
- * Return value: (transfer none): the most appropriate #RBSource for the uri
- */
-RBSource *
-rb_shell_guess_source_for_uri (RBShell *shell,
-			       const char *uri)
-{
-	GList *t;
-	RBSource *best = NULL;
-	guint strength = 0;
-
-	for (t = shell->priv->sources; t != NULL; t = t->next) {
-		guint s;
-		RBSource *source;
-
-		source = (RBSource *)t->data;
-		s = rb_source_want_uri (source, uri);
-		if (s > strength) {
-			gchar *name;
-
-			g_object_get (source, "name", &name, NULL);
-			rb_debug ("source %s returned strength %u for uri %s",
-				  name, s, uri);
-			g_free (name);
-
-			strength = s;
-			best = source;
-		}
-	}
-
-	return best;
-}
-
-/* Load a URI representing an element of the given type, with
- * optional metadata
- */
-/**
- * rb_shell_add_uri:
- * @shell: the #RBShell
- * @uri: the URI to add
- * @title: optional title value for the URI
- * @genre: optional genre value for the URI
- * @error: returns error information
- *
- * Adds the specified URI to the Rhythmbox database.  Whether the
- * title and genre specified are actually used is up to the source
- * that handles the URI
- *
- * Return value: TRUE if the URI was added successfully
- */
-gboolean
-rb_shell_add_uri (RBShell *shell,
-		  const char *uri,
-		  const char *title,
-		  const char *genre,
-		  GError **error)
-{
-	RBSource *source;
-
-	source = rb_shell_guess_source_for_uri (shell, uri);
-	if (source == NULL) {
-		g_set_error (error,
-			     RB_SHELL_ERROR,
-			     RB_SHELL_ERROR_NO_SOURCE_FOR_URI,
-			     _("No registered source can handle URI %s"),
-			     uri);
-		return FALSE;
-	}
-
-	rb_source_add_uri (source, uri, title, genre, NULL, NULL, NULL);
-	return TRUE;
-}
-
-typedef struct {
-	RBShell *shell;
-	char *uri;
-	gboolean play;
-	RBSource *playlist_source;
-	gboolean can_use_playlist;
-	gboolean source_is_entry;
-} PlaylistParseData;
-
-static void
-handle_playlist_entry_cb (TotemPlParser *playlist,
-			  const char *uri,
-			  GHashTable *metadata,
-			  PlaylistParseData *data)
-{
-	RBSource *source;
-
-	/*
-	 * Track whether the same playlist-handling source
-	 * wants all the URIs from the playlist; if it does,
-	 * then we'll just give the playlist URI to the source.
-	 */
-	if (data->can_use_playlist == FALSE)
-		return;
-
-	source = rb_shell_guess_source_for_uri (data->shell, uri);
-	if (data->playlist_source == NULL) {
-		if (source != NULL && rb_source_try_playlist (source)) {
-			data->playlist_source = RB_SOURCE (g_object_ref (source));
-			data->source_is_entry = rb_source_uri_is_source (source, uri);
-		} else {
-			data->can_use_playlist = FALSE;
-		}
-	} else if (data->playlist_source != source) {
-		g_object_unref (data->playlist_source);
-		data->playlist_source = NULL;
-		data->can_use_playlist = FALSE;
-		data->source_is_entry = FALSE;
-	}
-}
-
-static void
-shell_load_uri_done (RBSource *source, const char *uri, RBShell *shell)
-{
-	RhythmDBEntry *entry;
-
-	entry = rhythmdb_entry_lookup_by_location (shell->priv->db, uri);
-	if (entry) {
-		rb_shell_play_entry (shell, entry);
-	} else {
-		rb_debug ("unable to find entry for uri %s", uri);
-	}
-}
-
-static void
-load_uri_finish (RBShell *shell, RBSource *entry_source, RhythmDBEntry *entry, gboolean play)
-{
-	if (play == FALSE) {
-		rb_debug ("didn't want to do anything anyway");
-	} else if (entry != NULL) {
-		rb_debug ("found an entry to play");
-		rb_shell_play_entry (shell, entry);
-	} else if (entry_source != NULL) {
-		char *name;
-		GError *error = NULL;
-
-		g_object_get (entry_source, "name", &name, NULL);
-		if (rb_shell_activate_source (shell, entry_source, RB_SHELL_ACTIVATION_ALWAYS_PLAY, &error) == FALSE) {
-			rb_debug ("couldn't activate source %s: %s", name, error->message);
-			g_clear_error (&error);
-		} else {
-			rb_debug ("activated source '%s'", name);
-		}
-		g_free (name);
-	} else {
-		rb_debug ("couldn't do anything");
-	}
-}
-
-static void
-load_uri_parser_finished_cb (GObject *parser, GAsyncResult *res, PlaylistParseData *data)
-{
-	TotemPlParserResult result;
-	RBSource *entry_source = NULL;
-	GError *error = NULL;
-
-	result = totem_pl_parser_parse_finish (TOTEM_PL_PARSER (parser), res, &error);
-	g_object_unref (parser);
-
-	if (error != NULL) {
-		rb_debug ("parsing %s as a playlist failed: %s", data->uri, error->message);
-		g_clear_error (&error);
-	} else if (result == TOTEM_PL_PARSER_RESULT_UNHANDLED) {
-		rb_debug ("%s unhandled", data->uri);
-	} else if (result == TOTEM_PL_PARSER_RESULT_IGNORED) {
-		rb_debug ("%s ignored", data->uri);
-	}
-
-	if (result == TOTEM_PL_PARSER_RESULT_SUCCESS) {
-
-		if (data->can_use_playlist && data->playlist_source) {
-			rb_debug ("adding playlist %s to source", data->uri);
-			rb_source_add_uri (data->playlist_source, data->uri, NULL, NULL, NULL, NULL, NULL);
-
-			/* FIXME: We need some way to determine whether the URI as
-			 * given will appear in the db, or whether something else will.
-			 * This hack assumes we'll never add local playlists to the db
-			 * directly.
-			 */
-			if (rb_uri_is_local (data->uri) && (data->source_is_entry == FALSE)) {
-				data->play = FALSE;
-			}
-
-			if (data->source_is_entry != FALSE) {
-				entry_source = data->playlist_source;
-			}
-		} else {
-			rb_debug ("adding %s as a static playlist", data->uri);
-			if (!rb_playlist_manager_parse_file (data->shell->priv->playlist_manager,
-							     data->uri,
-							     &error)) {
-				rb_debug ("unable to parse %s as a static playlist: %s", data->uri, error->message);
-				g_clear_error (&error);
-			}
-			data->play = FALSE;		/* maybe we should play the new playlist? */
-		}
-	} else {
-		RBSource *source;
-
-		source = rb_shell_guess_source_for_uri (data->shell, data->uri);
-		if (source != NULL) {
-			char *name;
-			g_object_get (source, "name", &name, NULL);
-			if (rb_source_uri_is_source (source, data->uri)) {
-				rb_debug ("%s identifies source %s", data->uri, name);
-				entry_source = source;
-			} else if (data->play) {
-				rb_debug ("adding %s to source %s, will play it when it shows up", data->uri, name);
-				rb_source_add_uri (source, data->uri, NULL, NULL, (RBSourceAddCallback) shell_load_uri_done, g_object_ref (data->shell), g_object_unref);
-				data->play = FALSE;