Merge lp:~manishsinha/ubuntu/precise/totem/enable-zeitgeist-datasource into lp:~ubuntu-desktop/totem/ubuntu

[Manish Sinha (मनीष सिन्हा)]

* debian/rules: Enabled vala support
* debian/control: Added valac, libzeitgeist-dev as build-dep and libzeitgeist-1.0-1 as dependency of totem-plugins
* debian/totem-plugins.intall: Added another entry for zeitgeist-dp

Enabled Zeitgeist datasource

Changed made
* Enabled the vala support in debian/rules
* Added an entry in totem-plugins.install
* Updated the respective dependencies in debian/control

[lp:~manishsinha/ubuntu/precise/totem/enable-zeitgeist-datasource]

187. By Manish Sinha (मनीष सिन्हा) on 2011-10-26

Enable zeitgeist-dp vala plugin for totem (LP: #879702)

[Jeremy Bícha (jbicha)]

The ubuntu-desktop branch is packaging only (just the debian/ directory) so you'll need to:
bzr branch lp:~ubuntu-desktop/totem/ubuntu
make your changes
and then repropose for merging. The diff will be quite a bit smaller then.

See also https://wiki.ubuntu.com/DesktopTeam/Bzr And if you have questions (as it's a bit confusing), feel free to ask in #ubuntu-desktop and someone will help you out.

[Sebastien Bacher (seb128)]

Could you update he merge request as requested before?

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Sebastien,
I had proposed merging a wrong to lp:~ubuntu-desktop/totem/ubuntu

I reworked on it and created a new merge proposal
https://code.launchpad.net/~manishsinha/totem/enable-zg-dp-building/+merge/80492
which has now been merged
https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu

Can you please reject this merge proposal. I cannot set it myself

[Sebastien Bacher (seb128)]

sure, done ;-)

Unmerged revisions

187. By Manish Sinha (मनीष सिन्हा) on 2011-10-26

Enable zeitgeist-dp vala plugin for totem (LP: #879702)

186. By Manish Sinha (मनीष सिन्हा) on 2011-10-26

Enable zeitgeist-dp vala plugin for totem

185. By Jeremy Bícha on 2011-10-15

* debian/patches/04_port_to_gobject.patch:
  Port opensubtitles/hash.py also
* debian/patches/90_fix_save_playlist.patch:
  Git patch to fix broken save plugin button (LP: #873719)

184. By Mathieu Trudel-Lapierre on 2011-08-24

* debian/control: backport libtotem-dev from Debian.
* debian/libtotem-dev.install: add install file for libtotem-dev.
* debian/control, debian/totem.install, debian/libtotem-dev.install: move
  /usr/share/gir1.0 to libtotem-dev.

183. By Mathieu Trudel-Lapierre on 2011-08-19

debian/patches/youtube-api-gdata9.patch: fix FTBFS: use the new gdata 0.9
API to interface with Google services for youtube. (LP: #829427)

182. By Steve Langasek on 2011-08-09

* Build-depend on gstreamer0.10-gconf, which is split out now from
  gstreamer0.10-plugins-good.
* python-support is deprecated; migrate to dh_python2.

181. By Sebastien Bacher on 2011-05-23

debian/control.in: build-depends on gtk-doc-tools

180. By Sebastien Bacher on 2011-05-20

* Resynchronize on Debian, remaining diffs:
* debian/control.in:
  - use suggests rather than recommends for universe gstreamer components
  - add totem-plugins-extra for the components which have depends in universe
  - add build-depends on gnome-common, dh-autoreconf,
    liblaunchpad-intrgration-3.0-dev, hardening-wrapper
  - drop build-depends on libepc-ui-dev, python-feedparser, xulrunner-dev,
    libtracker-sparql-0.10-dev
  - add XB-Npp-Description and XB-Npp-Filename header to the
    totem-mozilla package to improve ubufox/ubuntu plugin db integration
  - change refences from Iceweasel to Firefox
  - recommends gnome-icon-theme-symbolic rather than depending on it
  - list firefox as a totem-mozilla recommends before epiphany-browser
  - libtotem replaces totem (<< 3.0.1-1) for ppa upgrades
* debian/totem-common.install:
  - Install apport hook
* debian/totem-plugins-extra.install:
  - Plugins split out ouf totem-plugins
* debian/totem-plugins.install:
  - Move some plugins to totem-plugins-extra
* debian/totem.preinst:
  - No longer required as Lucid has been released
* debian/patches/01_fake_keypresses.patch:
  - dropped it's an old workaround and should not be required
* debian/patches/02_lpi.patch:
  - Launchpad integration
* debian/patches/03_default_options.patch:
  - enable the youtube option by default
* debian/patches/70_bbc_plugin.patch:
  - bbc content viewer, needs to be fixed for the new version
* debian/source_totem.py:
  - ubuntu apport debugging
* debian/rules:
  - run autoreconf on build
* debian/watch:
  - Watch for unstable versions

179. By Omer Akram on 2011-03-15

* debian/patches/74_add_new_playlist_api.patch
  debian/patches/74_use_new_playlist_api.patch:
  - Fix the DnD of files in the playlist sidepane. (LP: #659001)
* debian/patches/74_fix_compile.patch:
  - Fix compiling after the above two patches.
* debian/patches/75_fix_screenshotting_of_interlaced_videos.patch:
  - Take screenshot does not work for some videos. (LP: #705361)

178. By Kees Cook on 2011-02-16

debian/{control{,.in},rules}: enable PIE build for security hardening
(Closes: #613763).

=== added directory '.pc'
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2011-10-26 10:18:23 +0000
@@ -0,0 +1,1 @@
+2

=== added directory '.pc/02_lpi.patch'
=== added file '.pc/02_lpi.patch/configure.in'
--- .pc/02_lpi.patch/configure.in	1970-01-01 00:00:00 +0000
+++ .pc/02_lpi.patch/configure.in	2011-10-26 10:18:23 +0000
@@ -0,0 +1,917 @@
+AC_PREREQ(2.52)
+
+m4_define(totem_version_major, 3)
+m4_define(totem_version_minor, 0)
+m4_define(totem_version_micro, 1)
+
+# The version of the API exposed to plugins
+m4_define(totem_api_version_major, 1)
+m4_define(totem_api_version_minor, 0)
+
+AC_INIT([totem],
+        [totem_version_major.totem_version_minor.totem_version_micro],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=totem])
+
+AM_MAINTAINER_MODE
+AC_CONFIG_SRCDIR([src/totem.c])
+AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip check-news subdir-objects])
+
+# Enable silent build when available (Automake 1.11)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+dnl Add the languages which your application supports to po/LINGUAS
+GETTEXT_PACKAGE=totem
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
+AC_SUBST(GETTEXT_PACKAGE)
+IT_PROG_INTLTOOL([0.40.0])
+
+GNOME_DOC_INIT([0.20.3])
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
+AC_PROG_CXX
+AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+
+PKG_PROG_PKG_CONFIG
+
+AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
+AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+
+# Requirements
+GLIB_REQS=2.27.92
+GIO_REQS=2.27.92
+GTK_REQS=2.99.3
+TOTEM_PLPARSER_REQS=2.32.4
+GNOMEICON_REQS=2.15.90
+DBUS_REQS=0.82
+VALA_REQS=0.11.1
+PEAS_REQS=0.7.2
+PYTHON_REQS=2.3
+PYGOBJECT_REQS=2.27.0
+
+AC_SUBST(GLIB_REQS)
+AC_SUBST(GTK_REQS)
+AC_SUBST(TOTEM_PLPARSER_REQS)
+
+TOTEM_VERSION_MAJOR=totem_version_major
+TOTEM_VERSION_MINOR=totem_version_minor
+TOTEM_VERSION_MICRO=totem_version_micro
+AC_SUBST(TOTEM_VERSION_MAJOR)
+AC_SUBST(TOTEM_VERSION_MINOR)
+AC_SUBST(TOTEM_VERSION_MICRO)
+
+TOTEM_API_VERSION=totem_api_version_major.totem_api_version_minor
+AC_SUBST(TOTEM_API_VERSION)
+AC_DEFINE_UNQUOTED(TOTEM_API_VERSION, ["$TOTEM_API_VERSION"], [Define to the Totem plugin API version])
+
+# The full list of plugins
+allowed_plugins="bemused brasero-disc-recorder chapters coherence_upnp dbus-service im-status gromit iplayer jamendo lirc media-player-keys ontop opensubtitles properties publish pythonconsole save-file sample-python sample-vala screensaver screenshot sidebar-test skipto thumbnail tracker youtube zeitgeist-dp"
+
+PLUGINDIR='${libdir}/totem/plugins'
+AC_SUBST(PLUGINDIR)
+
+dnl the two versions here implicate the gstreamer core and gst-plugins
+dnl release versions.
+GST_MAJORMINOR=0.10
+GST_REQS=0.10.30
+GSTPLUG_REQS=0.10.30
+
+HAVE_GSTREAMER=no
+
+dnl Check for the required GStreamer versions for missing plugins
+dnl installation, unless this has been disabled.
+AC_MSG_CHECKING([whether to enable easy codec installation support])
+AC_ARG_ENABLE([easy-codec-installation],
+	[
+		AS_HELP_STRING([--enable-easy-codec-installation],
+			[Whether to enable easy codec installation support for GStreamer]
+		)
+	], [
+		case "${enableval}" in
+			yes) enable_easy_codec_installation=yes ;;
+			no)  enable_easy_codec_installation=no ;;
+			*) enable_easy_codec_installation=auto ;;
+		esac
+	], [
+		dnl default value
+		enable_easy_codec_installation=auto
+	]
+)
+AC_MSG_RESULT([$enable_easy_codec_installation])
+
+if test "x$enable_easy_codec_installation" != "xno"; then
+	PKG_CHECK_MODULES(MISSING_PLUGINS, gstreamer-plugins-base-0.10,
+	[
+		MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS -lgstpbutils-0.10"
+		AC_DEFINE([ENABLE_MISSING_PLUGIN_INSTALLATION], 1,
+		          [Whether we can and want to do installation of missing plugins])
+	])
+fi
+
+MM="gstreamer-0.10 >= $GST_REQS gstreamer-base-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GSTPLUG_REQS gstreamer-tag-0.10 >= $GSTPLUG_REQS"
+PKG_CHECK_MODULES(GST, $MM)
+GST_LIBS="$GST_LIBS -lgstbase-$GST_MAJORMINOR -lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR -lgsttag-$GST_MAJORMINOR"
+AC_SUBST(GST_LIBS)
+EXTRA_BACKEND_LIBS="-lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR"
+
+dnl Check for required plugins
+gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
+gst010_inspect="$gst010_toolsdir/gst-inspect-0.10"
+
+dnl Give error and exit if we don't have the gst_inspect tool
+AC_MSG_CHECKING([GStreamer 0.10 inspection tool])
+if test -r "$gst010_inspect"; then
+	AC_MSG_RESULT([yes])
+else
+	AC_MSG_RESULT([no])
+	AC_MSG_ERROR([
+		Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'.
+		It should be part of gstreamer-0_10-utils. Please install it.
+	])
+fi
+
+dnl Check for elements from gst-plugins-base
+for base_element in playbin2 ffmpegcolorspace videoscale
+do
+	AC_MSG_CHECKING([GStreamer 0.10 $base_element plugin])
+	if $gst010_inspect $base_element >/dev/null 2>/dev/null; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR([
+			Cannot find required GStreamer-0.10 plugin '$base_element'.
+			It should be part of gst-plugins-base. Please install it.
+		])
+	fi
+done
+
+dnl Check for elements from gst-plugins-good
+for good_element in gconfaudiosink gconfvideosink goom
+do
+	AC_MSG_CHECKING([GStreamer 0.10 $good_element plugin])
+	if $gst010_inspect $good_element >/dev/null 2>/dev/null; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR([
+			Cannot find required GStreamer-0.10 plugin '$good_element'.
+			It should be part of gst-plugins-good. Please install it.
+		])
+	fi
+done
+
+dnl Check the smclient backend
+GDK_TARGET="$($PKG_CONFIG --variable targets gdk-3.0)"
+
+SMCLIENT_PKGS=
+AC_MSG_CHECKING([which smclient backend to use])
+AC_ARG_WITH([smclient],
+  [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
+  [],
+  [case "$GDK_TARGET" in
+    x11) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
+    win32|quartz) with_smclient=$GDK_TARGET ;;
+    *) with_smclient=no ;;
+   esac])
+AC_MSG_RESULT([$with_smclient])
+
+if test "$with_smclient" != "no"; then
+  PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
+  AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+fi
+
+AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
+AM_CONDITIONAL([WITH_SMCLIENT_XSMP],[test "$with_smclient" = "xsmp"])
+AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
+AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
+
+dnl Pkg-config checks
+
+PKG_CHECK_MODULES([DEPENDENCY],[
+  glib-2.0 >= $GLIB_REQS
+  gio-2.0 >= $GIO_REQS
+  gtk+-3.0 >= $GTK_REQS
+  gdk-x11-3.0 >= $GTK_REQS
+  gmodule-2.0
+  totem-plparser >= $TOTEM_PLPARSER_REQS
+  gstreamer-tag-0.10 >= 0.10.26
+  cairo])
+
+PKG_CHECK_MODULES(MM, $MM)
+
+PKG_CHECK_MODULES([GTK],[gtk+-3.0 gthread-2.0])
+GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"
+AC_SUBST(GTK_LIBS)
+
+AC_SUBST([EXTRA_BACKEND_LIBS])
+
+PKG_CHECK_EXISTS([
+  $ISO_CODES
+  gnome-icon-theme >= $GNOMEICON_REQS])
+
+dnl *************************
+dnl X11 related functionality
+dnl *************************
+have_x11=no
+if test x$(pkg-config --variable=targets gtk+-3.0) = xx11; then
+	AC_PATH_X
+
+	have_x11=yes
+
+	if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then
+		X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"`
+	fi
+	if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then
+		X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"`
+	fi
+	CFLAGS="$X_INCLUDES $CFLAGS"
+	LIBS="$X_LIBRARIES $LIBS"
+
+	XTEST_LIBS=""
+	enable_xtest=no
+	AC_CHECK_LIB(Xtst, XTestFakeKeyEvent,
+		XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES"
+		enable_xtest=yes
+		AC_DEFINE(HAVE_XTEST, 1, [defined if you have XTest library]),
+		,
+		$X_LIBRARIES)
+	AC_SUBST(XTEST_LIBS)
+
+	PKG_CHECK_MODULES(XVIDMODE, xrandr >= 1.1.1 xxf86vm >= 1.0.1,
+		have_xvidmode=yes, have_xvidmode=no)
+
+	if test x$have_xvidmode = xyes; then
+		AC_DEFINE(HAVE_XVIDMODE,, [Define this if you have the XVidMode and XRandR extension installed])
+	fi
+
+	X_LIBS=""
+
+	dnl Explicitely link against libX11 to avoid problems with crappy linkers
+	X_LIBS="$X_LIBRARIES -lX11"
+	AC_SUBST(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 X11 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
+fi
+AM_CONDITIONAL(HAVE_XVIDMODE, [test x$have_xvidmode = xyes])
+
+dnl ================================================================
+dnl Plugins support
+dnl ================================================================
+
+PKG_CHECK_MODULES(PEAS, libpeas-1.0 >= $PEAS_REQS)
+PKG_CHECK_MODULES(PEASGTK, libpeas-gtk-1.0 >= $PEAS_REQS)
+
+# ================================================================
+# Python plugins
+# ================================================================
+# We don't need any of this at compile time, but it is needed for the Python plugins at runtime, so we check anyway.
+
+AC_MSG_CHECKING([whether Python plugin support is requested])
+AC_ARG_ENABLE([python],
+	AS_HELP_STRING([--enable-python],[Enable python support]),
+	[enable_python=$enableval],
+	[enable_python=autodetect])
+AC_MSG_RESULT([$enable_python])
+
+have_python=no
+have_pygobject=no
+
+# Test for the Python run time and PyGObject
+if test "x$enable_python" != "xno"; then
+	AM_PATH_PYTHON([$PYTHON_REQS],[have_python=yes],[have_python=no])
+	if test "x$PYTHON" = "x:"; then
+		have_python=no
+	fi
+
+	PKG_CHECK_MODULES([PYGOBJECT],[pygobject-2.0 >= $PYGOBJECT_REQS],[have_pygobject=yes],[have_pygobject=no])
+fi
+
+# Output the results of the Python checks
+if test "x$have_python" != "xyes" -o "x$have_pygobject" != "xyes"; then
+	if test "x$enable_python" = "xyes"; then
+		AC_MSG_ERROR([python >= $PYTHON_REQS or pygobject-2.0 >= $PYGOBJECT_REQS not found])
+	elif test "x$enable_python" = "xautodetect"; then
+		enable_python=no
+		AC_MSG_WARN([python >= $PYTHON_REQS or pygobject-2.0 >= $PYGOBJECT_REQS not found; disabling Python support])
+	fi
+elif test "x$enable_python" != "xno"; then
+	enable_python=yes
+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],
+	[enable_vala=auto])
+AC_MSG_RESULT([$enable_vala])
+if test "x$enable_vala" != "xno"; then
+	AM_PROG_VALAC([$VALA_REQS])
+	if test "x$VALAC" = "x"; then
+		if test "x$enable_vala" = "xyes"; then
+			AC_MSG_ERROR([Vala plugin support explicitly requested, but not found])
+		fi
+		with_vala=no
+	else
+		with_vala=yes
+	fi
+fi
+
+AM_CONDITIONAL(ENABLE_VALA, test "x$with_vala" = "xyes")
+
+# ********************
+# Movie player plugins
+# ********************
+
+plugin_error_or_ignore()
+{
+	if test "${error_on_bad_plugin}" = "1" ; then
+		AC_MSG_ERROR([$1])
+	else
+		AC_MSG_WARN([$1 (disabling plugin)])
+	fi
+}
+
+AC_ARG_WITH([plugins],
+	[AS_HELP_STRING([--with-plugins],[Which Totem plugins to compile (default: auto; "all", "none" and "autodetect" are valid)])],
+	[], [with_plugins=autodetect])
+
+used_plugins=""
+used_plugins2=""
+
+if test "x${with_plugins}" = "xautodetect" ; then
+	# Default to all plugins and just ignore them if they won't compile
+	with_plugins="all"
+	error_on_bad_plugin="0"
+else
+	# Clean up the plugin list and error if a plugin won't compile
+	with_plugins=`echo ,"${with_plugins}", | sed -e 's/[[	,]][[	,]]*/ /g' -e 's/,$//'`
+	error_on_bad_plugin="1"
+fi
+
+# Iterate through the wanted plugins and weed out bad ones (or error)
+for wanted_plugin in ${with_plugins}; do
+	for allowed_plugin in ${allowed_plugins}; do
+		case ${wanted_plugin} in
+			all)
+				# List all plugins as being used
+				used_plugins=${allowed_plugins}
+			;;
+			autodetect)
+				# List all plugins as being used
+				used_plugins=${allowed_plugins}
+			;;
+			none) used_plugins="";; # List no plugins
+			${allowed_plugin}) used_plugins="${used_plugins} ${wanted_plugin}";; # List the plugin
+			*) ;;
+		esac
+	done
+done
+
+# Check for plugin-specific requirements and error if necessary
+for plugin in ${used_plugins}; do
+	add_plugin="1"
+
+	case ${plugin} in
+		coherence_upnp)
+			# The Coherence framework still uses PyGTK, and thus conflicts with the new pygobject introspected bindings
+			plugin_error_or_ignore "the coherence_upnp plugin uses PyGTK and conflicts with the new pygobject bindings"
+			add_plugin="0"
+		;;
+		gromit)
+			if test "${have_x11}" != "yes" ; then
+				plugin_error_or_ignore "the gromit plugin is not supported on non-X11 targets"
+				add_plugin="0"
+			fi
+		;;
+		media-player-keys)
+			PKG_CHECK_MODULES(MEDIA_PLAYER_KEYS, dbus-glib-1,
+				[HAVE_MEDIA_PLAYER_KEYS=yes], [HAVE_MEDIA_PLAYER_KEYS=no])
+			if test "${HAVE_MEDIA_PLAYER_KEYS}" != "yes" ; then
+				plugin_error_or_ignore "you need dbus-glib-1 installed for the media-player-keys plugin"
+				add_plugin="0"
+			fi
+		;;
+		lirc)
+			AC_CHECK_LIB(lirc_client, lirc_init,
+				[AC_CHECK_HEADER(lirc/lirc_client.h,
+				 	[LIRC_LIBS="-llirc_client"
+					 HAVE_LIRC=yes],
+					[
+					 LIRC_LIBS=""
+					 HAVE_LIRC=no])])
+			AC_SUBST(LIRC_LIBS)
+			if test "${HAVE_LIRC}" != "yes" ; then
+				plugin_error_or_ignore "you need lirc_client installed for the lirc plugin"
+				add_plugin="0"
+			fi
+		;;
+		bemused)
+			PKG_CHECK_MODULES(BEMUSED, bluez, [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no])
+			if test "${HAVE_BLUEZ}" != "yes" ; then
+				plugin_error_or_ignore "you need the bluez libraries installed for the Bemused plugin"
+				add_plugin="0"
+			fi
+		;;
+		publish)
+			# FIXME
+			PKG_CHECK_MODULES(LIBEPC, libepc-ui-1.0 >= 0.3.0, [HAVE_LIBEPC=yes], [HAVE_LIBEPC=no])
+			if test "${HAVE_LIBEPC}" != "yes" ; then
+				plugin_error_or_ignore "you need the easy-publish-and-consume library installed for the publish plugin"
+				add_plugin="0"
+			fi
+		;;
+		tracker)
+			PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.10 >= 0.9.34, [HAVE_TRACKER=yes], [HAVE_TRACKER=no])
+			if test "${HAVE_TRACKER}" != "yes" ; then
+				plugin_error_or_ignore "you need the tracker development headers installed for the tracker plugin"
+				add_plugin="0"
+			fi
+		;;
+		sample-vala)
+			if test "${with_vala}" != "yes" ; then
+				plugin_error_or_ignore "you need vala installed to use the sample-vala plugin"
+				add_plugin="0"
+			fi
+		;;
+		thumbnail)
+			PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.15.0,
+				[HAVE_GLIB_2_15=yes], [HAVE_GLIB_2_15=no])
+			if test "${HAVE_GLIB_2_15}" != "yes" ; then
+				plugin_error_or_ignore "you need glib >= 2.15.0 to use the thumbnail plugin"
+				add_plugin="0"
+			fi
+		;;
+		brasero-disc-recorder)
+			dnl this is only needed to use brasero icons
+			PKG_CHECK_MODULES(DISC_RECORDER, libxml-2.0 >= 2.6.0 gtk+-x11-3.0,
+					[BUILD_RECORDER=yes], [BUILD_RECORDER=no])
+			if test "${BUILD_RECORDER}" != "yes" ; then
+				plugin_error_or_ignore "you need libxml-2.0 >= 2.6.0 and gtk+-x11-3.0 to use the brasero-disc-recorder plugin"
+				add_plugin="0"
+			fi
+		;;
+		save-file)
+			dnl the nautilus check should be a run-time check
+			dnl but it might not always be running
+			PKG_CHECK_MODULES(SAVE_FILE_CHECK, gio-2.0 >= 2.26 libnautilus-extension >= 2.91.3,
+					  [BUILD_SAVE_FILE=yes], [BUILD_SAVE_FILE=no])
+			if test "${BUILD_SAVE_FILE}" != "yes" ; then
+				plugin_error_or_ignore "you need gio-2.0 >=2.26 to use the save-file plugin"
+				add_plugin="0"
+			else
+				PKG_CHECK_MODULES(SAVE_FILE, gio-2.0 >= 2.26)
+			fi
+		;;
+		youtube)
+			PKG_CHECK_MODULES(LIBGDATA, libgdata >= 0.4.0 gdk-pixbuf-2.0 >= 2.23.0,
+				[HAVE_LIBGDATA=yes], [HAVE_LIBGDATA=no])
+			if test "${HAVE_LIBGDATA}" != "yes" ; then
+				plugin_error_or_ignore "you need libgdata >= 0.4.0 installed for the YouTube plugin"
+				add_plugin="0"
+			fi
+
+			# For timeout support. Remove this once we depend on libgdata >= 0.7.0
+			PKG_CHECK_MODULES(LIBGDATA_0_7, libgdata >= 0.7.0,
+				[HAVE_LIBGDATA_0_7=yes], [HAVE_LIBGDATA_0_7=no])
+			if test "${HAVE_LIBGDATA_0_7}" = "yes" ; then
+				AC_DEFINE([HAVE_LIBGDATA_0_7],[1],[Define if libgdata >= 0.7.0 is available])
+			fi
+
+			PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4,
+				[HAVE_LIBSOUP=yes], [HAVE_LIBSOUP=no])
+			if test "${HAVE_LIBSOUP}" != "yes" ; then
+				plugin_error_or_ignore "you need libsoup-2.4 installed for the YouTube plugin"
+				add_plugin="0"
+			fi
+
+			dnl We need the souphttpsrc element for the YouTube plugin
+			AC_MSG_CHECKING([GStreamer 0.10 souphttpsrc plugin])
+			if $gst010_inspect souphttpsrc >/dev/null 2>/dev/null; then
+				AC_MSG_RESULT([yes])
+			else
+				AC_MSG_RESULT([no])
+				plugin_error_or_ignore "you need souphttpsrc from gst-plugins-good installed for the YouTube plugin"
+				add_plugin="0"
+			fi
+		;;
+		chapters)
+			PKG_CHECK_MODULES(CHAPTERS, libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0,
+				[BUILD_CHAPTERS=yes], [BUILD_CHAPTERS=no])
+			if test "${BUILD_CHAPTERS}" != "yes" ; then
+				plugin_error_or_ignore "you need gtk+-3.0, glib-2.0 >= 2.15.0 and libxml-2.0 >= 2.6.0 to use the chapters plugin"
+				add_plugin="0"
+			fi
+		;;
+		zeitgeist-dp)
+			if test "${with_vala}" != "yes" ; then
+				plugin_error_or_ignore "you need vala installed to use the zeitgeist-dp plugin"
+				add_plugin="0"
+			else
+				PKG_CHECK_MODULES(LIBZEITGEIST, zeitgeist-1.0 >= 0.3.6,
+				[HAS_LIBZEITGEIST=yes], [HAS_LIBZEITGEIST=no])
+				if test "${HAS_LIBZEITGEIST}" != "yes" ; then
+					plugin_error_or_ignore "you need zeitgeist-1.0 >= 0.3.6 to use the zeitgeist-dp plugin"
+					add_plugin="0"
+				fi
+			fi
+		;;
+	esac
+
+	# Add the specified plugin
+	if test "${add_plugin}" = "1" ; then
+		used_plugins2="${used_plugins2} ${plugin}"
+	fi
+done
+
+ALL_PLUGINS=$allowed_plugins
+PLUGINS=$used_plugins2
+
+AC_MSG_CHECKING([which plugins to compile])
+AC_MSG_RESULT([$PLUGINS])
+
+AC_SUBST([ALL_PLUGINS])
+AC_SUBST([PLUGINS])
+
+# ***************
+# Browser plugins
+# ***************
+
+AC_MSG_CHECKING([whether to compile the browser plugins])
+
+AC_ARG_ENABLE([browser-plugins],
+	[AS_HELP_STRING([--enable-browser-plugins],[compile the totem browser plugins])],
+	[],[enable_browser_plugins=yes])
+AC_MSG_RESULT([$enable_browser_plugins])
+
+if test "$enable_browser_plugins" = "yes" ; then
+	AC_DEFINE([ENABLE_BROWSER_PLUGINS],[1],[Define to build the browser plugin])
+
+	BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
+	AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
+
+	PKG_CHECK_MODULES([BROWSER_PLUGIN],
+		[glib-2.0
+		 gio-2.0
+		 x11
+		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS],
+		[],[enable_browser_plugins=no])
+
+	AC_SUBST([BROWSER_PLUGIN_CFLAGS])
+	AC_SUBST([BROWSER_PLUGIN_LIBS])
+
+	# Earlier versions misdetect playlists
+	PKG_CHECK_EXISTS([shared-mime-info >= 0.22],
+			[],
+			[AC_MSG_ERROR([
+				The Browser plugin requires shared-mime-info
+				>= 0.22 to function.])])
+
+	PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_REQS],,
+			[enable_browser_plugins=no])
+	DBUSLIBDIR="`$PKG_CONFIG dbus-glib-1 --variable=libdir`"
+	DBUSBINDIR="`echo $DBUSLIBDIR | sed -e s/lib/bin/`"
+	AC_PATH_PROG([DBUS_BIND], [dbus-binding-tool], [no], [$DBUSBINDIR:$PATH])
+	if test "x$DBUS_BIND" = "xno"; then
+		AC_MSG_WARN([dbus-binding-tool not found])
+		enable_browser_plugins=no
+	fi
+
+        # check for -fno-rtti flag
+
+	AC_LANG_PUSH([C++])
+	__SAVE_CXXFLAGS=$CXXFLAGS
+	CXXFLAGS="-fno-rtti $CXXFLAGS"
+
+	AC_MSG_CHECKING([for -fno-rtti compiler flag])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[have_no_rtti_flag=yes],[have_no_rtti_flag=no])
+	AC_MSG_RESULT([$have_no_rtti_flag])
+
+	CXXFLAGS=$__SAVE_CXXFLAGS
+	AC_LANG_POP([C++])
+
+	if test "$have_no_rtti_flag" = "yes"; then
+		AM_CXXFLAGS="-fno-rtti $AM_CXXFLAGS"
+	fi
+fi
+
+AM_CONDITIONAL([ENABLE_BROWSER_PLUGINS], [test "$enable_browser_plugins" = "yes"])
+
+# check which plugins to enable
+
+if test "$enable_browser_plugins" = "yes"; then
+
+AC_MSG_CHECKING([whether to enable the GMP browser plugin])
+AC_ARG_ENABLE([gmp-plugin],
+	AS_HELP_STRING([--enable-gmp-plugin],[Whether to enable the GMP browser plugin]),
+	[],[enable_gmp_plugin=yes])
+AC_MSG_RESULT([$enable_gmp_plugin])
+
+AC_MSG_CHECKING([whether to enable the NarrowSpace browser plugin])
+AC_ARG_ENABLE([narrowspace-plugin],
+	AS_HELP_STRING([--enable-narrowspace-plugin],[Whether to enable the NarrowSpace browser plugin]),
+	[],[enable_narrowspace_plugin=yes])
+AC_MSG_RESULT([$enable_narrowspace_plugin])
+
+AC_MSG_CHECKING([whether to enable the MullY browser plugin])
+AC_ARG_ENABLE([mully-plugin],
+	AS_HELP_STRING([--enable-mully-plugin],[Whether to enable the MullY browser plugin]),
+	[],[enable_mully_plugin=yes])
+AC_MSG_RESULT([$enable_mully_plugin])
+
+AC_MSG_CHECKING([whether to enable the Cone browser plugin])
+AC_ARG_ENABLE([cone-plugin],
+	AS_HELP_STRING([--enable-cone-plugin],[Whether to enable the Cone browser plugin]),
+	[],[enable_cone_plugin=yes])
+AC_MSG_RESULT([$enable_cone_plugin])
+
+fi
+
+AM_CONDITIONAL([ENABLE_GMP_PLUGIN],[test "$enable_gmp_plugin" = "yes"])
+AM_CONDITIONAL([ENABLE_NARROWSPACE_PLUGIN],[test "$enable_narrowspace_plugin" = "yes"])
+AM_CONDITIONAL([ENABLE_MULLY_PLUGIN],[test "$enable_mully_plugin" = "yes"])
+AM_CONDITIONAL([ENABLE_CONE_PLUGIN],[test "$enable_cone_plugin" = "yes"])
+
+dnl ********
+dnl Nautilus
+dnl ********
+
+dnl Check for Nautilus property page build
+AC_ARG_ENABLE(nautilus,
+	AC_HELP_STRING([--enable-nautilus],[compile the nautilus plugin]),
+	[case "${enableval}" in
+	yes) ENABLE_NAUTILUS=yes ;;
+	no) ENABLE_NAUTILUS=no ;;
+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-nautilus) ;;
+	esac],
+	[ENABLE_NAUTILUS=yes]) dnl Default value
+
+if test x$ENABLE_NAUTILUS = "xyes" ; then
+	PKG_CHECK_MODULES(NAUTILUS, gtk+-3.0 gthread-2.0 libnautilus-extension,
+			[HAVE_NAUTILUS=yes], [HAVE_NAUTILUS=no])
+fi
+
+AC_ARG_WITH(nautilusdir,
+	    AS_HELP_STRING([--with-nautilusdir=DIR],[Installation path for Nautilus extension @<:@auto@:>@]),
+	    [ac_with_nautilusdir=$withval],
+	    [ac_with_nautilusdir=""])
+
+NAUTILUS_LIBS="$NAUTILUS_LIBS $EXTRA_BACKEND_LIBS"
+AC_SUBST(NAUTILUS_CFLAGS)
+AC_SUBST(NAUTILUS_LIBS)
+if test x$HAVE_NAUTILUS = "xyes"; then
+	AC_DEFINE(HAVE_NAUTILUS, 1, [defined if you build the nautilus plugin])
+	if test "${ac_with_nautilusdir}" = ""; then
+		ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
+	fi
+	AC_SUBST(NAUTILUSDIR)
+	AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}])
+	AC_SUBST([NAUTILUSDIR],[${ac_with_nautilusdir}])
+
+fi
+AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")
+
+dnl ***************************
+dnl D-Bus for gnome-screensaver
+dnl ***************************
+AC_ARG_WITH(dbus,
+		AC_HELP_STRING([--with-dbus],
+			[Enable D-BUS support]),,
+		with_dbus=auto)
+if test "x$with_dbus" != "xno"; then
+	PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQS, enable_dbus=yes, enable_dbus=no)
+        if test "x$with_dbus" = xyes && test "x$enable_dbus" = xno; then
+	   AC_MSG_ERROR([D-BUS explicitly requested but no support found])
+	fi
+        if test "x$enable_dbus" = xyes; then
+		AC_DEFINE(WITH_DBUS, 1, [Define if D-BUS is enabled])
+		AC_DEFINE(ENABLE_DBUS, 1, [Define if D-BUS is enabled])
+	fi
+fi
+AM_CONDITIONAL(WITH_DBUS, test "x$enable_dbus" = "xyes")
+
+GLIB_GSETTINGS
+
+GNOME_COMMON_INIT
+GNOME_DEBUG_CHECK
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_CXX_WARNINGS
+GNOME_MAINTAINER_MODE_DEFINES
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+
+# This macro expands DIR and assigns it to RET.
+# If DIR is NONE, then it's replaced by DEFAULT.
+# Based on AC_DEFINE_DIR
+AC_DEFUN([TOTEM_FULLPATH], [
+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+  ac_expand=[$]$1
+  test "x$ac_expand" = xNONE && ac_expand="[$]$2"
+  ac_expand=`eval echo [$]ac_expand`
+  $3=`eval echo [$]ac_expand`
+])
+
+dnl FULL_LIBEXECDIR is used for X-GNOME-Bugzilla-ExtraInfoScript expansion
+dnl in data/totem.desktop.in.in.in
+TOTEM_FULLPATH(libexecdir, NONE, FULL_LIBEXECDIR)
+AC_SUBST(FULL_LIBEXECDIR)
+
+dnl run in source tree
+AC_ARG_ENABLE(run-in-source-tree,
+	      AC_HELP_STRING([--disable-run-in-source-tree],[disable search for UI files and plugins in local directory ]),
+	[case "${enableval}" in
+	yes) ENABLE_RUN_IN_SOURCE_TREE=yes ;;
+	no)  ENABLE_RUN_IN_SOURCE_TREE=no ;;
+	*) AC_MSG_ERROR(bad value ${enableval} for --disable-run-in-source-tree) ;;
+	esac],
+[ENABLE_RUN_IN_SOURCE_TREE=yes]) dnl Default value
+if test x$ENABLE_RUN_IN_SOURCE_TREE = xyes; then
+	AC_DEFINE(TOTEM_RUN_IN_SOURCE_TREE, 1, [enable search for UI files and plugins in local directory])
+fi
+
+if test "$GCC" = "yes" ; then
+	CFLAGS="\
+	-Wall \
+	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+	-Wnested-externs -Wpointer-arith \
+	-Wcast-align -Wsign-compare \
+	-fno-strict-aliasing \
+	$CFLAGS"
+fi
+
+AC_SUBST([AM_CPPFLAGS])
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_CXXFLAGS])
+AC_SUBST([AM_LDFLAGS])
+
+AC_OUTPUT([
+Makefile
+totem.spec
+lib/Makefile
+src/Makefile
+src/properties/Makefile
+src/plugins/Makefile
+src/plugins/bemused/Makefile
+src/plugins/coherence_upnp/Makefile
+src/plugins/dbus-service/Makefile
+src/plugins/screensaver/Makefile
+src/plugins/screenshot/Makefile
+src/plugins/ontop/Makefile
+src/plugins/im-status/Makefile
+src/plugins/gromit/Makefile
+src/plugins/iplayer/Makefile
+src/plugins/lirc/Makefile
+src/plugins/media-player-keys/Makefile
+src/plugins/opensubtitles/Makefile
+src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in
+src/plugins/properties/Makefile
+src/plugins/save-file/Makefile
+src/plugins/sidebar-test/Makefile
+src/plugins/skipto/Makefile
+src/plugins/sample-python/Makefile
+src/plugins/sample-vala/Makefile
+src/plugins/thumbnail/Makefile
+src/plugins/tracker/Makefile
+src/plugins/youtube/Makefile
+src/plugins/pythonconsole/Makefile
+src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in
+src/plugins/publish/Makefile
+src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in
+src/plugins/jamendo/Makefile
+src/plugins/jamendo/org.gnome.totem.plugins.jamendo.gschema.xml.in
+src/plugins/brasero-disc-recorder/Makefile
+src/plugins/chapters/Makefile
+src/plugins/zeitgeist-dp/Makefile
+src/backend/Makefile
+browser-plugin/Makefile
+data/Makefile
+data/org.gnome.totem.gschema.xml.in
+data/totem.desktop.in.in
+data/totem.pc
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
+data/icons/32x32/Makefile
+data/icons/48x48/Makefile
+data/icons/256x256/Makefile
+data/icons/scalable/Makefile
+po/Makefile.in
+help/Makefile
+docs/Makefile
+docs/reference/Makefile
+docs/reference/version.xml
+])
+
+AC_MSG_NOTICE([Totem was configured with the following options:])
+AC_MSG_NOTICE([** Using the GStreamer-$GST_MAJORMINOR backend])
+if test "x$MISSING_PLUGINS_LIBS" != "x"; then
+	AC_MSG_NOTICE([** Easy codec installation support enabled])
+else
+	AC_MSG_NOTICE([   Easy codec installation 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${PLUGINS}" != "x" ; then
+	for allowed_plugin in ${ALL_PLUGINS}; do
+		for plugin in ${PLUGINS}; do
+			case ${allowed_plugin} in
+				${plugin})
+					AC_MSG_NOTICE([** ${allowed_plugin} plugin enabled])
+					continue 2
+				;;
+				*);;
+			esac
+		done
+		AC_MSG_NOTICE([   ${allowed_plugin} plugin disabled])
+	done
+else
+	AC_MSG_NOTICE([   No Totem plugins enabled])
+fi
+if test x$enable_browser_plugins = xyes ; then
+	AC_MSG_NOTICE([** Browser plugin enabled])
+	if test x$enable_gmp_plugin = xyes ; then
+		AC_MSG_NOTICE([** GMP (Windows Media) plugin enabled])
+	else
+		AC_MSG_NOTICE([   GMP (Windows Media) plugin disabled])
+	fi
+	if test x$enable_narrowspace_plugin = xyes ; then
+		AC_MSG_NOTICE([** NarrowSpace (QuickTime) plugin enabled])
+	else
+		AC_MSG_NOTICE([   NarrowSpace (QuickTime) plugin disabled])
+	fi
+	if test x$enable_mully_plugin = xyes ; then
+		AC_MSG_NOTICE([** MullY (DivX) plugin enabled])
+	else
+		AC_MSG_NOTICE([   MullY (DivX) plugin disabled])
+	fi
+	if test x$enable_cone_plugin = xyes ; then
+		AC_MSG_NOTICE([** Cone (VLC) plugin enabled])
+	else
+		AC_MSG_NOTICE([   Cone (VLC) plugin disabled])
+	fi
+else
+	AC_MSG_NOTICE([   Browser plugin disabled])
+fi
+if test x$ENABLE_NAUTILUS = xyes ; then
+	AC_MSG_NOTICE([** Nautilus properties page enabled])
+else
+	AC_MSG_NOTICE([   Nautilus properties page disabled])
+fi
+if test x$enable_xtest = xyes ; then
+	AC_MSG_NOTICE([** XTest (legacy screensaver) support enabled])
+else
+	AC_MSG_NOTICE([   XTest (legacy screensaver) support disabled])
+fi
+if test x$enable_dbus = xyes ; then
+	AC_MSG_NOTICE([** D-Bus (gnome-screensaver) support enabled])
+else
+	AC_MSG_NOTICE([   D-Bus (gnome-screensaver) support disabled])
+fi
+if test x$have_xvidmode = xyes ; then
+	AC_MSG_NOTICE([** XVidmode support enabled])
+else
+	AC_MSG_NOTICE([   XVidmode support disabled])
+fi
+if test x$have_xfree = xyes ; then
+	AC_MSG_NOTICE([** XFree86 multimedia keys support enabled])
+else
+	AC_MSG_NOTICE([   XFree86 multimedia keys support disabled])
+fi
+if test "$with_smclient" != "no" ; then
+	AC_MSG_NOTICE([** SM client support enabled])
+else
+	AC_MSG_NOTICE([   SM client support disabled])
+fi
+
+AC_MSG_NOTICE([End options])
+

=== added directory '.pc/02_lpi.patch/data'
=== added file '.pc/02_lpi.patch/data/totem.ui'
--- .pc/02_lpi.patch/data/totem.ui	1970-01-01 00:00:00 +0000
+++ .pc/02_lpi.patch/data/totem.ui	2011-10-26 10:18:23 +0000
@@ -0,0 +1,2355 @@
+<?xml version="1.0" ?>
+<!--*- mode: xml -*--><!DOCTYPE glade-interface
+  SYSTEM 'http://glade.gnome.org/glade-2.0.dtd'>
+<interface>
+<requires lib="gtk+" version="2.20"/>
+
+<object class="GtkUIManager" id="totem-ui-manager">
+   <child>
+      <object class="GtkActionGroup" id="main-action-group">
+         <child>
+            <object class="GtkAction" id="movie-menu">
+               <property name="label" translatable="yes">_Movie</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="open">
+               <property name="label" translatable="yes">_Open...</property>
+               <property name="stock-id">gtk-open</property>
+               <property name="tooltip" translatable="yes">Open a file</property>
+               <signal name="activate" handler="open_action_callback"/>
+            </object>
+            <accelerator key="O" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="open-location">
+               <property name="label" translatable="yes">Open _Location...</property>
+               <property name="tooltip" translatable="yes">Open a non-local file</property>
+               <signal name="activate" handler="open_location_action_callback"/>
+            </object>
+            <accelerator key="L" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="eject">
+               <property name="label" translatable="yes">_Eject</property>
+               <property name="icon-name">media-eject-symbolic</property>
+               <property name="tooltip" translatable="yes">Eject the current disc</property>
+               <signal name="activate" handler="eject_action_callback"/>
+            </object>
+            <accelerator key="E" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="properties">
+               <property name="label" translatable="yes">_Properties</property>
+               <property name="stock-id">gtk-properties</property>
+               <property name="tooltip" translatable="yes">View the properties of the current stream</property>
+               <signal name="activate" handler="properties_action_callback"/>
+            </object>
+            <accelerator key="P" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="play">
+               <property name="label" translatable="yes">Play / P_ause</property>
+               <property name="icon-name">media-playback-start-symbolic</property>
+               <property name="tooltip" translatable="yes">Play or pause the movie</property>
+               <signal name="activate" handler="play_action_callback"/>
+            </object>
+            <accelerator key="space" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="quit">
+               <property name="label" translatable="yes">_Quit</property>
+               <property name="stock-id">gtk-quit</property>
+               <property name="tooltip" translatable="yes">Quit the program</property>
+               <signal name="activate" handler="quit_action_callback"/>
+            </object>
+            <accelerator key="Q" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+
+         <child>
+            <object class="GtkAction" id="edit-menu">
+               <property name="label" translatable="yes">_Edit</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="clear-playlist">
+               <property name="label" translatable="yes">_Clear Playlist</property>
+               <property name="icon-name">gtk-clear</property>
+               <property name="tooltip" translatable="yes">Clear the playlist</property>
+               <signal name="activate" handler="clear_playlist_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="preferences">
+               <property name="label" translatable="yes">Prefere_nces</property>
+               <property name="stock-id">gtk-preferences</property>
+               <property name="tooltip" translatable="yes">Configure the application</property>
+               <signal name="activate" handler="preferences_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="plugins">
+               <property name="label" translatable="yes">Plugins...</property>
+               <property name="tooltip" translatable="yes">Configure plugins to extend the application</property>
+               <signal name="activate" handler="plugins_action_callback"/>
+            </object>
+         </child>
+
+         <child>
+            <object class="GtkAction" id="view-menu">
+               <property name="label" translatable="yes">_View</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="fullscreen">
+               <property name="label" translatable="yes">_Fullscreen</property>
+               <property name="icon-name">view-fullscreen-symbolic</property>
+               <property name="tooltip" translatable="yes">Switch to fullscreen</property>
+               <signal name="activate" handler="fullscreen_action_callback"/>
+            </object>
+            <accelerator key="F11"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="zoom-window-menu">
+               <property name="label" translatable="yes">Fit Window to Movie</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="zoom-1-2">
+               <property name="label" translatable="yes">_Resize 1:2</property>
+               <property name="tooltip" translatable="yes">Resize to half the original video size</property>
+               <signal name="activate" handler="zoom_1_2_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="zoom-1-1">
+               <property name="label" translatable="yes">Resize _1:1</property>
+               <property name="tooltip" translatable="yes">Resize to the original video size</property>
+               <signal name="activate" handler="zoom_1_1_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="zoom-2-1">
+               <property name="label" translatable="yes">Resize _2:1</property>
+               <property name="tooltip" translatable="yes">Resize to double the original video size</property>
+               <signal name="activate" handler="zoom_2_1_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="aspect-ratio-menu">
+               <property name="label" translatable="yes">_Aspect Ratio</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="next-angle">
+               <property name="label" translatable="yes">Switch An_gles</property>
+               <property name="tooltip" translatable="yes">Switch camera angles</property>
+               <signal name="activate" handler="next_angle_action_callback"/>
+            </object>
+            <accelerator key="G" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+
+         <child>
+            <object class="GtkAction" id="go-menu">
+               <property name="label" translatable="yes">_Go</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="dvd-root-menu">
+               <property name="label" translatable="yes">_DVD Menu</property>
+               <property name="stock-id">gtk-index</property>
+               <property name="tooltip" translatable="yes">Go to the DVD menu</property>
+               <signal name="activate" handler="dvd_root_menu_action_callback"/>
+            </object>
+            <accelerator key="M" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="dvd-title-menu">
+               <property name="label" translatable="yes">_Title Menu</property>
+               <property name="tooltip" translatable="yes">Go to the title menu</property>
+               <signal name="activate" handler="dvd_title_menu_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="dvd-audio-menu">
+               <property name="label" translatable="yes">A_udio Menu</property>
+               <property name="tooltip" translatable="yes">Go to the audio menu</property>
+               <signal name="activate" handler="dvd_audio_menu_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="dvd-angle-menu">
+               <property name="label" translatable="yes">_Angle Menu</property>
+               <property name="tooltip" translatable="yes">Go to the angle menu</property>
+               <signal name="activate" handler="dvd_angle_menu_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="dvd-chapter-menu">
+               <property name="label" translatable="yes">_Chapter Menu</property>
+               <property name="stock-id">gtk-index</property>
+               <property name="tooltip" translatable="yes">Go to the chapter menu</property>
+               <signal name="activate" handler="dvd_chapter_menu_action_callback"/>
+            </object>
+            <accelerator key="C" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="next-chapter">
+               <property name="label" translatable="yes">_Next Chapter/Movie</property>
+               <property name="icon-name">media-skip-forward-symbolic</property>
+               <property name="tooltip" translatable="yes">Next chapter or movie</property>
+               <signal name="activate" handler="next_chapter_action_callback"/>
+            </object>
+            <accelerator key="Right" modifiers="GDK_MOD1_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="previous-chapter">
+               <property name="label" translatable="yes">_Previous Chapter/Movie</property>
+               <property name="icon-name">media-skip-backward-symbolic</property>
+               <property name="tooltip" translatable="yes">Previous chapter or movie</property>
+               <signal name="activate" handler="previous_chapter_action_callback"/>
+            </object>
+            <accelerator key="Left" modifiers="GDK_MOD1_MASK"/>
+         </child>
+
+         <child>
+            <object class="GtkAction" id="sound-menu">
+               <property name="label" translatable="yes">_Sound</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="volume-up">
+               <property name="label" translatable="yes">Volume _Up</property>
+               <property name="icon-name">audio-volume-high-symbolic</property>
+               <property name="tooltip" translatable="yes">Increase volume</property>
+               <signal name="activate" handler="volume_up_action_callback"/>
+            </object>
+            <accelerator key="Up"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="volume-down">
+               <property name="label" translatable="yes">Volume _Down</property>
+               <property name="icon-name">audio-volume-low-symbolic</property>
+               <property name="tooltip" translatable="yes">Decrease volume</property>
+               <signal name="activate" handler="volume_down_action_callback"/>
+            </object>
+            <accelerator key="Down"/>
+         </child>
+
+         <child>
+            <object class="GtkAction" id="help-menu">
+               <property name="label" translatable="yes">_Help</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="contents">
+               <property name="label" translatable="yes">_Contents</property>
+               <property name="stock-id">gtk-help</property>
+               <property name="tooltip" translatable="yes">Help contents</property>
+               <signal name="activate" handler="contents_action_callback"/>
+            </object>
+            <accelerator key="F1"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="about">
+               <property name="label" translatable="yes">_About</property>
+               <property name="stock-id">gtk-about</property>
+               <property name="tooltip" translatable="yes">About this application</property>
+               <signal name="activate" handler="about_action_callback"/>
+            </object>
+         </child>
+
+         <child>
+            <object class="GtkToggleAction" id="repeat-mode">
+               <property name="label" translatable="yes">_Repeat Mode</property>
+               <property name="tooltip" translatable="yes">Set the repeat mode</property>
+               <property name="active">False</property>
+               <signal name="activate" handler="repeat_mode_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkToggleAction" id="shuffle-mode">
+               <property name="label" translatable="yes">Shuff_le Mode</property>
+               <property name="tooltip" translatable="yes">Set the shuffle mode</property>
+               <property name="active">False</property>
+               <signal name="activate" handler="shuffle_mode_action_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkToggleAction" id="show-controls">
+               <property name="label" translatable="yes">Show _Controls</property>
+               <property name="tooltip" translatable="yes">Show controls</property>
+               <property name="active">TRUE</property>
+               <signal name="activate" handler="show_controls_action_callback"/>
+            </object>
+            <accelerator key="H" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+               <object class="GtkToggleAction" id="sidebar">
+               <property name="label" translatable="yes">S_idebar</property>
+               <property name="tooltip" translatable="yes">Show or hide the sidebar</property>
+	       <property name="active">TRUE</property>
+	       <property name="icon-name">view-sidebar-symbolic</property>
+               <signal name="activate" handler="show_sidebar_action_callback"/>
+            </object>
+            <accelerator key="F9"/>
+         </child>
+
+         <child>
+            <object class="GtkRadioAction" id="aspect-ratio-auto">
+               <property name="label" translatable="yes" comments="Translators: an entry in the 'Aspect Ratio' menu, used to choose the displayed aspect ratio of a video" context="Aspect ratio">Auto</property>
+	       <property name="tooltip" translatable="yes">Sets automatic aspect ratio</property>
+	       <!-- BVW_RATIO_AUTO -->
+	       <property name="value">0</property>
+	       <property name="current-value">0</property>
+               <signal name="changed" handler="aspect_ratio_changed_callback"/>
+            </object>
+         </child>
+         <child>
+            <object class="GtkRadioAction" id="aspect-ratio-square">
+               <property name="label" translatable="yes">Square</property>
+               <property name="tooltip" translatable="yes">Sets square aspect ratio</property>
+	       <!-- BVW_RATIO_SQUARE -->
+	       <property name="group">aspect-ratio-auto</property>
+               <property name="value">1</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkRadioAction" id="aspect-ratio-fbt">
+               <property name="label" translatable="yes">4:3 (TV)</property>
+               <property name="tooltip" translatable="yes">Sets 4:3 (TV) aspect ratio</property>
+	       <!-- BVW_RATIO_FOURBYTHREE -->
+	       <property name="group">aspect-ratio-auto</property>
+               <property name="value">2</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkRadioAction" id="aspect-ratio-anamorphic">
+               <property name="label" translatable="yes">16:9 (Widescreen)</property>
+               <property name="tooltip" translatable="yes">Sets 16:9 (widescreen) aspect ratio</property>
+	       <!-- BVW_RATIO_ANAMORPHIC -->
+	       <property name="group">aspect-ratio-auto</property>
+               <property name="value">3</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkRadioAction" id="aspect-ratio-dvb">
+               <property name="label" translatable="yes">2.11:1 (DVB)</property>
+               <property name="tooltip" translatable="yes">Sets 2.11:1 (DVB) aspect ratio</property>
+	       <!-- BVW_RATIO_DVB -->
+	       <property name="group">aspect-ratio-auto</property>
+               <property name="value">4</property>
+            </object>
+         </child>
+
+         <child>
+            <object class="GtkAction" id="subtitles-menu">
+               <property name="label" translatable="yes">S_ubtitles</property>
+               <property name="hide-if-empty">False</property>
+            </object>
+         </child>
+         <child>
+            <object class="GtkAction" id="select-subtitle">
+               <property name="label" translatable="yes">_Select Text Subtitles...</property>
+               <property name="tooltip" translatable="yes">Select a file to use for text subtitles</property>
+               <signal name="activate" handler="select_subtitle_action_callback"/>
+            </object>
+         </child>
+
+         <child>
+            <object class="GtkAction" id="languages-menu">
+               <property name="label" translatable="yes">_Languages</property>
+               <property name="hide-if-empty">False</property>
+            </object>
+         </child>
+      </object>
+   </child>
+   <child>
+      <object class="GtkActionGroup" id="zoom-action-group">
+         <child>
+            <object class="GtkAction" id="zoom-in">
+               <property name="label" translatable="yes">Zoom In</property>
+               <property name="stock-id">gtk-zoom-in</property>
+               <property name="tooltip" translatable="yes">Zoom in</property>
+               <signal name="activate" handler="zoom_in_action_callback"/>
+            </object>
+            <accelerator key="R" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="zoom-reset">
+               <property name="label" translatable="yes">Zoom Reset</property>
+               <property name="stock-id">gtk-zoom-100</property>
+               <property name="tooltip" translatable="yes">Zoom reset</property>
+               <signal name="activate" handler="zoom_reset_action_callback"/>
+            </object>
+            <accelerator key="0" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="zoom-out">
+               <property name="label" translatable="yes">Zoom Out</property>
+               <property name="stock-id">gtk-zoom-out</property>
+               <property name="tooltip" translatable="yes">Zoom out</property>
+               <signal name="activate" handler="zoom_out_action_callback"/>
+            </object>
+            <accelerator key="T" modifiers="GDK_CONTROL_MASK"/>
+         </child>
+      </object>
+   </child>
+   <child>
+      <object class="GtkActionGroup" id="skip-action-group">
+         <child>
+            <object class="GtkAction" id="skip-forward">
+               <property name="label" translatable="yes">Skip _Forward</property>
+               <property name="tooltip" translatable="yes">Skip forward</property>
+               <property name="icon-name">media-seek-forward-symbolic</property>
+               <signal name="activate" handler="skip_forward_action_callback"/>
+            </object>
+            <accelerator key="Right"/>
+         </child>
+         <child>
+            <object class="GtkAction" id="skip-backwards">
+               <property name="label" translatable="yes">Skip _Backwards</property>
+               <property name="tooltip" translatable="yes">Skip backwards</property>
+               <property name="icon-name">media-seek-backward-symbolic</property>
+               <signal name="activate" handler="skip_backwards_action_callback"/>
+            </object>
+            <accelerator key="Left"/>
+         </child>
+      </object>
+   </child>
+   <ui>
+      <menubar name="tmw-menubar">
+         <menu name="movie" action="movie-menu">
+            <menuitem name="open" action="open"/>
+	    <menuitem name="open-location" action="open-location"/>
+	    <placeholder name="save-placeholder"/>
+            <placeholder name="devices-placeholder"/>
+            <separator name="recent-separator"/>
+            <placeholder name="recent-placeholder"/>
+	    <separator/>
+	    <placeholder name="burn-placeholder"/>
+            <menuitem name="properties" action="properties"/>
+            <separator/>
+            <menuitem name="eject" action="eject"/>
+            <separator/>
+            <menuitem name="play" action="play"/>
+            <separator/>
+            <menuitem name="quit" action="quit"/>
+         </menu>
+         <menu name="edit" action="edit-menu">
+            <menuitem name="repeat-mode" action="repeat-mode"/>
+            <menuitem name="shuffle-mode" action="shuffle-mode"/>
+            <separator/>
+            <menuitem name="clear-playlist" action="clear-playlist"/>
+            <separator/>
+            <menuitem name="plugins" action="plugins"/>
+            <menuitem name="preferences" action="preferences"/>
+         </menu>
+         <menu name="view" action="view-menu">
+            <menuitem name="fullscreen" action="fullscreen"/>
+            <menu name="zoom-window" action="zoom-window-menu">
+               <menuitem name="zoom-1-2" action="zoom-1-2"/>
+               <menuitem name="zoom-1-1" action="zoom-1-1"/>
+               <menuitem name="zoom-2-1" action="zoom-2-1"/>
+            </menu>
+            <menuitem name="zoom-in" action="zoom-in"/>
+            <menuitem name="zoom-reset" action="zoom-reset"/>
+            <menuitem name="zoom-out" action="zoom-out"/>
+            <separator/>
+            <menu name="aspect-ratio" action="aspect-ratio-menu">
+               <menuitem name="aspect-ratio-auto" action="aspect-ratio-auto"/>
+               <menuitem name="aspect-ratio-square" action="aspect-ratio-square"/>
+               <menuitem name="aspect-ratio-fbt" action="aspect-ratio-fbt"/>
+               <menuitem name="aspect-ratio-anamorphic" action="aspect-ratio-anamorphic"/>
+               <menuitem name="aspect-ratio-dvb" action="aspect-ratio-dvb"/>
+            </menu>
+            <menuitem name="next-angle" action="next-angle"/>
+	    <menuitem name="show-controls" action="show-controls"/>
+            <separator/>
+            <menu name="subtitles" action="subtitles-menu">
+               <menuitem name="select-subtitle" action="select-subtitle"/>
+	       <placeholder name="subtitle-download-placeholder"/>
+	       <separator/>
+               <placeholder name="placeholder"/>
+            </menu>
+            <separator/>
+            <menuitem name="sidebar" action="sidebar"/>         
+         </menu>
+         <menu name="go" action="go-menu">
+            <menuitem name="dvd-root-menu" action="dvd-root-menu"/>
+            <menuitem name="dvd-title-menu" action="dvd-title-menu"/>
+            <menuitem name="dvd-audio-menu" action="dvd-audio-menu"/>
+            <menuitem name="dvd-angle-menu" action="dvd-angle-menu"/>
+            <menuitem name="dvd-chapter-menu" action="dvd-chapter-menu"/>
+            <separator/>
+            <menuitem name="next-chapter" action="next-chapter"/>
+            <menuitem name="previous-chapter" action="previous-chapter"/>
+            <separator/>
+            <menuitem name="skip-forward" action="skip-forward"/>
+            <menuitem name="skip-backwards" action="skip-backwards"/>
+         </menu>
+         <menu name="sound" action="sound-menu">
+            <menu name="languages" action="languages-menu">
+               <placeholder name="placeholder"/>
+            </menu>
+            <menuitem name="volume-up" action="volume-up"/>
+            <menuitem name="volume-down" action="volume-down"/>
+         </menu>
+         <menu name="help" action="help-menu">
+            <menuitem name="contents" action="contents"/>
+            <menuitem name="about" action="about"/>
+         </menu>
+      </menubar>
+      <popup name="totem-main-popup">
+         <menuitem name="play" action="play"/>
+         <menuitem name="next-chapter" action="next-chapter"/>
+         <menuitem name="previous-chapter" action="previous-chapter"/>
+         <menuitem name="skip-forward" action="skip-forward"/>
+         <menuitem name="skip-backwards" action="skip-backwards"/>
+         <menuitem name="show-controls" action="show-controls"/>
+         <menuitem name="fullscreen" action="fullscreen"/>
+         <menuitem name="select-subtitle" action="select-subtitle"/>
+         <separator/>
+         <placeholder name="save-placeholder"/>
+         <separator/>
+         <menu name="popup-languages" action="languages-menu">
+            <placeholder name="placeholder"/>
+         </menu>
+         <menu name="popup-subtitles" action="subtitles-menu">
+            <placeholder name="placeholder"/>
+         </menu>
+      </popup>
+   </ui>
+</object>
+
+<object class="GtkListStore" id="tpw_speed_liststore">
+  <columns>
+    <column type="gchararray"/>
+  </columns>
+  <data>
+    <row>
+      <col id="0" translatable="yes">14.4 Kbps Modem</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">19.2 Kbps Modem</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">28.8 Kbps Modem</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">33.6 Kbps Modem</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">34.4 Kbps Modem</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">56 Kbps Modem/ISDN</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">112 Kbps Dual ISDN/DSL</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">256 Kbps DSL/Cable</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">384 Kbps DSL/Cable</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">512 Kbps DSL/Cable</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">1.5 Mbps T1/Intranet/LAN</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">Intranet/LAN</col>
+    </row>
+  </data>
+</object>
+
+<object class="GtkListStore" id="tpw_visuals_size_liststore">
+  <columns>
+    <column type="gchararray"/>
+  </columns>
+  <data>
+    <row>
+      <col id="0" translatable="yes" comments="Audio visualization dimensions">Normal</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes" comments="Audio visualization dimensions">Large</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes" comments="Audio visualization dimensions">Extra Large</col>
+    </row>
+  </data>
+</object>
+
+<object class="GtkListStore" id="tpw_visuals_type_liststore">
+  <columns>
+    <column type="gchararray"/>
+  </columns>
+  <data>
+  </data>
+</object>
+
+<object class="GtkListStore" id="tpw_sound_output_liststore">
+  <columns>
+    <column type="gchararray"/>
+  </columns>
+  <data>
+    <row>
+      <col id="0" translatable="yes">Stereo</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">4-channel</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">4.1-channel</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">5.0-channel</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">5.1-channel</col>
+    </row>
+    <row>
+      <col id="0" translatable="yes">AC3 Passthrough</col>
+    </row>
+  </data>
+</object>
+
+<object class="GtkAdjustment" id="tpw_bright_adjustment">
+  <property name="lower">0</property>
+  <property name="upper">65535</property>
+  <property name="step-increment">1000</property>
+  <property name="page-increment">2000</property>
+  <property name="page-size">250</property>
+  <property name="value">32767</property>
+</object>
+
+<object class="GtkAdjustment" id="tpw_contrast_adjustment">
+  <property name="lower">0</property>
+  <property name="upper">65535</property>
+  <property name="step-increment">1000</property>
+  <property name="page-increment">2000</property>
+  <property name="page-size">250</property>
+  <property name="value">32767</property>
+</object>
+
+<object class="GtkAdjustment" id="tpw_saturation_adjustment">
+  <property name="lower">0</property>
+  <property name="upper">65535</property>
+  <property name="step-increment">1000</property>
+  <property name="page-increment">2000</property>
+  <property name="page-size">250</property>
+  <property name="value">32767</property>
+</object>
+
+<object class="GtkAdjustment" id="tpw_hue_adjustment">
+  <property name="lower">0</property>
+  <property name="upper">65535</property>
+  <property name="step-increment">1000</property>
+  <property name="page-increment">2000</property>
+  <property name="page-size">250</property>
+  <property name="value">32767</property>
+</object>
+
+<object class="GtkAdjustment" id="tmw_seek_adjustment">
+  <property name="lower">0</property>
+  <property name="upper">0</property>
+  <property name="step-increment">1</property>
+  <property name="page-increment">10</property>
+  <property name="page-size">0</property>
+  <property name="value">0</property>
+  <signal name="value-changed" handler="seek_slider_changed_cb"/>
+</object>
+
+<object class="GtkDialog" id="totem_preferences_window">
+  <property name="border_width">5</property>
+  <property name="title" translatable="yes">Totem Preferences</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+  <property name="modal">False</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+
+  <child internal-child="vbox">
+    <object class="GtkVBox" id="tpw_dialog_vbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">2</property>
+      <property name="orientation">vertical</property>
+
+      <child internal-child="action_area">
+	<object class="GtkHButtonBox" id="tpw_dialog_action_area">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <object class="GtkButton" id="tpw_close_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      
+	    </object>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkNotebook" id="tpw_notebook">
+	  <property name="border_width">5</property>
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="show_tabs">True</property>
+	  <property name="show_border">True</property>
+	  <property name="tab_pos">GTK_POS_TOP</property>
+	  <property name="scrollable">False</property>
+	  <property name="enable_popup">False</property>
+
+	  <child>
+	    <object class="GtkVBox" id="tpw_general_vbox">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+              <property name="orientation">vertical</property>
+
+	      <child>
+		<object class="GtkVBox" id="vbox2">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_playback_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Playback</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		      <attributes>
+		        <attribute name="weight" value="bold"/>
+                      </attributes>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment2">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			    <object class="GtkCheckButton" id="tpw_remember_position_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Start playing files from last position</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+		        </object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child><child>
+		<object class="GtkVBox" id="vbox3">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_network_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Networking</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		      <attributes>
+		        <attribute name="weight" value="bold"/>
+                      </attributes>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment1">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkHBox" id="hbox6">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">12</property>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_speed_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Connection _speed:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_speed_combobox</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkComboBox" id="tpw_speed_combobox">
+			      <property name="visible">True</property>
+			      <property name="model">tpw_speed_liststore</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			      <child>
+			        <object class="GtkCellRendererText" id="tpw_speed_cell"/>
+			        <attributes>
+			          <attribute name="text">0</attribute>
+			        </attributes>
+			      </child>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="vbox6">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_text_subtitles_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Text Subtitles</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		      <attributes>
+		        <attribute name="weight" value="bold"/>
+                      </attributes>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment3">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkTable" id="table3">
+			  <property name="visible">True</property>
+			  <property name="n_rows">3</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
+
+			  <child>
+			    <object class="GtkCheckButton" id="tpw_auto_subtitles_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">_Load subtitle files when movie is loaded</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+		            </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+		            </packing>
+		          </child>
+
+			  <child>
+			    <object class="GtkLabel" id="label32">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Font:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">font_sel_button</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkLabel" id="label35">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Encoding:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">subtitle_encoding_combo</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkComboBox" id="subtitle_encoding_combo">
+			      <property name="visible">True</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			      <signal name="changed" handler="encoding_set_cb"/>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkFontButton" id="font_sel_button">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="show_style">True</property>
+			      <property name="show_size">True</property>
+			      <property name="use_font">False</property>
+			      <property name="use_size">False</property>
+			      <property name="focus_on_click">True</property>
+			      <signal name="font-set" handler="font_set_cb"/>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="vbox7">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_ext_chapters_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">External Chapters</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		      <attributes>
+		        <attribute name="weight" value="bold"/>
+                      </attributes>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment3_2">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkTable" id="table3_2">
+			  <property name="visible">True</property>
+			  <property name="n_rows">1</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
+
+			  <child>
+			    <object class="GtkCheckButton" id="tpw_auto_chapters_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Load _chapter files when movie is loaded</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+		            </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+		            </packing>
+		          </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </object>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child type="tab">
+	    <object class="GtkLabel" id="tpw_general_notebook_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">General</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </object>
+	    
+	  </child>
+
+	  <child>
+	    <object class="GtkVBox" id="vbox1">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+              <property name="orientation">vertical</property>
+
+	      <child>
+		<object class="GtkVBox" id="tpw_visuals_display_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_display_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes" comments="Tab label in the Preferences dialogue">Display</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		      <attributes>
+		        <attribute name="weight" value="bold"/>
+                      </attributes>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment4">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkCheckButton" id="tpw_display_checkbutton">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Resize the window when a new video is loaded</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+	    </child>
+		  <child>
+			  <object class="GtkAlignment" id="alignment9">
+				  <property name="visible">True</property>
+				  <property name="left_padding">12</property>
+				  <child>
+					  <object class="GtkCheckButton" id="tpw_no_deinterlace_checkbutton">
+						  <property name="label" translatable="yes">Disable _deinterlacing of interlaced videos</property>
+						  <property name="visible">True</property>
+						  <property name="can_focus">False</property>
+						  <property name="receives_default">False</property>
+						  <property name="use_action_appearance">False</property>
+						  <property name="use_underline">True</property>
+						  <property name="draw_indicator">True</property>
+					  </object>
+				  </child>
+			  </object>
+			  <packing>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				  <property name="position">3</property>
+			  </packing>
+		  </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment8">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox1">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkLabel" id="label1">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Disable screensaver when playing </property>
+                              </object>
+                              <packing>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="tpw_video_toggle_button">
+                                <property name="label" translatable="yes">Video</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">tpw_audio_toggle_button</property>
+                              </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="tpw_audio_toggle_button">
+                                <property name="label" translatable="yes">Video or Audio</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="active">True</property>
+				<property name="draw_indicator">True</property>
+				<signal name="toggled" handler="audio_screensaver_button_toggled_cb"/>
+                              </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+
+
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="tpw_visuals_effects_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkLabel" id="tpw_visuals_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Visual Effects</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		      <attributes>
+		        <attribute name="weight" value="bold"/>
+                      </attributes>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment5">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkVBox" id="vbox9">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+                          <property name="orientation">vertical</property>
+
+			  <child>
+			    <object class="GtkCheckButton" id="tpw_visuals_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Show _visual effects when an audio file is played</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="checkbutton2_toggled_cb"/>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkTable" id="table1">
+			      <property name="visible">True</property>
+			      <property name="n_rows">2</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<object class="GtkLabel" id="tpw_visuals_type_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Type of visualization:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">tpw_visuals_type_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</object>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"/>
+				</packing>
+			      </child>
+
+			      <child>
+				<object class="GtkLabel" id="tpw_visuals_size_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Visualization _size:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">tpw_visuals_size_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</object>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"/>
+				</packing>
+			      </child>
+
+			      <child>
+				<object class="GtkComboBox" id="tpw_visuals_size_combobox">
+				  <property name="visible">True</property>
+				  <property name="model">tpw_visuals_size_liststore</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
+				  <child>
+				    <object class="GtkCellRendererText" id="tpw_visuals_size_cell"/>
+				    <attributes>
+				      <attribute name="text">0</attribute>
+				    </attributes>
+				  </child>
+				</object>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options">fill</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<object class="GtkComboBox" id="tpw_visuals_type_combobox">
+				  <property name="visible">True</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="model">tpw_visuals_type_liststore</property>
+				  <signal name="changed" handler="visual_menu_changed"/>
+				  <child>
+				    <object class="GtkCellRendererText" id="renderer1"/>
+				    <attributes>
+				      <attribute name="text">0</attribute>
+				    </attributes>
+				  </child>
+				</object>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options">fill</property>
+				</packing>
+			      </child>
+			    </object>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="tpw_bright_contr_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkHBox" id="hbox14">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<object class="GtkLabel" id="tpw_color_balance_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Color Balance</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			  <attributes>
+		            <attribute name="weight" value="bold"/>
+                          </attributes>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkAlignment" id="alignment6">
+		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">12</property>
+		      <property name="right_padding">0</property>
+
+		      <child>
+			<object class="GtkTable" id="table2">
+			  <property name="visible">True</property>
+			  <property name="n_rows">5</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_brightness_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Brightness:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_bright_scale</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_contrast_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Co_ntrast:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_contrast_scale</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkHScale" id="tpw_bright_scale">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">tpw_bright_adjustment</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkHScale" id="tpw_contrast_scale">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">tpw_contrast_adjustment</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_saturation_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Sat_uration:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_saturation_scale</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkLabel" id="tpw_hue_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Hue:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">tpw_hue_scale</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"/>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkHScale" id="tpw_saturation_scale">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">tpw_saturation_adjustment</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkHScale" id="tpw_hue_scale">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="draw_value">False</property>
+			      <property name="value_pos">GTK_POS_TOP</property>
+			      <property name="digits">1</property>
+			      <property name="inverted">False</property>
+			      <property name="adjustment">tpw_hue_adjustment</property>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">3</property>
+			      <property name="bottom_attach">4</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <object class="GtkHButtonBox" id="hbox23">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+			      <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+			      <child>
+				<object class="GtkButton" id="tpw_color_reset">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Reset to _Defaults</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <signal name="clicked" handler="tpw_color_reset_clicked_cb"/>
+				</object>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </object>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">4</property>
+			      <property name="bottom_attach">5</property>
+			      <property name="x_options">shrink|fill</property>
+			    </packing>
+			  </child>
+			</object>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </object>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child type="tab">
+	    <object class="GtkLabel" id="tpw_visuals_notebook_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Display</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </object>
+	    
+	  </child>
+
+	  <child>
+	    <object class="GtkVBox" id="vbox12">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+              <property name="orientation">vertical</property>
+
+	      <child>
+		<object class="GtkVBox" id="vbox13">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkVBox" id="vbox22">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+                      <property name="orientation">vertical</property>
+
+		      <child>
+			<object class="GtkLabel" id="tpw_audio_output_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Audio Output</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			  <attributes>
+		            <attribute name="weight" value="bold"/>
+                          </attributes>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<object class="GtkAlignment" id="alignment7">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">0</property>
+
+			  <child>
+			    <object class="GtkHBox" id="hbox22">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">12</property>
+
+			      <child>
+				<object class="GtkLabel" id="tpw_audio_output_type_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Audio output type:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">tpw_sound_output_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</object>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<object class="GtkComboBox" id="tpw_sound_output_combobox">
+				  <property name="visible">True</property>
+				  <property name="model">tpw_sound_output_liststore</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
+				  <child>
+				    <object class="GtkCellRendererText" id="tpw_sound_output_cell"/>
+				    <attributes>
+				      <attribute name="text">0</attribute>
+				    </attributes>
+				  </child>
+				</object>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </object>
+			  </child>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <!--Placeholder-->
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </object>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child type="tab">
+	    <object class="GtkLabel" id="label11">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Audio</property>
+	      <property name="use_underline">True</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </object>
+	    
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+  </child>
+<action-widgets><action-widget response="-7">tpw_close_button</action-widget></action-widgets></object>
+
+<object class="GtkWindow" id="totem_main_window">
+  <property name="title" translatable="yes">Movie Player</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <signal name="delete-event" handler="main_window_destroy_cb"/>
+  <signal name="window-state-event" handler="window_state_event_cb"/>
+  <signal name="key-press-event" handler="window_key_press_event_cb"/>
+  <signal name="key-release-event" handler="window_key_press_event_cb"/>
+  <signal name="scroll-event" handler="window_scroll_event_cb"/>
+
+  <child>
+    <object class="GtkVBox" id="totem_main_vbox">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+      <property name="orientation">vertical</property>
+
+      <child>
+	<object class="GtkVBox" id="tmw_menubar_box">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+          <property name="orientation">vertical</property>
+
+	  <child>
+	    <object class="GtkMenuBar" id="tmw-menubar" constructor="totem-ui-manager"/>
+	    <packing>
+	       <property name="pack-type">start</property>
+	       <property name="expand">False</property>
+	       <property name="fill">False</property>
+	       <property name="padding">0</property>
+	    </packing>
+	  </child>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="GtkHPaned" id="tmw_main_pane">
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <signal name="size-allocate" handler="main_pane_size_allocated"/>
+
+	  <child>
+	    <object class="GtkVBox" id="tmw_main_vbox">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+              <property name="orientation">vertical</property>
+
+	      <child>
+	        <object class="GtkEventBox" id="tmw_bvw_box">
+		  <property name="border_width">0</property>
+		  <property name="visible">True</property>
+		  <property name="visible_window">True</property>
+		  <property name="above_child">False</property>
+
+		  <!--Placeholder-->
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<object class="GtkVBox" id="tmw_controls_vbox">
+		  <property name="border_width">6</property>
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+                  <property name="orientation">vertical</property>
+
+		  <child>
+		    <object class="GtkHBox" id="tmw_seek_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<object class="GtkLabel" id="tmw_time_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Time:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			  <accessibility>
+			    <relation target="tmw_seek_hscale" type="label-for"/>
+			  </accessibility>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<object class="GtkHScale" id="tmw_seek_hscale">
+			  <property name="visible">True</property>
+			  <property name="sensitive">False</property>
+			  <property name="can_focus">True</property>
+			  <property name="draw_value">False</property>
+			  <property name="value_pos">GTK_POS_TOP</property>
+			  <property name="digits">1</property>
+			  <property name="inverted">False</property>
+			  <property name="adjustment">tmw_seek_adjustment</property>
+			  <signal name="button-press-event" handler="seek_slider_pressed_cb"/>
+			  <signal name="button-release-event" handler="seek_slider_released_cb"/>
+			  <signal name="scroll-event" handler="window_scroll_event_cb"/>
+			  <child internal-child="accessible">
+                            <object class="AtkObject" id="a11y-tmw_seek_hscale">
+                              <property name="AtkObject::accessible-name" translatable="yes">Time seek bar</property>
+                            </object>
+                          </child>
+			  <accessibility>
+			    <relation target="tmw_time_label" type="labelled-by"/>
+			  </accessibility>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <object class="GtkHBox" id="tmw_buttons_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<object class="GtkHBox" id="tmw_sidebar_button_hbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			  <property name="pack_type">GTK_PACK_END</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<object class="GtkVolumeButton" id="tmw_volume_button">
+			  <property name="visible">True</property>
+			  <property name="sensitive">False</property>
+			  <property name="use-symbolic">True</property>
+			  <signal name="value-changed" handler="volume_button_value_changed_cb"/>
+			</object>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			  <property name="pack_type">GTK_PACK_END</property>
+			</packing>
+		      </child>
+		    </object>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</object>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </object>
+	    <packing>
+	      <property name="shrink">False</property>
+	      <property name="resize">True</property>
+	    </packing>
+	  </child>
+
+	  <!--Placeholder-->
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<object class="TotemStatusbar" id="tmw_statusbar">
+	  <property name="visible">True</property>
+	</object>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </object>
+  </child>
+</object>
+
+</interface>

=== added directory '.pc/02_lpi.patch/src'
=== added file '.pc/02_lpi.patch/src/totem-menu.c'
--- .pc/02_lpi.patch/src/totem-menu.c	1970-01-01 00:00:00 +0000
+++ .pc/02_lpi.patch/src/totem-menu.c	2011-10-26 10:18:23 +0000
@@ -0,0 +1,1407 @@
+/* totem-menu.c
+
+   Copyright (C) 2004-2005 Bastien Nocera
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301  USA.
+
+   Author: Bastien Nocera <[e-mail]>
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <gst/tag/tag.h>
+#include <string.h>
+#include <libpeas-gtk/peas-gtk-plugin-manager.h>
+
+#include "totem-menu.h"
+#include "totem.h"
+#include "totem-interface.h"
+#include "totem-private.h"
+#include "totem-sidebar.h"
+#include "totem-statusbar.h"
+#include "bacon-video-widget.h"
+#include "totem-uri.h"
+
+#include "totem-profile.h"
+
+#define TOTEM_MAX_RECENT_ITEM_LEN 40
+
+/* Callback functions for GtkBuilder */
+G_MODULE_EXPORT void open_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void open_location_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void eject_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void properties_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void play_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void quit_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void preferences_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void fullscreen_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_1_2_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_1_1_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_2_1_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_in_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_reset_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void zoom_out_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void next_angle_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_root_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_title_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_audio_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_angle_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void dvd_chapter_menu_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void next_chapter_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void previous_chapter_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void skip_forward_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void skip_backwards_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void volume_up_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void volume_down_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void contents_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void about_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void plugins_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void repeat_mode_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void shuffle_mode_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void show_controls_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void show_sidebar_action_callback (GtkToggleAction *action, Totem *totem);
+G_MODULE_EXPORT void aspect_ratio_changed_callback (GtkRadioAction *action, GtkRadioAction *current, Totem *totem);
+G_MODULE_EXPORT void select_subtitle_action_callback (GtkAction *action, Totem *totem);
+G_MODULE_EXPORT void clear_playlist_action_callback (GtkAction *action, Totem *totem);
+
+/* Helper function to escape underscores in labels
+ * before putting them in menu items */
+static char *
+escape_label_for_menu (const char *name)
+{
+	char *new, **a;
+
+	a = g_strsplit (name, "_", -1);
+	new = g_strjoinv ("__", a);
+	g_strfreev (a);
+
+	return new;
+}
+
+/* Subtitle and language menus */
+static void
+totem_g_list_deep_free (GList *list)
+{
+	GList *l;
+
+	for (l = list; l != NULL; l = l->next)
+		g_free (l->data);
+	g_list_free (list);
+}
+
+static void
+subtitles_changed_callback (GtkRadioAction *action, GtkRadioAction *current,
+		Totem *totem)
+{
+	int rank;
+
+	rank = gtk_radio_action_get_current_value (current);
+
+	bacon_video_widget_set_subtitle (totem->bvw, rank);
+}
+
+
+static void
+languages_changed_callback (GtkRadioAction *action, GtkRadioAction *current,
+		Totem *totem)
+{
+	int rank;
+
+	rank = gtk_radio_action_get_current_value (current);
+
+	bacon_video_widget_set_language (totem->bvw, rank);
+}
+
+static GtkAction *
+add_lang_action (Totem *totem, GtkActionGroup *action_group, guint ui_id,
+		const char **paths, const char *prefix, const char *lang, 
+		int lang_id, int lang_index, GSList **group)
+{
+	const char *full_lang;
+	char *label;
+	char *name;
+	GtkAction *action;
+	guint i;
+
+	full_lang = gst_tag_get_language_name (lang);
+
+	if (lang_index > 1) {
+		char *num_lang;
+
+		num_lang = g_strdup_printf ("%s #%u",
+					    full_lang ? full_lang : lang,
+					    lang_index);
+		label = escape_label_for_menu (num_lang);
+		g_free (num_lang);
+	} else {
+		label = escape_label_for_menu (full_lang ? full_lang : lang);
+	}
+
+	name = g_strdup_printf ("%s-%d", prefix, lang_id);
+
+	action = g_object_new (GTK_TYPE_RADIO_ACTION,
+			       "name", name,
+			       "label", label,
+			       "value", lang_id,
+			       NULL);
+	g_free (label);
+
+	gtk_radio_action_set_group (GTK_RADIO_ACTION (action), *group);
+	*group = gtk_radio_action_get_group (GTK_RADIO_ACTION (action));
+	gtk_action_group_add_action (action_group, action);
+	g_object_unref (action);
+	for (i = 0; paths[i] != NULL; i++) {
+		gtk_ui_manager_add_ui (totem->ui_manager, ui_id,
+				       paths[i], name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
+	}
+	g_free (name);
+
+	return action;
+}
+
+static GtkAction *
+create_lang_actions (Totem *totem, GtkActionGroup *action_group, guint ui_id,
+		const char **paths, const char *prefix, GList *list,
+		gboolean is_lang)
+{
+	GtkAction *action = NULL;
+	unsigned int i, *hash_value;
+	GList *l;
+	GSList *group = NULL;
+	GHashTable *lookup;
+	char *action_data;
+
+	if (is_lang == FALSE) {
+		add_lang_action (totem, action_group, ui_id, paths, prefix,
+		                /* Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD */
+				_("None"), -2, 0, &group);
+	}
+
+	action = add_lang_action (totem, action_group, ui_id, paths, prefix,
+	                          /* Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD */
+	                          C_("Language", "Auto"), -1, 0, &group);
+
+	i = 0;
+	lookup = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
+
+	for (l = list; l != NULL; l = l->next)
+	{
+		guint num;
+
+		hash_value = g_hash_table_lookup (lookup, l->data);
+		if (hash_value == NULL) {
+			num = 0;
+			action_data = g_strdup (l->data);
+			g_hash_table_insert (lookup, l->data, GINT_TO_POINTER (1));
+		} else {
+			num = GPOINTER_TO_INT (hash_value);
+			action_data = g_strdup (l->data);
+			g_hash_table_replace (lookup, l->data, GINT_TO_POINTER (num + 1));
+		}
+
+		add_lang_action (totem, action_group, ui_id, paths, prefix,
+				 action_data, i, num + 1, &group);
+		g_free (action_data);
+ 		i++;
+	}
+
+	g_hash_table_destroy (lookup);
+
+	return action;
+}
+
+static gboolean
+totem_sublang_equal_lists (GList *orig, GList *new)
+{
+	GList *o, *n;
+	gboolean retval;
+
+	if ((orig == NULL && new != NULL) || (orig != NULL && new == NULL))
+		return FALSE;
+	if (orig == NULL && new == NULL)
+		return TRUE;
+
+	if (g_list_length (orig) != g_list_length (new))
+		return FALSE;
+
+	retval = TRUE;
+	o = orig;
+	n = new;
+	while (o != NULL && n != NULL && retval != FALSE)
+	{
+		if (g_str_equal (o->data, n->data) == FALSE)
+			retval = FALSE;
+                o = g_list_next (o);
+                n = g_list_next (n);
+	}
+
+	return retval;
+}
+
+static void
+totem_languages_update (Totem *totem, GList *list)
+{
+	GtkAction *action;
+	const char *paths[3] = { "/tmw-menubar/sound/languages/placeholder", "/totem-main-popup/popup-languages/placeholder", NULL };
+	int current;
+
+	/* Remove old UI */
+	gtk_ui_manager_remove_ui (totem->ui_manager, totem->languages_ui_id);
+	gtk_ui_manager_ensure_update (totem->ui_manager);
+
+	/* Create new ActionGroup */
+	if (totem->languages_action_group) {
+		gtk_ui_manager_remove_action_group (totem->ui_manager,
+				totem->languages_action_group);
+		g_object_unref (totem->languages_action_group);
+	}
+	totem->languages_action_group = gtk_action_group_new ("languages-action-group");
+	gtk_ui_manager_insert_action_group (totem->ui_manager,
+			totem->languages_action_group, -1);
+
+	if (list != NULL) {
+		action = create_lang_actions (totem, totem->languages_action_group,
+				totem->languages_ui_id,
+				paths,
+			       	"languages", list, TRUE);
+		gtk_ui_manager_ensure_update (totem->ui_manager);
+
+		current = bacon_video_widget_get_language (totem->bvw);
+		gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action),
+				current);
+		g_signal_connect (G_OBJECT (action), "changed",
+				G_CALLBACK (languages_changed_callback), totem);
+	}
+
+	totem_g_list_deep_free (totem->language_list);
+	totem->language_list = list;
+}
+
+static void
+totem_subtitles_update (Totem *totem, GList *list)
+{
+	GtkAction *action;
+	int current;
+	const char *paths[3] = { "/tmw-menubar/view/subtitles/placeholder", "/totem-main-popup/popup-subtitles/placeholder", NULL };
+
+	/* Remove old UI */
+	gtk_ui_manager_remove_ui (totem->ui_manager, totem->subtitles_ui_id);
+	gtk_ui_manager_ensure_update (totem->ui_manager);
+
+	/* Create new ActionGroup */
+	if (totem->subtitles_action_group) {
+		gtk_ui_manager_remove_action_group (totem->ui_manager,
+				totem->subtitles_action_group);
+		g_object_unref (totem->subtitles_action_group);
+	}
+	totem->subtitles_action_group = gtk_action_group_new ("subtitles-action-group");
+	gtk_ui_manager_insert_action_group (totem->ui_manager,
+			totem->subtitles_action_group, -1);
+
+
+	if (list != NULL) {
+		action = create_lang_actions (totem, totem->subtitles_action_group,
+				totem->subtitles_ui_id,
+				paths,
+			       	"subtitles", list, FALSE);
+		gtk_ui_manager_ensure_update (totem->ui_manager);
+
+		current = bacon_video_widget_get_subtitle (totem->bvw);
+		gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action),
+				current);
+		g_signal_connect (G_OBJECT (action), "changed",
+				G_CALLBACK (subtitles_changed_callback), totem);
+	}
+
+	totem_g_list_deep_free (totem->subtitles_list);
+	totem->subtitles_list = list;
+}
+
+void
+totem_sublang_update (Totem *totem)
+{
+	GList *list;
+
+	list = bacon_video_widget_get_languages (totem->bvw);
+	if (totem_sublang_equal_lists (totem->language_list, list) == TRUE) {
+		totem_g_list_deep_free (list);
+	} else {
+		totem_languages_update (totem, list);
+	}
+
+	list = bacon_video_widget_get_subtitles (totem->bvw);
+	if (totem_sublang_equal_lists (totem->subtitles_list, list) == TRUE) {
+		totem_g_list_deep_free (list);
+	} else {
+		totem_subtitles_update (totem, list);
+	}
+}
+
+void
+totem_sublang_exit (Totem *totem)
+{
+	totem_g_list_deep_free (totem->subtitles_list);
+	totem_g_list_deep_free (totem->language_list);
+}
+
+/* Recent files */
+static void
+connect_proxy_cb (GtkActionGroup *action_group,
+                  GtkAction *action,
+                  GtkWidget *proxy,
+                  gpointer data)
+{
+        GtkLabel *label;
+
+        if (!GTK_IS_MENU_ITEM (proxy))
+                return;
+
+        label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (proxy)));
+
+        gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
+        gtk_label_set_max_width_chars (label,TOTEM_MAX_RECENT_ITEM_LEN);
+}
+
+static void
+on_recent_file_item_activated (GtkAction *action,
+                               Totem *totem)
+{
+	GtkRecentInfo *recent_info;
+	const gchar *uri, *display_name;
+
+	recent_info = g_object_get_data (G_OBJECT (action), "recent-info");
+	uri = gtk_recent_info_get_uri (recent_info);
+	display_name = gtk_recent_info_get_display_name (recent_info);
+
+	totem_add_to_playlist_and_play (totem, uri, display_name, FALSE);
+}
+
+static gint
+totem_compare_recent_items (GtkRecentInfo *a, GtkRecentInfo *b)
+{
+	gboolean has_totem_a, has_totem_b;
+
+	has_totem_a = gtk_recent_info_has_group (a, "Totem");
+	has_totem_b = gtk_recent_info_has_group (b, "Totem");
+
+	if (has_totem_a && has_totem_b) {
+		time_t time_a, time_b;
+
+		time_a = gtk_recent_info_get_modified (a);
+		time_b = gtk_recent_info_get_modified (b);
+
+		return (time_b - time_a);
+	} else if (has_totem_a) {
+		return -1;
+	} else if (has_totem_b) {
+		return 1;
+	}
+
+	return 0;
+}
+
+static void
+totem_recent_manager_changed_callback (GtkRecentManager *recent_manager, Totem *totem)
+{
+        GList *items, *totem_items, *l;
+        guint n_items = 0;
+
+        if (totem->recent_ui_id != 0) {
+                gtk_ui_manager_remove_ui (totem->ui_manager, totem->recent_ui_id);
+                gtk_ui_manager_ensure_update (totem->ui_manager);
+        }
+
+        if (totem->recent_action_group) {
+                gtk_ui_manager_remove_action_group (totem->ui_manager,
+                                totem->recent_action_group);
+        }
+
+        totem->recent_action_group = gtk_action_group_new ("recent-action-group");
+        g_signal_connect (totem->recent_action_group, "connect-proxy",
+                          G_CALLBACK (connect_proxy_cb), NULL);
+        gtk_ui_manager_insert_action_group (totem->ui_manager,
+                        totem->recent_action_group, -1);
+        g_object_unref (totem->recent_action_group);
+
+        totem->recent_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
+        items = gtk_recent_manager_get_items (recent_manager);
+
+	/* Remove the non-Totem items */
+	totem_items = NULL;
+        for (l = items; l && l->data; l = l->next) {
+                GtkRecentInfo *info;
+
+                info = (GtkRecentInfo *) l->data;
+
+                if (gtk_recent_info_has_group (info, "Totem")) {
+                	gtk_recent_info_ref (info);
+                	totem_items = g_list_prepend (totem_items, info);
+		}
+	}
+	g_list_foreach (items, (GFunc) gtk_recent_info_unref, NULL);
+        g_list_free (items);
+
+        totem_items = g_list_sort (totem_items, (GCompareFunc) totem_compare_recent_items);
+
+        for (l = totem_items; l && l->data; l = l->next) {
+                GtkRecentInfo *info;
+                GtkAction     *action;
+                char           action_name[32];
+                const char    *display_name;
+                char          *label;
+                char          *escaped_label;
+                const gchar   *mime_type;
+                gchar         *content_type;
+                GIcon         *icon = NULL;
+
+                info = (GtkRecentInfo *) l->data;
+
+                if (!gtk_recent_info_has_group (info, "Totem"))
+                        continue;
+
+                g_snprintf (action_name, sizeof (action_name), "RecentFile%u", n_items);
+
+                display_name = gtk_recent_info_get_display_name (info);
+                escaped_label = escape_label_for_menu (display_name);
+
+                label = g_strdup_printf ("_%d.  %s", n_items + 1, escaped_label);
+                g_free (escaped_label);
+
+                action = gtk_action_new (action_name, label, NULL, NULL);
+                g_object_set_data_full (G_OBJECT (action), "recent-info",
+                                        gtk_recent_info_ref (info),
+                                        (GDestroyNotify) gtk_recent_info_unref);
+                g_signal_connect (G_OBJECT (action), "activate",
+                                  G_CALLBACK (on_recent_file_item_activated),
+                                  totem);
+
+                mime_type = gtk_recent_info_get_mime_type (info);
+                content_type = g_content_type_from_mime_type (mime_type);
+                if (content_type != NULL) {
+                        icon = g_content_type_get_icon (content_type);
+                        g_free (content_type);
+                }
+                if (icon != NULL) {
+                        gtk_action_set_gicon (action, icon);
+                        gtk_action_set_always_show_image (action, TRUE);
+                        g_object_unref (icon);
+                }
+
+                gtk_action_group_add_action (totem->recent_action_group,
+                                            action);
+                g_object_unref (action);
+
+                gtk_ui_manager_add_ui (totem->ui_manager, totem->recent_ui_id,
+                                      "/tmw-menubar/movie/recent-placeholder",
+                                      label, action_name, GTK_UI_MANAGER_MENUITEM,
+                                      FALSE);
+                g_free (label);
+
+                if (++n_items == 5)
+                        break;
+        }
+
+        g_list_foreach (totem_items, (GFunc) gtk_recent_info_unref, NULL);
+        g_list_free (totem_items);
+}
+
+void
+totem_setup_recent (Totem *totem)
+{
+	totem->recent_manager = gtk_recent_manager_get_default ();
+	totem->recent_action_group = NULL;
+	totem->recent_ui_id = 0;
+
+	g_signal_connect (G_OBJECT (totem->recent_manager), "changed",
+			G_CALLBACK (totem_recent_manager_changed_callback),
+			totem);
+
+	totem_recent_manager_changed_callback (totem->recent_manager, totem);
+}
+
+static void
+recent_info_cb (GFile *file,
+		GAsyncResult *res,
+		Totem *totem)
+{
+	GtkRecentData data;
+	char *groups[] = { NULL, NULL };
+	GFileInfo *file_info;
+	const char *uri, *display_name;
+
+	memset (&data, 0, sizeof (data));
+
+	file_info = g_file_query_info_finish (file, res, NULL);
+	uri = g_object_get_data (G_OBJECT (file), "uri");
+	display_name = g_object_get_data (G_OBJECT (file), "display_name");
+
+	/* Probably an unsupported URI scheme */
+	if (file_info == NULL) {
+		data.display_name = g_strdup (display_name);
+		/* Bogus mime-type, we just want it added */
+		data.mime_type = g_strdup ("video/x-totem-stream");
+		groups[0] = (gchar*) "TotemStreams";
+	} else {
+		data.mime_type = g_strdup (g_file_info_get_content_type (file_info));
+		data.display_name = g_strdup (g_file_info_get_display_name (file_info));
+		g_object_unref (file_info);
+		groups[0] = (gchar*) "Totem";
+	}
+
+	data.app_name = g_strdup (g_get_application_name ());
+	data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
+	data.groups = groups;
+	if (gtk_recent_manager_add_full (totem->recent_manager,
+					 uri, &data) == FALSE) {
+		g_warning ("Couldn't add recent file for '%s'", uri);
+	}
+
+	g_free (data.display_name);
+	g_free (data.mime_type);
+	g_free (data.app_name);
+	g_free (data.app_exec);
+
+	g_object_unref (file);
+}
+
+void
+totem_action_add_recent (Totem      *totem,
+			 const char *uri,
+			 const char *display_name,
+			 const char *content_type)
+{
+	GFile *file;
+
+	if (totem_is_special_mrl (uri) != FALSE)
+		return;
+
+	/* If we already have a content-type, the display_name is
+	 * probably decent as well */
+	if (content_type != NULL) {
+		GtkRecentData data;
+		char *groups[] = { NULL, NULL };
+
+		memset (&data, 0, sizeof (data));
+
+		data.mime_type = (char *) content_type;
+		data.display_name = (char *) display_name;
+		groups[0] = (char*) "Totem";
+		data.app_name = (char *) g_get_application_name ();
+		data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
+		data.groups = groups;
+
+		if (gtk_recent_manager_add_full (totem->recent_manager,
+						 uri, &data) == FALSE) {
+			g_warning ("Couldn't add recent file for '%s'", uri);
+		}
+		g_free (data.app_exec);
+
+		return;
+	}
+
+	file = g_file_new_for_uri (uri);
+	g_object_set_data_full (G_OBJECT (file), "uri", g_strdup (uri), g_free);
+	g_object_set_data_full (G_OBJECT (file), "display_name", g_strdup (display_name), g_free);
+	g_file_query_info_async (file,
+				 G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+				 G_FILE_QUERY_INFO_NONE, 0, NULL, (GAsyncReadyCallback) recent_info_cb, totem);
+}
+
+/* Play Disc menu items */
+
+static void
+on_play_disc_activate (GtkAction *action, Totem *totem)
+{
+	char *device_path;
+
+	device_path = g_object_get_data (G_OBJECT (action), "device_path");
+	totem_action_play_media_device (totem, device_path);
+}
+
+static const char *
+get_icon_name_for_gicon (GtkIconTheme *theme,
+			 GIcon *icon)
+{
+	const char * const *icon_names;
+	const char *icon_name;
+	guint j;
+
+	icon_name = NULL;
+
+	if (G_IS_EMBLEMED_ICON (icon) != FALSE) {
+		GIcon *new_icon;
+		new_icon = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon));
+		g_object_unref (icon);
+		icon = g_object_ref (new_icon);
+	}
+
+	if (G_IS_THEMED_ICON (icon)) {
+		icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
+
+		for (j = 0; icon_names[j] != NULL; j++) {
+			icon_name = icon_names[j];
+			if (gtk_icon_theme_has_icon (theme, icon_name) != FALSE)
+				break;
+		}
+	}
+
+	return icon_name;
+}
+
+static char *
+unescape_archive_name (GFile *root)
+{
+	char *uri;
+	guint len;
+	char *escape1, *escape2;
+
+	uri = g_file_get_uri (root);
+
+	/* Remove trailing slash */
+	len = strlen (uri);
+	if (uri[len - 1] == '/')
+		uri[len - 1] = '\0';
+
+	/* Unescape the path */
+	escape1 = g_uri_unescape_string (uri + strlen ("archive://"), NULL);
+	escape2 = g_uri_unescape_string (escape1, NULL);
+	g_free (escape1);
+	g_free (uri);
+
+	return escape2;
+}
+
+static void
+add_mount_to_menu (GMount *mount,
+		   GtkIconTheme *theme,
+		   guint position,
+		   Totem *totem)
+{
+	char *name, *escaped_name, *label;
+	GtkAction *action;
+	GIcon *icon;
+	const char *icon_name;
+	char *device_path;
+
+	GVolume *volume;
+	GFile *root, *iso;
+	char **content_types;
+	gboolean has_content;
+	guint i;
+
+	/* Check whether we have an archive mount */
+	volume = g_mount_get_volume (mount);
+	if (volume != NULL) {
+		g_object_unref (volume);
+		return;
+	}
+
+	root = g_mount_get_root (mount);
+	if (g_file_has_uri_scheme (root, "archive") == FALSE) {
+		g_object_unref (root);
+		return;
+	}
+
+	/* Check whether it's a DVD or VCD image */
+	content_types = g_content_type_guess_for_tree (root);
+	if (content_types == NULL ||
+	    g_strv_length (content_types) == 0) {
+		g_strfreev (content_types);
+		g_object_unref (root);
+		return;
+	}
+
+	has_content = FALSE;
+	for (i = 0; content_types[i] != NULL; i++) {
+		/* XXX: Keep in sync with mime-type-list.txt */
+		if (g_str_equal (content_types[i], "x-content/video-dvd") ||
+		    g_str_equal (content_types[i], "x-content/video-vcd") ||
+		    g_str_equal (content_types[i], "x-content/video-svcd")) {
+			has_content = TRUE;
+			break;
+		}
+	}
+	g_strfreev (content_types);
+
+	if (has_content == FALSE) {
+		g_object_unref (root);
+		return;
+	}
+
+	device_path = unescape_archive_name (root);
+	g_object_unref (root);
+
+	/* And ensure it's a local path */
+	iso = g_file_new_for_uri (device_path);
+	g_free (device_path);
+	device_path = g_file_get_path (iso);
+	g_object_unref (iso);
+
+	/* Work out an icon to display */
+	icon = g_mount_get_icon (mount);
+	icon_name = get_icon_name_for_gicon (theme, icon);
+
+	/* Get the mount's pretty name for the menu label */
+	name = g_mount_get_name (mount);
+	g_strstrip (name);
+	escaped_name = escape_label_for_menu (name);
+	g_free (name);
+	/* Translators:
+	 * This is not a JPEG image, but a disc image, for example,
+	 * an ISO file */
+	label = g_strdup_printf (_("Play Image '%s'"), escaped_name);
+	g_free (escaped_name);
+
+	name = g_strdup_printf (_("device%d"), position);
+
+	action = gtk_action_new (name, label, NULL, NULL);
+	g_object_set (G_OBJECT (action),
+		      "icon-name", icon_name, NULL);
+	gtk_action_set_always_show_image (action, TRUE);
+	gtk_action_group_add_action (totem->devices_action_group, action);
+	g_object_unref (action);
+
+	gtk_ui_manager_add_ui (totem->ui_manager, totem->devices_ui_id,
+			       "/tmw-menubar/movie/devices-placeholder", name, name,
+			       GTK_UI_MANAGER_MENUITEM, FALSE);
+
+	g_free (name);
+	g_free (label);
+	g_object_unref (icon);
+
+	g_object_set_data_full (G_OBJECT (action),
+				"device_path", device_path,
+				(GDestroyNotify) g_free);
+
+	g_signal_connect (G_OBJECT (action), "activate",
+			  G_CALLBACK (on_play_disc_activate), totem);
+}
+
+static void
+add_volume_to_menu (GVolume *volume,
+		    GDrive *drive,
+		    GtkIconTheme *theme,
+		    guint position,
+		    Totem *totem)
+{
+	char *name, *escaped_name, *label;
+	GtkAction *action;
+	gboolean disabled;
+	GIcon *icon;
+	const char *icon_name;
+	char *device_path;
+	GtkWidget *menu_item;
+	char *menu_item_path;
+
+	disabled = FALSE;
+	device_path = NULL;
+
+	/* Add devices with blank CDs and audio CDs in them, but disable them */
+	if (drive != NULL) {
+		device_path = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+		if (device_path == NULL)
+			return;
+	}
+
+	/* Check whether we have a media... */
+	if (drive != NULL &&
+	    g_drive_has_media (drive) == FALSE) {
+		disabled = TRUE;
+	} else {
+		/* ... Or an audio CD or a blank media */
+		GMount *mount;
+		GFile *root;
+
+		mount = g_volume_get_mount (volume);
+		if (mount != NULL) {
+			root = g_mount_get_root (mount);
+			g_object_unref (mount);
+
+			if (g_file_has_uri_scheme (root, "burn") != FALSE || g_file_has_uri_scheme (root, "cdda") != FALSE)
+				disabled = TRUE;
+			g_object_unref (root);
+		}
+	}
+
+	/* Work out an icon to display */
+	icon = g_volume_get_icon (volume);
+	icon_name = get_icon_name_for_gicon (theme, icon);
+
+	/* Get the volume's pretty name for the menu label */
+	name = g_volume_get_name (volume);
+	g_strstrip (name);
+	escaped_name = escape_label_for_menu (name);
+	g_free (name);
+	label = g_strdup_printf (_("Play Disc '%s'"), escaped_name);
+	g_free (escaped_name);
+
+	name = g_strdup_printf (_("device%d"), position);
+
+	action = gtk_action_new (name, label, NULL, NULL);
+	g_object_set (G_OBJECT (action),
+		      "icon-name", icon_name,
+		      "sensitive", !disabled, NULL);
+	gtk_action_group_add_action (totem->devices_action_group, action);
+	g_object_unref (action);
+
+	gtk_ui_manager_add_ui (totem->ui_manager, totem->devices_ui_id,
+			       "/tmw-menubar/movie/devices-placeholder", name, name,
+			       GTK_UI_MANAGER_MENUITEM, FALSE);
+
+	/* TODO: This can be made cleaner once bug #589842 is fixed */
+	menu_item_path = g_strdup_printf ("/tmw-menubar/movie/devices-placeholder/%s", name);
+	menu_item = gtk_ui_manager_get_widget (totem->ui_manager, menu_item_path);
+	g_free (menu_item_path);
+
+	if (menu_item != NULL)
+		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menu_item), TRUE);
+
+	g_free (name);
+	g_free (label);
+	g_object_unref (icon);
+
+	if (disabled != FALSE) {
+		g_free (device_path);
+		return;
+	}
+
+	g_object_set_data_full (G_OBJECT (action),
+				"device_path", device_path,
+				(GDestroyNotify) g_free);
+
+	g_signal_connect (G_OBJECT (action), "activate",
+			  G_CALLBACK (on_play_disc_activate), totem);
+}
+
+static void
+add_drive_to_menu (GDrive *drive,
+		   GtkIconTheme *theme,
+		   guint position,
+		   Totem *totem)
+{
+	GList *volumes, *i;
+
+	/* FIXME: We used to explicitly check whether it was a CD/DVD drive
+	 * Use:
+	 * udi = g_volume_get_identifier (i->data, G_VOLUME_IDENTIFIER_KIND_HAL_UDI); */
+	if (g_drive_can_eject (drive) == FALSE)
+		return;
+
+	/* Repeat for all the drive's volumes */
+	volumes = g_drive_get_volumes (drive);
+
+	for (i = volumes; i != NULL; i = i->next) {
+		GVolume *volume = i->data;
+		add_volume_to_menu (volume, drive, theme, position, totem);
+		g_object_unref (volume);
+	}
+
+	g_list_free (volumes);
+}
+
+static void
+update_drive_menu_items (GtkMenuItem *movie_menuitem, Totem *totem)
+{
+	GList *drives, *mounts, *i;
+	GtkIconTheme *theme;
+	guint position;
+
+	/* Add any suitable devices to the menu */
+	position = 0;
+
+	theme = gtk_icon_theme_get_default ();
+
+	drives = g_volume_monitor_get_connected_drives (totem->monitor);
+	for (i = drives; i != NULL; i = i->next) {
+		GDrive *drive = i->data;
+
+		position++;
+		add_drive_to_menu (drive, theme, position, totem);
+		g_object_unref (drive);
+	}
+	g_list_free (drives);
+
+	/* Look for mounted archives */
+	mounts = g_volume_monitor_get_mounts (totem->monitor);
+	for (i = mounts; i != NULL; i = i->next) {
+		GMount *mount = i->data;
+
+		position++;
+		add_mount_to_menu (mount, theme, position, totem);
+		g_object_unref (mount);
+	}
+	g_list_free (mounts);
+
+	totem->drives_changed = FALSE;
+}
+
+static void
+on_movie_menu_select (GtkMenuItem *movie_menuitem, Totem *totem)
+{
+	if (totem->drives_changed == FALSE)
+		return;
+
+	/* Remove old UI */
+	gtk_ui_manager_remove_ui (totem->ui_manager, totem->devices_ui_id);
+	gtk_ui_manager_ensure_update (totem->ui_manager);
+
+	/* Create new ActionGroup */
+	if (totem->devices_action_group) {
+		gtk_ui_manager_remove_action_group (totem->ui_manager,
+				totem->devices_action_group);
+		g_object_unref (totem->devices_action_group);
+	}
+	totem->devices_action_group = gtk_action_group_new ("devices-action-group");
+	gtk_ui_manager_insert_action_group (totem->ui_manager,
+			totem->devices_action_group, -1);
+
+	update_drive_menu_items (movie_menuitem, totem);
+
+	gtk_ui_manager_ensure_update (totem->ui_manager);
+}
+
+static void
+on_g_volume_monitor_event (GVolumeMonitor *monitor,
+			   gpointer *device,
+			   Totem *totem)
+{
+	totem->drives_changed = TRUE;
+}
+
+void
+totem_setup_play_disc (Totem *totem)
+{
+	GtkWidget *item;
+
+	item = gtk_ui_manager_get_widget (totem->ui_manager, "/tmw-menubar/movie");
+	g_signal_connect (G_OBJECT (item), "select",
+			G_CALLBACK (on_movie_menu_select), totem);
+
+	g_signal_connect (G_OBJECT (totem->monitor),
+			"volume-added",
+			G_CALLBACK (on_g_volume_monitor_event), totem);
+	g_signal_connect (G_OBJECT (totem->monitor),
+			"volume-removed",
+			G_CALLBACK (on_g_volume_monitor_event), totem);
+	g_signal_connect (G_OBJECT (totem->monitor),
+			"mount-added",
+			G_CALLBACK (on_g_volume_monitor_event), totem);
+	g_signal_connect (G_OBJECT (totem->monitor),
+			"mount-removed",
+			G_CALLBACK (on_g_volume_monitor_event), totem);
+
+	totem->drives_changed = TRUE;
+}
+
+void
+open_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_open (totem);
+}
+
+void
+open_location_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_open_location (totem);
+}
+
+void
+eject_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_eject (totem);
+}
+
+void
+properties_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_show_properties (totem);
+}
+
+void
+play_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_play_pause (totem);
+}
+
+G_GNUC_NORETURN void
+quit_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_exit (totem);
+}
+
+void
+preferences_action_callback (GtkAction *action, Totem *totem)
+{
+	gtk_widget_show (totem->prefs);
+}
+
+void
+fullscreen_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_fullscreen_toggle (totem);
+}
+
+void
+zoom_1_2_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_set_scale_ratio (totem, 0.5); 
+}
+
+void
+zoom_1_1_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_set_scale_ratio (totem, 1);
+}
+
+void
+zoom_2_1_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_set_scale_ratio (totem, 2);
+}
+
+void
+zoom_in_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_zoom_relative (totem, ZOOM_IN_OFFSET);
+}
+
+void
+zoom_reset_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_zoom_reset (totem);
+}
+
+void
+zoom_out_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET);
+}
+
+void
+select_subtitle_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_playlist_select_subtitle_dialog (totem->playlist,
+					       TOTEM_PLAYLIST_DIALOG_PLAYING);
+} 
+
+void
+next_angle_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_next_angle (totem);
+}
+
+void
+dvd_root_menu_action_callback (GtkAction *action, Totem *totem)
+{
+        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU);
+}
+
+void
+dvd_title_menu_action_callback (GtkAction *action, Totem *totem)
+{
+        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_TITLE_MENU);
+}
+
+void
+dvd_audio_menu_action_callback (GtkAction *action, Totem *totem)
+{
+        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_AUDIO_MENU);
+}
+
+void
+dvd_angle_menu_action_callback (GtkAction *action, Totem *totem)
+{
+        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ANGLE_MENU);
+}
+
+void
+dvd_chapter_menu_action_callback (GtkAction *action, Totem *totem)
+{
+        bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_CHAPTER_MENU);
+}
+
+void
+next_chapter_action_callback (GtkAction *action, Totem *totem)
+{
+	TOTEM_PROFILE (totem_action_next (totem));
+}
+
+void
+previous_chapter_action_callback (GtkAction *action, Totem *totem)
+{
+	TOTEM_PROFILE (totem_action_previous (totem));
+}
+
+void
+skip_forward_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_seek_relative (totem, SEEK_FORWARD_OFFSET * 1000, FALSE);
+}
+
+void
+skip_backwards_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_seek_relative (totem, SEEK_BACKWARD_OFFSET * 1000, FALSE);
+}
+
+void
+volume_up_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_volume_relative (totem, VOLUME_UP_OFFSET);
+}
+
+void
+volume_down_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_volume_relative (totem, VOLUME_DOWN_OFFSET);
+}
+
+void
+contents_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_action_show_help (totem);
+}
+
+void
+about_action_callback (GtkAction *action, Totem *totem)
+{
+	char *backend_version, *description;
+
+	const char *authors[] =
+	{
+		"Bastien Nocera <[e-mail]>",
+		"Ronald Bultje <[e-mail]>",
+		"Julien Moutte <[e-mail]> (GStreamer backend)",
+		"Tim-Philipp M\303\274ller <tim\100centricular\056net> (GStreamer backend)",
+		"Philip Withnall <[e-mail]>",
+		NULL
+	};
+	const char *artists[] = { "Jakub Steiner <[e-mail]>", NULL };
+	#include "../help/totem-docs.h"
+	char *license = totem_interface_get_license ();
+
+	backend_version = bacon_video_widget_get_backend_name (totem->bvw);
+	/* This lists the back-end type and version, such as
+	 * Movie Player using GStreamer 0.10.1 */
+	description = g_strdup_printf (_("Movie Player using %s"), backend_version);
+
+	gtk_show_about_dialog (GTK_WINDOW (totem->win),
+				     "version", VERSION,
+				     "copyright", _("Copyright \xc2\xa9 2002-2009 Bastien Nocera"),
+				     "comments", description,
+				     "authors", authors,
+				     "documenters", documentation_credits,
+				     "artists", artists,
+				     "translator-credits", _("translator-credits"),
+				     "logo-icon-name", "totem",
+				     "license", license,
+				     "wrap-license", TRUE,
+				     "website-label", _("Totem Website"),
+				     "website", "http://projects.gnome.org/totem/",
+				     NULL);
+
+	g_free (backend_version);
+	g_free (description);
+	g_free (license);
+}
+
+static gboolean
+totem_plugins_window_delete_cb (GtkWidget *window,
+				   GdkEventAny *event,
+				   gpointer data)
+{
+	gtk_widget_hide (window);
+
+	return TRUE;
+}
+
+static void
+totem_plugins_response_cb (GtkDialog *dialog,
+			      int response_id,
+			      gpointer data)
+{
+	gtk_widget_hide (GTK_WIDGET (dialog));
+}
+
+
+void
+plugins_action_callback (GtkAction *action, Totem *totem)
+{
+	if (totem->plugins == NULL) {
+		GtkWidget *manager;
+
+		totem->plugins = gtk_dialog_new_with_buttons (_("Configure Plugins"),
+							      GTK_WINDOW (totem->win),
+							      GTK_DIALOG_DESTROY_WITH_PARENT,
+							      GTK_STOCK_CLOSE,
+							      GTK_RESPONSE_CLOSE,
+							      NULL);
+		gtk_container_set_border_width (GTK_CONTAINER (totem->plugins), 5);
+		gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (totem->plugins))), 2);
+
+		g_signal_connect_object (G_OBJECT (totem->plugins),
+					 "delete_event",
+					 G_CALLBACK (totem_plugins_window_delete_cb),
+					 NULL, 0);
+		g_signal_connect_object (G_OBJECT (totem->plugins),
+					 "response",
+					 G_CALLBACK (totem_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 (gtk_dialog_get_content_area (GTK_DIALOG (totem->plugins))),
+				    manager, TRUE, TRUE, 0);
+		gtk_window_set_default_size (GTK_WINDOW (totem->plugins), 600, 400);
+	}
+
+	gtk_window_present (GTK_WINDOW (totem->plugins));
+}
+
+void
+repeat_mode_action_callback (GtkToggleAction *action, Totem *totem)
+{
+	totem_playlist_set_repeat (totem->playlist,
+			gtk_toggle_action_get_active (action));
+}
+
+void
+shuffle_mode_action_callback (GtkToggleAction *action, Totem *totem)
+{
+	totem_playlist_set_shuffle (totem->playlist,
+			gtk_toggle_action_get_active (action));
+}
+
+void
+show_controls_action_callback (GtkToggleAction *action, Totem *totem)
+{
+	gboolean show;
+
+	show = gtk_toggle_action_get_active (action);
+
+	/* Let's update our controls visibility */
+	if (show)
+		totem->controls_visibility = TOTEM_CONTROLS_VISIBLE;
+	else
+		totem->controls_visibility = TOTEM_CONTROLS_HIDDEN;
+
+	show_controls (totem, FALSE);
+}
+
+void
+show_sidebar_action_callback (GtkToggleAction *action, Totem *totem)
+{
+	if (totem_is_fullscreen (totem))
+		return;
+
+	totem_sidebar_toggle (totem, gtk_toggle_action_get_active (action));
+}
+
+void
+aspect_ratio_changed_callback (GtkRadioAction *action, GtkRadioAction *current, Totem *totem)
+{
+	totem_action_set_aspect_ratio (totem, gtk_radio_action_get_current_value (current));
+}
+
+void
+clear_playlist_action_callback (GtkAction *action, Totem *totem)
+{
+	totem_playlist_clear (totem->playlist);
+	totem_action_set_mrl (totem, NULL, NULL);
+}
+
+/* Show help in status bar when selecting (hovering over) a menu item. */
+static void
+menu_item_select_cb (GtkMenuItem *proxy, Totem *totem)
+{
+	GtkAction *action;
+	const gchar *message;
+
+	action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
+	g_return_if_fail (action != NULL);
+
+	message = gtk_action_get_tooltip (action);
+	if (message)
+		totem_statusbar_push_help (TOTEM_STATUSBAR (totem->statusbar), message);
+}
+
+static void
+menu_item_deselect_cb (GtkMenuItem *proxy, Totem *totem)
+{
+	totem_statusbar_pop_help (TOTEM_STATUSBAR (totem->statusbar));
+}
+
+static void
+setup_action (Totem *totem, GtkAction *action)
+{
+	GSList *proxies;
+	for (proxies = gtk_action_get_proxies (action); proxies != NULL; proxies = proxies->next) {
+		if (GTK_IS_MENU_ITEM (proxies->data)) {
+			g_signal_connect (proxies->data, "select", G_CALLBACK (menu_item_select_cb), totem);
+			g_signal_connect (proxies->data, "deselect", G_CALLBACK (menu_item_deselect_cb), totem);
+		}
+
+	}
+}
+
+static void
+setup_menu_items (Totem *totem)
+{
+	GList *action_groups;
+
+	/* FIXME: We can remove this once GTK+ bug #574001 is fixed */
+	for (action_groups = gtk_ui_manager_get_action_groups (totem->ui_manager);
+	     action_groups != NULL; action_groups = action_groups->next) {
+		GtkActionGroup *action_group = GTK_ACTION_GROUP (action_groups->data);
+		GList *actions;
+		for (actions = gtk_action_group_list_actions (action_group); actions != NULL; actions = actions->next) {
+			setup_action (totem, GTK_ACTION (actions->data));
+		}
+	}
+}
+
+void
+totem_ui_manager_setup (Totem *totem)
+{
+	totem->main_action_group = GTK_ACTION_GROUP (gtk_builder_get_object (totem->xml, "main-action-group"));
+	totem->zoom_action_group = GTK_ACTION_GROUP (gtk_builder_get_object (totem->xml, "zoom-action-group"));
+
+	/* FIXME: Moving these to GtkBuilder depends on bug #457631 */
+	if (gtk_widget_get_direction (totem->win) == GTK_TEXT_DIR_RTL) {
+		GtkActionGroup *action_group = GTK_ACTION_GROUP (gtk_builder_get_object (totem->xml, "skip-action-group"));
+		GtkAction *action;
+
+		action = gtk_action_group_get_action (action_group, "skip-forward");
+		gtk_action_set_accel_path (action, "Left");
+
+		action = gtk_action_group_get_action (action_group, "skip-backwards");
+		gtk_action_set_accel_path (action, "Right");
+	}
+
+	totem->ui_manager = GTK_UI_MANAGER (gtk_builder_get_object (totem->xml, "totem-ui-manager"));
+
+	setup_menu_items (totem);
+
+	totem->devices_action_group = NULL;
+	totem->devices_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
+	totem->languages_action_group = NULL;
+	totem->languages_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
+	totem->subtitles_action_group = NULL;
+	totem->subtitles_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
+}
+

=== added directory '.pc/03_default_options.patch'
=== added directory '.pc/03_default_options.patch/data'
=== added file '.pc/03_default_options.patch/data/org.gnome.totem.gschema.xml.in.in'
--- .pc/03_default_options.patch/data/org.gnome.totem.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ .pc/03_default_options.patch/data/org.gnome.totem.gschema.xml.in.in	2011-10-26 10:18:23 +0000
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+	<schema id="org.gnome.totem" path="/org/gnome/Totem/" gettext-domain="@GETTEXT_PACKAGE@">
+		<key name="lock-screensaver-on-audio" type="b">
+			<default>true</default>
+			<_summary>Allow the screensaver to activate when playing audio</_summary>
+			<_description>Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers.</_description>
+		</key>
+		<key name="show-visualizations" type="b">
+			<default>true</default>
+			<_summary>Show visual effects when no video is displayed</_summary>
+			<_description>Show visual effects when playing an audio only file.</_description>
+		</key>
+		<key name="visualization-name" type="s">
+			<default>'goom'</default>
+			<_summary>Name of the visual effects plugin</_summary>
+		</key>
+		<key name="brightness" type="i">
+			<default>32767</default>
+			<_summary>The brightness of the video</_summary>
+		</key>
+		<key name="contrast" type="i">
+			<default>32767</default>
+			<_summary>The contrast of the video</_summary>
+		</key>
+		<key name="hue" type="i">
+			<default>32767</default>
+			<_summary>The hue of the video</_summary>
+		</key>
+		<key name="saturation" type="i">
+			<default>32767</default>
+			<_summary>The saturation of the video</_summary>
+		</key>
+		<key name="auto-resize" type="b">
+			<default>false</default>
+			<_summary>Resize the canvas automatically on file load</_summary>
+		</key>
+		<key name="connection-speed" enum="org.gnome.totem.BvwConnectionSpeed">
+			<default>'lan'</default>
+			<_summary>Network connection speed</_summary>
+			<_description>Approximate network connection speed, used to select quality on media over the network.</_description>
+		</key>
+		<key name="repeat" type="b">
+			<default>false</default>
+			<_summary>Repeat mode</_summary>
+		</key>
+		<key name="shuffle" type="b">
+			<default>false</default>
+			<_summary>Shuffle mode</_summary>
+		</key>
+		<key name="disable-deinterlacing" type="b">
+			<default>false</default>
+			<_summary>Whether to disable deinterlacing for interlaced movies</_summary>
+		</key>
+		<key name="debug" type="b">
+			<default>false</default>
+			<_summary>Whether to enable debug for the playback engine</_summary>
+		</key>
+		<key name="audio-output-type" enum="org.gnome.totem.BvwAudioOutputType">
+			<default>'stereo'</default>
+			<_summary>Type of audio output to use</_summary>
+		</key>
+		<key name="visualization-quality" enum="org.gnome.totem.BvwVisualizationQuality">
+			<default>'small'</default>
+			<_summary>Visualization quality setting</_summary>
+			<_description>Quality setting for the audio visualization.</_description>
+		</key>
+		<key name="network-buffer-threshold" type="d">
+			<default>2</default>
+			<_summary>Network buffering threshold</_summary>
+			<_description>Amount of data to buffer for network streams before starting to display the stream (in seconds).</_description>
+		</key>
+		<key name="subtitle-font" type="s">
+			<default>'Sans Bold 20'</default>
+			<_summary>Subtitle font</_summary>
+			<_description>Pango font description for subtitle rendering.</_description>
+		</key>
+		<key name="subtitle-encoding" type="s">
+			<default l10n="messages" context="subtitle-encoding">
+				<!-- Translators: This is default subtitle encoding
+				     character set. You can change this to be the most common
+				     encoding for fansub subtitles in your language. File a bug
+				     against Totem, and leave UTF-8 as the default if in doubt. -->
+				'UTF-8'</default>
+			<_summary>Subtitle encoding</_summary>
+			<_description>Encoding character set for subtitle.</_description>
+		</key>
+		<key name="open-uri" type="s">
+			<default>''</default>
+			<_summary>Default location for the "Open..." dialogs</_summary>
+			<_description>Default location for the "Open..." dialogs. Default is the current directory.</_description>
+		</key>
+		<key name="screenshot-save-uri" type="s">
+			<default>''</default>
+			<_summary>Default location for the "Take Screenshot" dialogs</_summary>
+			<_description>Default location for the "Take Screenshot" dialogs. Default is the Pictures directory.</_description>
+		</key>
+		<key name="disable-user-plugins" type="b">
+			<default>false</default>
+			<_summary>Whether to disable the plugins in the user's home directory</_summary>
+		</key>
+		<key name="disable-keyboard-shortcuts" type="b">
+			<default>false</default>
+			<_summary>Whether to disable the keyboard shortcuts</_summary>
+		</key>
+		<key name="autoload-subtitles" type="b">
+			<default>false</default>
+			<_summary>Whether to autoload text subtitle files when a movie is loaded</_summary>
+		</key>
+		<key name="autoload-chapters" type="b">
+			<default>true</default>
+			<_summary>Whether to autoload external chapter files when a movie is loaded</_summary>
+		</key>
+		<key name="remember-position" type="b">
+			<default>false</default>
+			<_summary>Whether to remember the position of played audio/video files when pausing or closing them</_summary>
+		</key>
+		<key name="active-plugins" type="as">
+			<default>['skipto','chapters','screenshot','media_player_keys','screensaver','movie-properties','save-file']</default>
+			<_summary>Active plugins list</_summary>
+			<_description>A list of the names of the plugins which are currently active (loaded and running).</_description>
+		</key>
+	</schema>
+</schemalist>

=== added directory '.pc/04_port_to_gobject.patch'
=== added directory '.pc/04_port_to_gobject.patch/src'
=== added directory '.pc/04_port_to_gobject.patch/src/plugins'
=== added directory '.pc/04_port_to_gobject.patch/src/plugins/coherence_upnp'
=== added file '.pc/04_port_to_gobject.patch/src/plugins/coherence_upnp/coherence_upnp.py'
--- .pc/04_port_to_gobject.patch/src/plugins/coherence_upnp/coherence_upnp.py	1970-01-01 00:00:00 +0000
+++ .pc/04_port_to_gobject.patch/src/plugins/coherence_upnp/coherence_upnp.py	2011-10-26 10:18:23 +0000
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+
+# Licensed under the MIT license
+# http://opensource.org/licenses/mit-license.php
+
+# Copyright 2008, Frank Scholz <[e-mail]>
+
+from gi.repository import Peas
+from gi.repository import Gtk
+from gi.repository import Totem
+
+from coherence.ui.av_widgets import TreeWidget
+from coherence.ui.av_widgets import UDN_COLUMN,UPNP_CLASS_COLUMN,SERVICE_COLUMN
+
+gettext.textdomain("totem")
+
+D_ = gettext.dgettext
+_ = gettext.gettext
+
+class UPnPClient(gobject.GObject, Peas.Activatable):
+    __gtype_name__ = 'UPnPClient'
+
+    object = gobject.property(type = gobject.GObject)
+
+    def __init__ (self):
+        self.totem_object = None
+        self.ui = TreeWidget()
+        self.ui.window.set_shadow_type(gtk.SHADOW_IN)
+        self.ui.cb_item_right_click = self.button_pressed
+        self.ui.window.show_all()
+        selection = self.ui.treeview.get_selection()
+        selection.set_mode(gtk.SELECTION_MULTIPLE)
+
+    def button_pressed(self, widget, event):
+        if event.button == 3:
+            x = int(event.x)
+            y = int(event.y)
+            try:
+                row_path,column,_,_ = self.ui.treeview.get_path_at_pos(x, y)
+                selection = self.ui.treeview.get_selection()
+                if not selection.path_is_selected(row_path):
+                    self.ui.treeview.set_cursor(row_path,column,False)
+                print "button_pressed", row_path, (row_path[0],)
+                iter = self.ui.store.get_iter((row_path[0],))
+                udn, = self.ui.store.get(iter,UDN_COLUMN)
+                iter = self.ui.store.get_iter(row_path)
+                upnp_class,url = self.ui.store.get(iter,UPNP_CLASS_COLUMN,SERVICE_COLUMN)
+                print udn, upnp_class, url
+                if(not upnp_class.startswith('object.container') and
+                   not upnp_class == 'root'):
+                    self.create_item_context(has_delete=self.ui.device_has_action(udn,'ContentDirectory','DestroyObject'))
+                    self.context.popup(None,None,None,event.button,event.time)
+                    return 1
+            except TypeError:
+                pass
+            return 1
+
+    def create_item_context(self,has_delete=False):
+        """ create context menu for right click in treeview item"""
+
+        def action(menu, text):
+            selection = self.ui.treeview.get_selection()
+            model, selected_rows = selection.get_selected_rows()
+            if text == 'item.delete':
+                for row_path in selected_rows:
+                    self.ui.destroy_object(row_path)
+                return
+            if(len(selected_rows) > 0 and
+               text ==' item.play'):
+                row_path = selected_rows.pop(0)
+                iter = self.ui.store.get_iter(row_path)
+                url, = self.ui.store.get(iter,SERVICE_COLUMN)
+                self.totem_object.action_remote(totem.REMOTE_COMMAND_REPLACE,url)
+                self.totem_object.action_remote(totem.REMOTE_COMMAND_PLAY,url)
+            for row_path in selected_rows:
+                iter = self.ui.store.get_iter(row_path)
+                url, = self.ui.store.get(iter,SERVICE_COLUMN)
+                self.totem_object.action_remote(totem.REMOTE_COMMAND_ENQUEUE,url)
+                self.totem_object.action_remote(totem.REMOTE_COMMAND_PLAY,url)
+
+        if not hasattr(self, 'context_no_delete'):
+            self.context_no_delete = gtk.Menu()
+            # Translators: this refers to a media file
+            play_menu = gtk.MenuItem(_(u"Play"))
+            play_menu.connect("activate", action, 'item.play')
+            # Translators: this refers to a media file
+            enqueue_menu = gtk.MenuItem(_(u"Enqueue"))
+            enqueue_menu.connect("activate", action, 'item.enqueue')
+            self.context_no_delete.append(play_menu)
+            self.context_no_delete.append(enqueue_menu)
+            self.context_no_delete.show_all()
+
+        if not hasattr(self, 'context_with_delete'):
+            self.context_with_delete = gtk.Menu()
+            # Translators: this refers to a media file
+            play_menu = gtk.MenuItem(_(u"Play"))
+            play_menu.connect("activate", action, 'item.play')
+            # Translators: this refers to a media file
+            enqueue_menu = gtk.MenuItem(_(u"Enqueue"))
+            enqueue_menu.connect("activate", action, 'item.enqueue')
+            self.context_with_delete.append(play_menu)
+            self.context_with_delete.append(enqueue_menu)
+            self.context_with_delete.append(gtk.SeparatorMenuItem())
+            # Translators: this refers to a media file
+            menu = gtk.MenuItem(_(u"Delete"))
+            menu.connect("activate", action, 'item.delete')
+            self.context_with_delete.append(menu)
+            self.context_with_delete.show_all()
+
+        if has_delete:
+            self.context = self.context_with_delete
+        else:
+            self.context = self.context_no_delete
+
+    def do_activate (self):
+        self.totem_object = self.object
+        self.totem_object.add_sidebar_page ("upnp-coherence", _(u"Coherence DLNA/UPnP Client"), self.ui.window)
+
+        def load_and_play(url):
+            self.totem_object.add_to_playlist_and_play (url, '', True)
+
+        self.ui.cb_item_dbl_click = load_and_play
+
+    def do_deactivate (self):
+        self.totem_object.remove_sidebar_page ("upnp-coherence")

=== added directory '.pc/04_port_to_gobject.patch/src/plugins/dbus-service'
=== added file '.pc/04_port_to_gobject.patch/src/plugins/dbus-service/dbus-service.py'
--- .pc/04_port_to_gobject.patch/src/plugins/dbus-service/dbus-service.py	1970-01-01 00:00:00 +0000
+++ .pc/04_port_to_gobject.patch/src/plugins/dbus-service/dbus-service.py	2011-10-26 10:18:23 +0000
@@ -0,0 +1,291 @@
+## Totem D-Bus plugin
+## Copyright (C) 2009 Lucky <[e-mail]>
+## Copyright (C) 2009 Philip Withnall <[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 of the License, or
+## (at your option) any later 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.
+##
+## Sunday 13th May 2007: Bastien Nocera: Add exception clause.
+## See license_change file for details.
+
+import gobject
+from gi.repository import Peas
+from gi.repository import Gtk
+from gi.repository import Totem