rhythmbox r6074 - in trunk: . backends backends/gstreamer bindings/python corelib doc/reference lib metadata plugins plugins/audiocd plugins/audioscrobbler plugins/daap plugins/generic-player plugins/ipod plugins/mtpdevice shell sources

[jmatthew svn gnome org]

Author: jmatthew
Date: Fri Nov 21 12:19:05 2008
New Revision: 6074
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6074&view=rev

Log:
2008-11-21  Jonathan Matthew  <jonathan d14n org>

	* backends/Makefile.am:
	* backends/gstreamer/Makefile.am:
	* bindings/python/rb.override:
	* corelib/Makefile.am:
	* doc/reference/Makefile.am:
	* plugins/audiocd/rb-audiocd-source.c: (impl_get_ui_actions):
	* plugins/mtpdevice/rb-mtp-source.c: (rb_mtp_source_class_init):
	* plugins/generic-player/rb-generic-player-source.h:
	* shell/rb-removable-media-manager.c:
	(rb_removable_media_manager_set_uimanager), (copy_entry),
	(rb_removable_media_manager_cmd_copy_tracks):
	* shell/rb-removable-media-manager.h:
	* sources/Makefile.am:
	* sources/rb-library-source.c: (rb_library_source_class_init),
	(rb_library_source_dispose),
	(rb_library_source_edit_profile_clicked_cb),
	(impl_get_config_widget), (rb_library_source_preferences_sync),
	(build_filename), (impl_can_paste), (impl_paste):
	* sources/rb-removable-media-source.c:
	(rb_removable_media_source_class_init):
	Remove the option of disabling track transfer.

	* metadata/Makefile.am:
	Remove the option of disabling the metadata helper process.

	* metadata/rb-metadata-gst.c: (rb_metadata_can_save):
	Remove the option of disabling tag writing.

	* lib/rb-proxy-config.c: (rb_proxy_config_get_libsoup_uri):
	* lib/rb-proxy-config.h:
	* plugins/Makefile.am:
	* plugins/audioscrobbler/Makefile.am:
	* plugins/daap/Makefile.am:
	* shell/Makefile.am:
	Remove the option of disabling audioscrobbler/last.fm.  This means
	libsoup is always required.
	
	* plugins/ipod/rb-ipod-source.c: (rb_ipod_source_class_init),
	(rb_ipod_source_constructor), (create_ipod_song_from_entry),
	(ipod_path_from_unix_path):
	Remove the option of disabling ipod writing.

	* configure.ac:
	all of the above.

	libsoup and gnome-media-profiles are now mandatory.  #561142.


Modified:
   trunk/ChangeLog
   trunk/backends/Makefile.am
   trunk/backends/gstreamer/Makefile.am
   trunk/bindings/python/rb.override
   trunk/configure.ac
   trunk/corelib/Makefile.am
   trunk/doc/reference/Makefile.am
   trunk/lib/rb-proxy-config.c
   trunk/lib/rb-proxy-config.h
   trunk/metadata/Makefile.am
   trunk/metadata/rb-metadata-gst.c
   trunk/plugins/Makefile.am
   trunk/plugins/audiocd/rb-audiocd-source.c
   trunk/plugins/audioscrobbler/Makefile.am
   trunk/plugins/daap/Makefile.am
   trunk/plugins/generic-player/rb-generic-player-source.h
   trunk/plugins/ipod/rb-ipod-source.c
   trunk/plugins/mtpdevice/rb-mtp-source.c
   trunk/shell/Makefile.am
   trunk/shell/rb-removable-media-manager.c
   trunk/shell/rb-removable-media-manager.h
   trunk/sources/Makefile.am
   trunk/sources/rb-library-source.c
   trunk/sources/rb-removable-media-source.c

Modified: trunk/backends/Makefile.am
==============================================================================
--- trunk/backends/Makefile.am	(original)
+++ trunk/backends/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -5,6 +5,8 @@
 SUBDIRS = gstreamer 
 
 librbbackends_la_SOURCES =				\
+	rb-encoder.h 					\
+	rb-encoder.c					\
 	rb-player.h					\
 	rb-player.c					\
 	rb-player-gst-filter.h				\
@@ -33,9 +35,3 @@
 	$(LIBNAUTILUS_BURN_CFLAGS)			\
 	$(RHYTHMBOX_CFLAGS)
 
-if ENABLE_TRACK_TRANSFER
-librbbackends_la_SOURCES +=	\
-	rb-encoder.h 		\
-	rb-encoder.c
-endif
-

Modified: trunk/backends/gstreamer/Makefile.am
==============================================================================
--- trunk/backends/gstreamer/Makefile.am	(original)
+++ trunk/backends/gstreamer/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -3,6 +3,8 @@
 noinst_LTLIBRARIES = librbbackendsgstreamer.la
 
 librbbackendsgstreamer_la_SOURCES =			\
+	rb-encoder-gst.h				\
+	rb-encoder-gst.c				\
 	rb-player-gst.h					\
 	rb-player-gst.c					\
 	rb-player-gst-xfade.h				\
@@ -27,10 +29,3 @@
 	-I$(top_builddir)/lib 				\
 	$(RHYTHMBOX_CFLAGS)
 
-if ENABLE_TRACK_TRANSFER
-INCLUDES += $(GNOME_MEDIA_PROFILES_CFLAGS)
-librbbackendsgstreamer_la_SOURCES +=	\
-	rb-encoder-gst.h		\
-	rb-encoder-gst.c
-endif
-

Modified: trunk/bindings/python/rb.override
==============================================================================
--- trunk/bindings/python/rb.override	(original)
+++ trunk/bindings/python/rb.override	Fri Nov 21 12:19:05 2008
@@ -1318,7 +1318,6 @@
 static PyObject *
 _wrap_rb_removable_media_manager_queue_transfer(PyGObject *self, PyObject *args, PyObject *kwargs)
 {
-#ifdef ENABLE_TRACK_TRANSFER
 	static char *kwlist[] = { "entry", "dest", "mimetypes", "callback", "data", NULL };
 	PyObject *py_entry, *py_mimes;
 	char *dest = NULL;
@@ -1348,10 +1347,6 @@
 	g_list_free (mimes);
 	Py_INCREF(Py_None);
 	return Py_None;
-#else
-	PyErr_SetString(PyExc_NotImplementedError, "Track transfer is disabled in this build of Rhythmbox");
-	return NULL;
-#endif
 }
 
 %%

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Nov 21 12:19:05 2008
@@ -66,8 +66,10 @@
 		  gtk+-2.0 >= $GTK_REQS			\
 		  glib-2.0 >= $GLIB_REQS		\
 		  gio-2.0 >= $GLIB_REQS			\
+		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
 		  libgnomeui-2.0			\
-		  libglade-2.0)
+		  libglade-2.0				\
+		  libsoup-2.4)
 
 PKG_CHECK_MODULES(TOTEM_PLPARSER, totem-plparser >= $TOTEM_PLPARSER_REQS, have_totem_plparser=yes, have_totem_plparser=no)
 if test x$have_totem_plparser != xyes; then
@@ -91,26 +93,6 @@
 fi
 AM_CONDITIONAL(HAVE_HAL, test x"$enable_hal" = xyes)
 
-dnl transfers
-AC_ARG_ENABLE(track-transfer,
-	      AC_HELP_STRING([--disable-track-transfer],
-			     [Disable track transfer support in rhythmbox]))
-if test x"$enable_track_transfer" != xno; then
-   PKG_CHECK_MODULES(GNOME_MEDIA_PROFILES,
-      gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS,
-      with_track_transfer=yes,
-      with_track_transfer=no)
-
-   if test "x$with_track_transfer" = xno -a "x$enable_track_transfer" = xyes; then
-      AC_MSG_ERROR([Track transfer support explicitly requested but gnome-media-profiles not found.])
-   fi
-
-   if test "x$with_track_transfer" = xyes; then
-      AC_DEFINE(ENABLE_TRACK_TRANSFER, 1, [Define if track transfer should be enabled])
-   fi
-fi
-AM_CONDITIONAL(ENABLE_TRACK_TRANSFER, test "x$with_track_transfer" = "xyes")
-
 
 dnl iPod support
 AC_ARG_WITH(ipod,
@@ -161,28 +143,6 @@
 AM_CONDITIONAL(USE_MTP, test x"$use_mtp" = xyes)
 
 
-dnl ipod writing
-AC_ARG_ENABLE(ipod-writing,
-	      AC_HELP_STRING([--disable-ipod-writing],
-			     [Disable support for writing to ipods in rhythmbox]))
-if test x"$enable_ipod_writing" != xno; then
-   if test "x$use_ipod" != xyes; then
-      if test "x$enable_ipod_writing" = xyes; then
-         AC_MSG_ERROR([iPod write support explicitly requested but iPod support is disabled.])
-      fi
-      enable_ipod_writing=no
-   elif test "x$with_track_transfer" != xyes; then
-      if test "x$enable_ipod_writing" = xyes; then
-         AC_MSG_ERROR([iPod write support explicitly requested but track transfer support is disabled.])
-      fi
-      enable_ipod_writing=no
-   else
-      AC_DEFINE(ENABLE_IPOD_WRITING, 1, [Define if ipod writing should be enabled])
-   fi
-fi
-
-
-
 dnl gnome-keyring support
 
 AC_ARG_WITH(gnome-keyring,
@@ -239,19 +199,6 @@
 RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $GSTREAMER_0_10_CFLAGS"
 RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $GSTREAMER_0_10_LIBS"
 
-dnl Tag writing
-AC_ARG_ENABLE(tag-writing,
-	      AC_HELP_STRING([--disable-tag-writing],
-			     [Disable tag writing support in rhythmbox]))
-if test x"$enable_tag_writing" != xno; then
-   AC_DEFINE(ENABLE_TAG_WRITING, 1, [Define if tag writing should be enabled])
-fi
-
-dnl Audioscrobbler
-AC_ARG_ENABLE(audioscrobbler,
-	      AC_HELP_STRING([--disable-audioscrobbler],
-			     [Disable Audioscrobbler support in Rhythmbox]))
-
 dnl DAAP (iTunes Music Shares)
 AC_ARG_ENABLE(daap,
 	      AC_HELP_STRING([--disable-daap],
@@ -329,42 +276,9 @@
     AC_SUBST(NOTIFY_LIBS)
 fi
 
-dnl Check for libsoup, needed for DAAP and audioscrobbler
-if test "x$enable_daap" != "xno" || test "x$enable_audioscrobbler" != "xno"; then
-	PKG_CHECK_MODULES(SOUP,                            \
-		libsoup-2.4,
-		have_libsoup=yes,
-		have_libsoup=no)
-	if test x"$have_libsoup" = "xyes"; then
-		AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup support is enabled])
-	fi
-fi
-
-AM_CONDITIONAL(USE_LIBSOUP, test x"$have_libsoup" = "xyes")
-
-
-dnl audioscrobbler support
-if test "x$enable_audioscrobbler" != "xno"; then
-	if test x"$have_libsoup" = "xno"; then
-		if test "x$enable_audioscrobbler" = "xyes"; then
-			AC_MSG_ERROR([AudioScrobbler support explicitly requested, but no libsoup found.  Install libsoup])
-		fi
-		enable_audioscrobbler=no
-	else
-		AC_DEFINE(WITH_AUDIOSCROBBLER, 1, [define if Audioscrobbler support should be enabled])
-	fi
-fi
-AM_CONDITIONAL(WITH_AUDIOSCROBBLER, test "x$enable_audioscrobbler" != "xno")
-
-
 dnl daap support
 if test "x$enable_daap" != "xno"; then
-	if test x"$have_libsoup" = "xno"; then
-		if test "x$enable_daap" = "xyes"; then
-			AC_MSG_ERROR([DAAP support explicitly requested, but no libsoup found.  Install libsoup])
-		fi
-		enable_daap=no
-	elif test x"$have_mdns" = xno; then
+	if test x"$have_mdns" = xno; then
 		if test "x$enable_daap" = "xyes"; then
 			AC_MSG_ERROR([DAAP support explicitly requested, but no mDNS implementation found.  Install Avahi])
 		fi
@@ -509,16 +423,6 @@
 DBUS_GLIB_BIN="`$PKG_CONFIG --variable=exec_prefix dbus-glib-1`/bin"
 AC_SUBST(DBUS_GLIB_BIN)
 
-dnl out-of-process metadata reader (requires dbus)
-AC_ARG_WITH(metadata-helper,
-	    AC_HELP_STRING([--with-metadata-helper],
-	    		   [Use a separate process for metadata reading]),,
-	    with_metadata_helper=auto)
-if test "x$with_metadata_helper" != xno; then
-	AC_DEFINE(WITH_METADATA_HELPER, 1, [Define if the metadata helper process is enabled])
-fi
-AM_CONDITIONAL(WITH_METADATA_HELPER, test "x$with_metadata_helper" != "xno")
-
 AM_GCONF_SOURCE_2
 
 dnl LIRC
@@ -938,16 +842,6 @@
 fi
 
 
-if test x"$enable_tag_writing" != xno; then
-        AC_MSG_NOTICE([** Tag writing is enabled])
-else
-	AC_MSG_NOTICE([   Tag writing is disabled])
-fi
-if test x"$with_track_transfer" = xyes; then
-        AC_MSG_NOTICE([** Track transfer is enabled])
-else
-	AC_MSG_NOTICE([   Track transfer is disabled])
-fi
 if test x"$enable_mmkeys" != "xyes"; then
 	AC_MSG_NOTICE([   Multimedia keys support is disabled])
 else
@@ -960,11 +854,7 @@
 fi
 
 if test x"$use_ipod" = xyes; then
-	if test x"$enable_ipod_writing" != xno; then
-		AC_MSG_NOTICE([** iPod integration enabled])
-	else
-		AC_MSG_NOTICE([** iPod integration enabled (read-only)])
-	fi
+	AC_MSG_NOTICE([** iPod integration enabled])
 else
 	AC_MSG_NOTICE([   iPod integration disabled])
 fi
@@ -1008,16 +898,6 @@
 else
 	AC_MSG_NOTICE([   gnome-keyring support disabled])
 fi
-if test x"$enable_audioscrobbler" != xno; then
-	AC_MSG_NOTICE([** Audioscrobbler support enabled])
-else
-	AC_MSG_NOTICE([   Audioscrobbler support disabled])
-fi
-if test x"$with_metadata_helper" != xno; then
-	AC_MSG_NOTICE([** Separate metadata helper process enabled])
-else
-	AC_MSG_NOTICE([   Separate metadata helper process disabled])
-fi
 if test x"$with_internal_libsexy" = xyes; then
 	AC_MSG_NOTICE([   using internal libsexy])
 else

Modified: trunk/corelib/Makefile.am
==============================================================================
--- trunk/corelib/Makefile.am	(original)
+++ trunk/corelib/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -13,9 +13,5 @@
 	$(top_builddir)/backends/librbbackends.la	\
 	$(top_builddir)/lib/librb.la
 
-if ENABLE_TRACK_TRANSFER
-librhythmbox_core_la_LIBADD += $(GNOME_MEDIA_PROFILES_LIBS)
-endif
-
 librhythmbox_core_la_LDFLAGS = -export-dynamic
 

Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am	(original)
+++ trunk/doc/reference/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -107,10 +107,5 @@
 	$(RHYTHMBOX_LIBS)				\
 	$(MORE_GTKDOC_LIBS)
 
-if ENABLE_TRACK_TRANSFER
-GTKDOC_LIBS +=	$(GNOME_MEDIA_PROFILES_LIBS) 
-endif
-
-
 include $(top_srcdir)/gtk-doc.make
 

Modified: trunk/lib/rb-proxy-config.c
==============================================================================
--- trunk/lib/rb-proxy-config.c	(original)
+++ trunk/lib/rb-proxy-config.c	Fri Nov 21 12:19:05 2008
@@ -260,7 +260,6 @@
 	}
 }
 
-#if defined(HAVE_LIBSOUP)
 /**
  * rb_proxy_config_get_libsoup_uri:
  * @config: a #RBProxyConfig
@@ -287,5 +286,4 @@
 
 	return uri;
 }
-#endif
 

Modified: trunk/lib/rb-proxy-config.h
==============================================================================
--- trunk/lib/rb-proxy-config.h	(original)
+++ trunk/lib/rb-proxy-config.h	Fri Nov 21 12:19:05 2008
@@ -31,9 +31,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#if defined(HAVE_LIBSOUP)
 #include <libsoup/soup.h>
-#endif
 
 G_BEGIN_DECLS
 
@@ -74,9 +72,7 @@
 
 RBProxyConfig *	rb_proxy_config_new (void);
 
-#if defined(HAVE_LIBSOUP)
 SoupURI *	rb_proxy_config_get_libsoup_uri (RBProxyConfig *config);
-#endif
 
 #endif	/* RB_PROXY_CONFIG_H */
 

Modified: trunk/metadata/Makefile.am
==============================================================================
--- trunk/metadata/Makefile.am	(original)
+++ trunk/metadata/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -11,8 +11,6 @@
 	$(RHYTHMBOX_CFLAGS)				\
 	$(NO_STRICT_ALIASING_CFLAGS)
 
-if WITH_METADATA_HELPER
-
 INSTALLED_METADATA_HELPER=`echo rhythmbox-metadata | sed '$(transform)'`
 
 INCLUDES += $(DBUS_CFLAGS)				\
@@ -68,18 +66,5 @@
 	-lgstpbutils-0.10				\
 	$(DBUS_LIBS)
 
-else
-
-noinst_LTLIBRARIES = librbmetadata.la
-
-librbmetadata_la_SOURCES = \
-	rb-metadata.h rb-metadata-common.c rb-metadata-gst.c
-
-
-librbmetadata_la_LIBADD =			\
-	$(RHYTHMBOX_LIBS)
-
-endif
-
 librbmetadata_la_LDFLAGS = -export-dynamic
 

Modified: trunk/metadata/rb-metadata-gst.c
==============================================================================
--- trunk/metadata/rb-metadata-gst.c	(original)
+++ trunk/metadata/rb-metadata-gst.c	Fri Nov 21 12:19:05 2008
@@ -1226,11 +1226,7 @@
 gboolean
 rb_metadata_can_save (RBMetaData *md, const char *mimetype)
 {
-#ifdef ENABLE_TAG_WRITING
 	return rb_metadata_gst_type_to_tag_function (md, mimetype) != NULL;
-#else
-	return FALSE;
-#endif
 }
 
 static void

Modified: trunk/plugins/Makefile.am
==============================================================================
--- trunk/plugins/Makefile.am	(original)
+++ trunk/plugins/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -2,6 +2,7 @@
 
 SUBDIRS = 						\
 	audiocd						\
+	audioscrobbler					\
 	generic-player					\
 	iradio						\
 	mmkeys						\
@@ -9,10 +10,6 @@
 	sample						\
 	visualizer
 
-if WITH_AUDIOSCROBBLER
-SUBDIRS += audioscrobbler
-endif
-
 if WITH_LIRC
 SUBDIRS += lirc
 endif

Modified: trunk/plugins/audiocd/rb-audiocd-source.c
==============================================================================
--- trunk/plugins/audiocd/rb-audiocd-source.c	(original)
+++ trunk/plugins/audiocd/rb-audiocd-source.c	Fri Nov 21 12:19:05 2008
@@ -755,9 +755,7 @@
 {
 	GList *actions = NULL;
 
-#ifdef ENABLE_TRACK_TRANSFER
 	actions = g_list_prepend (actions, g_strdup ("RemovableSourceCopyAllTracks"));
-#endif
 	actions = g_list_prepend (actions, g_strdup ("RemovableSourceEject"));
 
 	return actions;

Modified: trunk/plugins/audioscrobbler/Makefile.am
==============================================================================
--- trunk/plugins/audioscrobbler/Makefile.am	(original)
+++ trunk/plugins/audioscrobbler/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -17,7 +17,6 @@
 libaudioscrobbler_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libaudioscrobbler_la_LIBADD = 				\
 	$(top_builddir)/corelib/librhythmbox-core.la	\
-	$(SOUP_LIBS)					\
 	$(TOTEM_PLPARSER_LIBS)
 
 INCLUDES = 						\
@@ -37,7 +36,6 @@
 	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"		\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
-	$(SOUP_CFLAGS)					\
 	$(TOTEM_PLPARSER_CFLAGS)			\
 	$(RHYTHMBOX_CFLAGS)				\
 	-D_XOPEN_SOURCE -D_BSD_SOURCE

Modified: trunk/plugins/daap/Makefile.am
==============================================================================
--- trunk/plugins/daap/Makefile.am	(original)
+++ trunk/plugins/daap/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -31,7 +31,6 @@
 
 libdaap_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libdaap_la_LIBADD = 					\
-	$(SOUP_LIBS)					\
 	$(MDNS_LIBS)
 
 INCLUDES = 						\
@@ -55,7 +54,6 @@
 	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"		\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
-	$(SOUP_CFLAGS)					\
 	$(MDNS_CFLAGS)					\
 	$(RHYTHMBOX_CFLAGS)				\
 	-D_XOPEN_SOURCE -D_BSD_SOURCE

Modified: trunk/plugins/generic-player/rb-generic-player-source.h
==============================================================================
--- trunk/plugins/generic-player/rb-generic-player-source.h	(original)
+++ trunk/plugins/generic-player/rb-generic-player-source.h	Fri Nov 21 12:19:05 2008
@@ -61,10 +61,8 @@
 	char *		(*impl_uri_from_playlist_uri) (RBGenericPlayerSource *source, const char *uri);
 	char *		(*impl_uri_to_playlist_uri) (RBGenericPlayerSource *source, const char *uri);
 
-#if ENABLE_TRACK_TRANSFER
 	/* used for track transfer - returns the filename relative to the audio folder on the device */
 	char *		(*impl_build_filename) (RBGenericPlayerSource *source, RhythmDBEntry *entry);
-#endif
 } RBGenericPlayerSourceClass;
 
 RBRemovableMediaSource *rb_generic_player_source_new			(RBShell *shell, GMount *mount);

Modified: trunk/plugins/ipod/rb-ipod-source.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-source.c	(original)
+++ trunk/plugins/ipod/rb-ipod-source.c	Fri Nov 21 12:19:05 2008
@@ -68,7 +68,6 @@
 static void impl_delete_thyself (RBSource *source);
 static GList* impl_get_ui_actions (RBSource *source);
 
-#ifdef ENABLE_IPOD_WRITING
 static GList * impl_get_mime_types (RBRemovableMediaSource *source);
 static gboolean impl_track_added (RBRemovableMediaSource *source,
 				  RhythmDBEntry *entry,
@@ -90,7 +89,7 @@
                                              const gchar *property_name,
                                              const GValue *metadata,
                                              RBiPodSource *isource);
-#endif
+
 static RhythmDB *get_db_for_source (RBiPodSource *source);
 
 struct _PlayedEntry {
@@ -116,12 +115,10 @@
 	GQueue *offline_plays;
 } RBiPodSourcePrivate;
 
-#ifdef ENABLE_IPOD_WRITING
 typedef struct {
 	RBiPodSourcePrivate *priv;
 	GdkPixbuf *pixbuf;
 } RBiPodSongArtworkAddData;
-#endif
 
 RB_PLUGIN_DEFINE_TYPE(RBiPodSource,
 		      rb_ipod_source,
@@ -149,16 +146,11 @@
 	source_class->impl_can_rename = (RBSourceFeatureFunc) rb_true_function;
 	source_class->impl_get_ui_actions = impl_get_ui_actions;
 
-#ifdef ENABLE_IPOD_WRITING
 	source_class->impl_can_paste = (RBSourceFeatureFunc) rb_true_function;
 	rms_class->impl_should_paste = rb_removable_media_source_should_paste_no_duplicate;
 	rms_class->impl_track_added = impl_track_added;
 	rms_class->impl_build_dest_uri = impl_build_dest_uri;
 	rms_class->impl_get_mime_types = impl_get_mime_types;
-#else
-	source_class->impl_can_paste = (RBSourceFeatureFunc) rb_false_function;
-	rms_class->impl_track_added = NULL;
-#endif
 
 	browser_source_class->impl_get_paned_key = impl_get_paned_key;
 
@@ -212,14 +204,12 @@
 
 	rb_ipod_load_songs (source);
 
-#ifdef ENABLE_IPOD_WRITING                                      
         RhythmDB *db = get_db_for_source (RB_IPOD_SOURCE (source));
         g_signal_connect_object (db,
                                  "entry-extra-metadata-notify::rb:coverArt",
                                  G_CALLBACK (rb_ipod_song_artwork_add_cb),
                                  RB_IPOD_SOURCE(source), 0);
         g_object_unref (G_OBJECT (db));
-#endif
 
 	return G_OBJECT (source);
 }
@@ -455,8 +445,6 @@
 
 }
 
-#ifdef ENABLE_IPOD_WRITING
-
 /* FIXME:  these should go away once we compile against new-enough libgpod */
 #define MEDIATYPE_AUDIO         0x0001
 #define MEDIATYPE_PODCAST       0x0004
@@ -498,7 +486,6 @@
 
 	return track;
 }
-#endif
 
 static void add_offline_played_entry (RBiPodSource *source,
 				      RhythmDBEntry *entry,
@@ -1024,7 +1011,6 @@
 	g_list_free (sel);
 }
 
-#ifdef ENABLE_IPOD_WRITING
 static char *
 impl_build_dest_uri (RBRemovableMediaSource *source,
 		     RhythmDBEntry *entry,
@@ -1487,7 +1473,6 @@
 
 	return ipod_path;
 }
-#endif
 
 static void
 impl_delete_thyself (RBSource *source)
@@ -1528,8 +1513,6 @@
 	RB_SOURCE_CLASS (rb_ipod_source_parent_class)->impl_delete_thyself (source);
 }
 
-#ifdef ENABLE_IPOD_WRITING
-
 static GList *
 impl_get_mime_types (RBRemovableMediaSource *source)
 {
@@ -1542,8 +1525,6 @@
 	return ret;
 }
 
-#endif
-
 
 void
 rb_ipod_source_new_playlist (RBiPodSource *source)

Modified: trunk/plugins/mtpdevice/rb-mtp-source.c
==============================================================================
--- trunk/plugins/mtpdevice/rb-mtp-source.c	(original)
+++ trunk/plugins/mtpdevice/rb-mtp-source.c	Fri Nov 21 12:19:05 2008
@@ -115,10 +115,7 @@
 
 	source_class->impl_can_rename = (RBSourceFeatureFunc) rb_true_function;
 	source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
-#ifdef ENABLE_TRACK_TRANSFER
 	source_class->impl_can_paste = (RBSourceFeatureFunc) rb_true_function;
-	rms_class->impl_should_paste = rb_removable_media_source_should_paste_no_duplicate;
-#endif
 	source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
 	source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
 	source_class->impl_can_cut = (RBSourceFeatureFunc) rb_false_function;
@@ -134,6 +131,7 @@
 	rms_class->impl_track_added = impl_track_added;
 	rms_class->impl_build_dest_uri = impl_build_dest_uri;
 	rms_class->impl_get_mime_types = impl_get_mime_types;
+	rms_class->impl_should_paste = rb_removable_media_source_should_paste_no_duplicate;
 
 	g_type_class_add_private (klass, sizeof (RBMtpSourcePrivate));
 }

Modified: trunk/shell/Makefile.am
==============================================================================
--- trunk/shell/Makefile.am	(original)
+++ trunk/shell/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -101,11 +101,6 @@
 	$(top_builddir)/plugins/librbplugins.la		\
 	-lgstpbutils-0.10
 
-if USE_LIBSOUP
-rhythmbox_LDADD += $(SOUP_LIBS)
-INCLUDES += $(SOUP_CFLAGS)
-endif
-
 if USE_NOTIFY
 rhythmbox_LDADD += $(NOTIFY_LIBS)
 INCLUDES += $(NOTIFY_CFLAGS)

Modified: trunk/shell/rb-removable-media-manager.c
==============================================================================
--- trunk/shell/rb-removable-media-manager.c	(original)
+++ trunk/shell/rb-removable-media-manager.c	Fri Nov 21 12:19:05 2008
@@ -56,10 +56,7 @@
 #include "rhythmdb.h"
 #include "rb-marshal.h"
 #include "rb-util.h"
-
-#ifdef ENABLE_TRACK_TRANSFER
 #include "rb-encoder.h"
-#endif
 
 static void rb_removable_media_manager_class_init (RBRemovableMediaManagerClass *klass);
 static void rb_removable_media_manager_init (RBRemovableMediaManager *mgr);
@@ -96,9 +93,7 @@
 
 static gboolean rb_removable_media_manager_load_media (RBRemovableMediaManager *manager);
 
-#ifdef ENABLE_TRACK_TRANSFER
 static void do_transfer (RBRemovableMediaManager *manager);
-#endif
 static void rb_removable_media_manager_cmd_copy_tracks (GtkAction *action,
 							RBRemovableMediaManager *mgr);
 
@@ -719,13 +714,6 @@
 					      mgr);
 	}
 
-#ifndef ENABLE_TRACK_TRANSFER
-	{
-		action = gtk_action_group_get_action (priv->actiongroup, "RemovableSourceCopyAllTracks");
-		gtk_action_set_visible (action, FALSE);
-	}
-#endif
-
 	gtk_ui_manager_insert_action_group (priv->uimanager,
 					    priv->actiongroup,
 					    0);
@@ -952,7 +940,6 @@
 	g_list_free (list);
 }
 
-#ifdef ENABLE_TRACK_TRANSFER
 /* Track transfer */
 
 typedef struct {
@@ -1120,12 +1107,10 @@
 	*list = l;
 	return FALSE;
 }
-#endif
 
 static void
 rb_removable_media_manager_cmd_copy_tracks (GtkAction *action, RBRemovableMediaManager *mgr)
 {
-#ifdef ENABLE_TRACK_TRANSFER
 	RBRemovableMediaManagerPrivate *priv = GET_PRIVATE (mgr);
 	RBRemovableMediaSource *source;
 	RBLibrarySource *library;
@@ -1142,5 +1127,4 @@
 
 	g_object_unref (model);
 	g_object_unref (library);
-#endif
 }

Modified: trunk/shell/rb-removable-media-manager.h
==============================================================================
--- trunk/shell/rb-removable-media-manager.h	(original)
+++ trunk/shell/rb-removable-media-manager.h	Fri Nov 21 12:19:05 2008
@@ -80,14 +80,12 @@
 
 void			rb_removable_media_manager_scan (RBRemovableMediaManager *manager);
 
-#ifdef ENABLE_TRACK_TRANSFER
 void	rb_removable_media_manager_queue_transfer (RBRemovableMediaManager *mgr,
 						   RhythmDBEntry *entry,
 						   const char *dest,
 						   GList *mime_types,
 						   RBTransferCompleteCallback callback,
 						   gpointer userdata);
-#endif
 
 G_END_DECLS
 

Modified: trunk/sources/Makefile.am
==============================================================================
--- trunk/sources/Makefile.am	(original)
+++ trunk/sources/Makefile.am	Fri Nov 21 12:19:05 2008
@@ -66,11 +66,3 @@
 libsources_la_LDFLAGS = -export-dynamic
 libsourcesimpl_la_LDFLAGS = -export-dynamic
 
-if USE_LIBSOUP
-INCLUDES += $(SOUP_CFLAGS)
-endif
-
-if ENABLE_TRACK_TRANSFER
-INCLUDES +=$(GNOME_MEDIA_PROFILES_CFLAGS)
-endif
-

Modified: trunk/sources/rb-library-source.c
==============================================================================
--- trunk/sources/rb-library-source.c	(original)
+++ trunk/sources/rb-library-source.c	Fri Nov 21 12:19:05 2008
@@ -54,10 +54,8 @@
 #include <glib/gi18n.h>
 #include <glib-object.h>
 
-#ifdef ENABLE_TRACK_TRANSFER
 #include <profiles/gnome-media-profiles.h>
 #include <profiles/audio-profile-choose.h>
-#endif
 
 #include "rhythmdb.h"
 #include "rb-debug.h"
@@ -85,9 +83,7 @@
 static char *impl_get_paned_key (RBBrowserSource *source);
 static gboolean impl_receive_drag (RBSource *source, GtkSelectionData *data);
 static gboolean impl_can_paste (RBSource *asource);
-#ifdef ENABLE_TRACK_TRANSFER
 static void impl_paste (RBSource *source, GList *entries);
-#endif
 static guint impl_want_uri (RBSource *source, const char *uri);
 static gboolean impl_add_uri (RBSource *source, const char *uri, const char *title, const char *genre);
 
@@ -98,7 +94,6 @@
 						    guint cnxn_id,
 						    GConfEntry *entry,
 						    RBLibrarySource *source);
-#ifdef ENABLE_TRACK_TRANSFER
 static void rb_library_source_layout_path_changed (GConfClient *client,
 						   guint cnxn_id,
 						   GConfEntry *entry,
@@ -109,7 +104,6 @@
 						       RBLibrarySource *source);
 static void rb_library_source_edit_profile_clicked_cb (GtkButton *button,
 						       RBLibrarySource *source);
-#endif
 static void rb_library_source_ui_pref_changed (GConfClient *client,
 					       guint cnxn_id,
 					       GConfEntry *entry,
@@ -120,14 +114,12 @@
 static void rb_library_source_watch_toggled_cb (GtkToggleButton *button,
 						RBLibrarySource *source);
 static void rb_library_source_sync_child_sources (RBLibrarySource *source);
-#ifdef ENABLE_TRACK_TRANSFER
 static void rb_library_source_path_changed_cb (GtkComboBox *box,
 						RBLibrarySource *source);
 static void rb_library_source_filename_changed_cb (GtkComboBox *box,
 						   RBLibrarySource *source);
 static void rb_library_source_format_changed_cb (GtkWidget *widget,
 						 RBLibrarySource *source);
-#endif
 
 #define CONF_UI_LIBRARY_DIR CONF_PREFIX "/ui/library"
 #define CONF_STATE_LIBRARY_DIR CONF_PREFIX "/state/library"
@@ -135,7 +127,6 @@
 #define CONF_STATE_PANED_POSITION CONF_PREFIX "/state/library/paned_position"
 #define CONF_STATE_SHOW_BROWSER   CONF_PREFIX "/state/library/show_browser"
 
-#ifdef ENABLE_TRACK_TRANSFER
 typedef struct {
 	char *title;
 	char *path;
@@ -159,7 +150,6 @@
 	{N_("Number. Artist - Title"), "%tN. %ta - %tt"},
 };
 const int num_library_layout_filenames = G_N_ELEMENTS (library_layout_filenames);
-#endif
 
 struct RBLibrarySourcePrivate
 {
@@ -174,19 +164,15 @@
 
 	GtkWidget *library_location_entry;
 	GtkWidget *watch_library_check;
-#ifdef ENABLE_TRACK_TRANSFER
 	GtkWidget *layout_path_menu;
 	GtkWidget *layout_filename_menu;
 	GtkWidget *preferred_format_menu;
 	GtkWidget *layout_example_label;
-#endif
 
 	guint library_location_notify_id;
 	guint ui_dir_notify_id;
-#ifdef ENABLE_TRACK_TRANSFER
 	guint layout_path_notify_id;
 	guint layout_filename_notify_id;
-#endif
 };
 
 #define RB_LIBRARY_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RB_TYPE_LIBRARY_SOURCE, RBLibrarySourcePrivate))
@@ -209,9 +195,7 @@
 	source_class->impl_receive_drag = impl_receive_drag;
 	source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
 	source_class->impl_can_paste = (RBSourceFeatureFunc) impl_can_paste;
-#ifdef ENABLE_TRACK_TRANSFER
 	source_class->impl_paste = impl_paste;
-#endif
 	source_class->impl_want_uri = impl_want_uri;
 	source_class->impl_add_uri = impl_add_uri;
 
@@ -220,9 +204,7 @@
 
 	g_type_class_add_private (klass, sizeof (RBLibrarySourcePrivate));
 
-#ifdef ENABLE_TRACK_TRANSFER
 	gnome_media_profiles_init (eel_gconf_client_get_global ());
-#endif
 }
 
 static void
@@ -256,7 +238,7 @@
 		eel_gconf_notification_remove (source->priv->library_location_notify_id);
 		source->priv->library_location_notify_id = 0;
 	}
-#ifdef ENABLE_TRACK_TRANSFER
+
 	if (source->priv->layout_path_notify_id != 0) {
 		eel_gconf_notification_remove (source->priv->layout_path_notify_id);
 		source->priv->layout_path_notify_id = 0;
@@ -266,7 +248,6 @@
 		eel_gconf_notification_remove (source->priv->layout_filename_notify_id);
 		source->priv->layout_filename_notify_id = 0;
 	}
-#endif
 
 	G_OBJECT_CLASS (rb_library_source_parent_class)->dispose (object);
 }
@@ -422,7 +403,6 @@
 	return source;
 }
 
-#ifdef ENABLE_TRACK_TRANSFER
 static void
 rb_library_source_edit_profile_clicked_cb (GtkButton *button, RBLibrarySource *source)
 {
@@ -434,7 +414,6 @@
 	gtk_widget_show_all (dialog);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 }
-#endif
 
 static void
 rb_library_source_location_button_clicked_cb (GtkButton *button, RBLibrarySource *source)
@@ -470,10 +449,8 @@
 	RBLibrarySource *source = RB_LIBRARY_SOURCE (asource);
 	GtkWidget *tmp;
 	GladeXML *xml;
-#ifdef ENABLE_TRACK_TRANSFER
 	GtkWidget *label;
 	int i;
-#endif
 
 	if (source->priv->config_widget)
 		return source->priv->config_widget;
@@ -504,7 +481,6 @@
 			  G_CALLBACK (rb_library_source_watch_toggled_cb),
 			  asource);
 
-#ifdef ENABLE_TRACK_TRANSFER
 	rb_glade_boldify_label (xml, "library_structure_label");
 
 	tmp = glade_xml_get_widget (xml, "layout_path_menu_box");
@@ -552,11 +528,6 @@
 			  asource);
 
 	source->priv->layout_example_label = glade_xml_get_widget (xml, "layout_example_label");
-#else
-	tmp = glade_xml_get_widget (xml, "library_structure_vbox");
-	gtk_widget_set_no_show_all (tmp, TRUE);
-	gtk_widget_hide (tmp);
-#endif
 
 	g_object_unref (G_OBJECT (xml));
 
@@ -598,10 +569,8 @@
 rb_library_source_preferences_sync (RBLibrarySource *source)
 {
 	GSList *list;
-#ifdef ENABLE_TRACK_TRANSFER
 	char *str;
 	GConfClient *gconf_client;
-#endif
 
 	rb_debug ("syncing pref dialog state");
 
@@ -641,7 +610,6 @@
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (source->priv->watch_library_check),
 				      eel_gconf_get_boolean (CONF_MONITOR_LIBRARY));
 
-#ifdef ENABLE_TRACK_TRANSFER
 	/* preferred format */
 	str = eel_gconf_get_string (CONF_LIBRARY_PREFERRED_FORMAT);
 	if (str) {
@@ -665,7 +633,6 @@
 	rb_library_source_layout_filename_changed (gconf_client, -1,
 						   gconf_client_get_entry (gconf_client, CONF_LIBRARY_LAYOUT_FILENAME, NULL, TRUE, NULL),
 						   source);
-#endif
 }
 
 static gboolean
@@ -763,7 +730,6 @@
 	return TRUE;
 }
 
-#ifdef ENABLE_TRACK_TRANSFER
 static void
 rb_library_source_path_changed_cb (GtkComboBox *box, RBLibrarySource *source)
 {
@@ -1196,12 +1162,10 @@
 
 	return string;
 }
-#endif
 
 static gboolean
 impl_can_paste (RBSource *asource)
 {
-#ifdef ENABLE_TRACK_TRANSFER
 	GSList *list;
 	gboolean can_paste = TRUE;
 	char *str;
@@ -1222,12 +1186,8 @@
 	can_paste &= (str != NULL);
 	g_free (str);
 	return can_paste;
-#else
-	return FALSE;
-#endif
 }
 
-#ifdef ENABLE_TRACK_TRANSFER
 static void
 completed_cb (RhythmDBEntry *entry, const char *dest, guint64 dest_size, RBLibrarySource *source)
 {
@@ -1297,7 +1257,6 @@
 
 	g_object_unref (rm_mgr);
 }
-#endif
 
 static guint
 impl_want_uri (RBSource *source, const char *uri)

Modified: trunk/sources/rb-removable-media-source.c
==============================================================================
--- trunk/sources/rb-removable-media-source.c	(original)
+++ trunk/sources/rb-removable-media-source.c	Fri Nov 21 12:19:05 2008
@@ -64,9 +64,7 @@
 			                  GParamSpec *pspec);
 
 static void impl_delete_thyself (RBSource *source);
-#ifdef ENABLE_TRACK_TRANSFER
 static void impl_paste (RBSource *source, GList *entries);
-#endif
 static gboolean impl_receive_drag (RBSource *asource, GtkSelectionData *data);
 static gboolean impl_should_paste (RBRemovableMediaSource *source,
 				   RhythmDBEntry *entry);
@@ -106,9 +104,7 @@
 	source_class->impl_can_copy = (RBSourceFeatureFunc) rb_true_function;
 	source_class->impl_can_paste = (RBSourceFeatureFunc) rb_false_function;
 	source_class->impl_can_delete = (RBSourceFeatureFunc) rb_false_function;
-#ifdef ENABLE_TRACK_TRANSFER
   	source_class->impl_paste = impl_paste;
-#endif
   	source_class->impl_receive_drag = impl_receive_drag;
 	source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
 	source_class->impl_delete = NULL;
@@ -313,8 +309,6 @@
 	g_object_unref (db);
 }
 
-#ifdef ENABLE_TRACK_TRANSFER
-
 struct _TrackAddedData {
 	RBRemovableMediaSource *source;
 	char *mimetype;
@@ -436,8 +430,6 @@
 	g_object_unref (encoder);
 }
 
-#endif
-
 static guint
 impl_want_uri (RBSource *source, const char *uri)
 {