+++ /dev/null
-diff --git a/shell/main.c b/shell/main.c
-index 71dde32..5d478fa 100644
---- a/shell/main.c
-+++ b/shell/main.c
-@@ -73,6 +73,10 @@
- #include "rb-playlist-manager.h"
- #include "rb-playlist-manager-glue.h"
-
-+#ifdef ENABLE_PYTHON
-+#include "rb-python-module.h"
-+#endif
-+
- #define HAVE_LIBGNOME_GOPTION defined(GNOME_PARAM_GOPTION_CONTEXT)
-
- static gboolean debug = FALSE;
-@@ -322,6 +326,15 @@ main (int argc, char **argv)
-
- rb_profile_start ("mainloop");
- #ifdef ENABLE_PYTHON
-+ {
-+ /* force python etc. to be loaded.
-+ * otherwise, pyg_begin_allow_threads will crash,
-+ * and even if it didn't, we wouldn't be able to provide
-+ * thread safety for plugins loaded later on.
-+ */
-+ GObject *z = g_object_new (RB_TYPE_PYTHON_MODULE, NULL);
-+ g_object_unref (z);
-+ }
- pyg_begin_allow_threads;
- #endif
- gtk_main ();
+++ /dev/null
-diff -urN rhythmbox-0.9.8/corelib/Makefile.am rhythmbox-0.9.8.new/corelib/Makefile.am
---- rhythmbox-0.9.8/corelib/Makefile.am 2007-01-02 02:56:23.000000000 +0100
-+++ rhythmbox-0.9.8.new/corelib/Makefile.am 2007-02-21 17:58:12.000000000 +0100
-@@ -19,7 +19,9 @@
- $(top_builddir)/metadata/librbmetadata.la \
- $(top_builddir)/widgets/librbwidgets.la \
- $(top_builddir)/backends/librbbackends.la \
-- $(top_builddir)/lib/librb.la
-+ $(top_builddir)/lib/librb.la \
-+ $(NOTIFY_LIBS)
-+
-
- librhythmbox_core_la_LDFLAGS = -export-dynamic
-
-diff -urN rhythmbox-0.9.8/plugins/daap/Makefile.am rhythmbox-0.9.8.new/plugins/daap/Makefile.am
---- rhythmbox-0.9.8/plugins/daap/Makefile.am 2007-02-01 08:13:57.000000000 +0100
-+++ rhythmbox-0.9.8.new/plugins/daap/Makefile.am 2007-02-21 17:57:51.000000000 +0100
-@@ -42,7 +42,8 @@
- libdaap_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
- libdaap_la_LIBADD = \
- $(DBUS_LIBS) \
-- $(MDNS_LIBS)
-+ $(MDNS_LIBS) \
-+ $(GSTREAMER_0_10_LIBS)
-
- INCLUDES = \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+++ /dev/null
-diff -urN rhythmbox-0.11.5/configure.ac rhythmbox-0.11.5.new/configure.ac
---- rhythmbox-0.11.5/configure.ac 2008-06-13 16:06:21.000000000 +0200
-+++ rhythmbox-0.11.5.new/configure.ac 2008-06-13 16:28:44.000000000 +0200
-@@ -21,7 +21,10 @@
- AC_PROG_CC
- AC_PROG_CXX
- AC_STDC_HEADERS
--AM_PROG_LIBTOOL()
-+AM_PROG_LIBTOOL
-+dnl when using libtool 2.x create libtool early, because it's used in configure
-+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
-+
- AC_C_BIGENDIAN
- AC_CHECK_SIZEOF(long)
-