Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.261
diff -u -p -r1.261 configure.ac
--- configure.ac	6 Oct 2006 10:14:36 -0000	1.261
+++ configure.ac	20 Oct 2006 20:19:11 -0000
@@ -105,7 +105,7 @@ AC_ARG_WITH(ipod,
 	      with_ipod=auto)
 if test "x$with_ipod" != "xno"; then
 
-	PKG_CHECK_MODULES(IPOD, libgpod-1.0, have_libgpod=yes, have_libgpod=no)
+	PKG_CHECK_MODULES(IPOD, libgpod-1.0 >= 0.4, have_libgpod=yes, have_libgpod=no)
 	if test "x$have_libgpod" = "xno" -a "x$with_ipod" = "xyes"; then
 	  AC_MSG_ERROR([iPod explicitly requested but libgpod couldn't be found])
 	fi
@@ -116,11 +116,6 @@ if test "x$with_ipod" != "xno"; then
           if test "x$enable_hal" = xyes; then
 	     AC_DEFINE(WITH_IPOD_SUPPORT, 1, [Define if iPod support is enabled])
 	     use_ipod=yes
-
-	     PKG_CHECK_MODULES(IPOD_PHONE, libgpod-1.0 >= 0.3.3, support_phone=yes, support_phone=no)
-	     if test "x$support_phone" = xyes; then
-	        AC_DEFINE(IPOD_PHONE_SUPPORT, 1, [iPod support for phone])
-	     fi
 	  fi
 	  AC_SUBST(IPOD_CFLAGS)
 	  AC_SUBST(IPOD_LIBS)
Index: sources/rb-ipod-source.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/sources/rb-ipod-source.c,v
retrieving revision 1.66
diff -u -p -r1.66 rb-ipod-source.c
--- sources/rb-ipod-source.c	10 Oct 2006 11:26:02 -0000	1.66
+++ sources/rb-ipod-source.c	20 Oct 2006 20:19:22 -0000
@@ -45,7 +45,7 @@
 #include "rhythmdb.h"
 #include "rb-cut-and-paste-code.h"
 
-#ifdef IPOD_PHONE_SUPPORT
+#ifdef IPOD_SUPPORT
 #define PHONE_VENDOR_ID 0x22b8
 #define PHONE_PRODUCT_ID 0x4810
 #endif
@@ -595,7 +595,7 @@ rb_ipod_get_itunesdb_path (GnomeVFSVolum
 		return NULL;
 	}
 
-#ifdef IPOD_PHONE_SUPPORT
+#ifdef IPOD_SUPPORT
 	result = itdb_get_itunesdb_path (mount_point);
 #else
 	result = g_build_filename (mount_point,
@@ -693,7 +693,7 @@ hal_udi_is_ipod (const char *udi)
 
 	parent_name = libhal_device_get_property_string (ctx, parent_udi,
 			"storage.model", &error);
-#ifdef IPOD_PHONE_SUPPORT
+#ifdef IPOD_SUPPORT
 	{
 		char *spider_udi;
 		int vnd_id = 0;
