rhythmbox r6251 - in trunk: . plugins/generic-player

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Mar 26 01:39:48 2009
New Revision: 6251
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6251&view=rev

Log:
2009-03-26  Jonathan Matthew  <jonathan d14n org>

	* plugins/generic-player/Makefile.am:
	* plugins/generic-player/rb-generic-player-plugin.c:
	(rb_generic_player_plugin_class_init), (create_source_cb):
	* plugins/generic-player/rb-psp-source.c: (hal_udi_is_psp),
	(rb_psp_is_mount_player):
	Disable the PSP source if building without HAL.  Too many false
	positives.


Modified:
   trunk/ChangeLog
   trunk/plugins/generic-player/Makefile.am
   trunk/plugins/generic-player/rb-generic-player-plugin.c
   trunk/plugins/generic-player/rb-psp-source.c

Modified: trunk/plugins/generic-player/Makefile.am
==============================================================================
--- trunk/plugins/generic-player/Makefile.am	(original)
+++ trunk/plugins/generic-player/Makefile.am	Thu Mar 26 01:39:48 2009
@@ -6,14 +6,14 @@
 	rb-generic-player-source.c 			\
 	rb-generic-player-source.h	 		\
 	rb-generic-player-playlist-source.c		\
-	rb-generic-player-playlist-source.h		\
-	rb-psp-source.c					\
-	rb-psp-source.h
+	rb-generic-player-playlist-source.h
 
 if HAVE_HAL
 libgeneric_player_la_SOURCES +=				\
 	rb-nokia770-source.c				\
-	rb-nokia770-source.h
+	rb-nokia770-source.h				\
+	rb-psp-source.c					\
+	rb-psp-source.h
 endif
 
 libgeneric_player_la_LDFLAGS = 				\

Modified: trunk/plugins/generic-player/rb-generic-player-plugin.c
==============================================================================
--- trunk/plugins/generic-player/rb-generic-player-plugin.c	(original)
+++ trunk/plugins/generic-player/rb-generic-player-plugin.c	Thu Mar 26 01:39:48 2009
@@ -46,9 +46,9 @@
 #include "rb-removable-media-manager.h"
 #include "rb-generic-player-source.h"
 #include "rb-generic-player-playlist-source.h"
-#include "rb-psp-source.h"
 #ifdef HAVE_HAL
 #include "rb-nokia770-source.h"
+#include "rb-psp-source.h"
 #endif
 #include "rb-file-helpers.h"
 #include "rb-stock-icons.h"
@@ -116,8 +116,8 @@
 
 	RB_PLUGIN_REGISTER_TYPE(rb_generic_player_source);
 	RB_PLUGIN_REGISTER_TYPE(rb_generic_player_playlist_source);
-	RB_PLUGIN_REGISTER_TYPE(rb_psp_source);
 #ifdef HAVE_HAL
+	RB_PLUGIN_REGISTER_TYPE(rb_psp_source);
 	RB_PLUGIN_REGISTER_TYPE(rb_nokia770_source);
 #endif
 }
@@ -200,9 +200,9 @@
 {
 	RBSource *source = NULL;
 
+#ifdef HAVE_HAL
 	if (rb_psp_is_mount_player (mount))
 		source = RB_SOURCE (rb_psp_source_new (plugin->shell, mount));
-#ifdef HAVE_HAL
 	if (source == NULL && rb_nokia770_is_mount_player (mount))
 		source = RB_SOURCE (rb_nokia770_source_new (plugin->shell, mount));
 #endif

Modified: trunk/plugins/generic-player/rb-psp-source.c
==============================================================================
--- trunk/plugins/generic-player/rb-psp-source.c	(original)
+++ trunk/plugins/generic-player/rb-psp-source.c	Thu Mar 26 01:39:48 2009
@@ -37,10 +37,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#ifdef HAVE_HAL
 #include <libhal.h>
 #include <dbus/dbus.h>
-#endif
 
 #include "eel-gconf-extensions.h"
 #include "rb-psp-source.h"
@@ -273,8 +271,6 @@
 	}
 }
 
-#ifdef HAVE_HAL
-
 static gboolean
 hal_udi_is_psp (const char *udi)
 {
@@ -341,25 +337,13 @@
 
 	return result;
 }
-#endif
 
 gboolean
 rb_psp_is_mount_player (GMount *mount)
 {
-#ifndef HAVE_HAL
-	GFile *music_dir;
-#else
 	GVolume *volume;
-#endif
 	gboolean result = FALSE;
 
-#ifndef HAVE_HAL
-	music_dir = find_music_dir (mount);
-	if (music_dir != NULL) {
-		g_object_unref (music_dir);
-		result = TRUE;
-	}
-#else
 	volume = g_mount_get_volume (mount);
 	if (volume != NULL) {
 		char *str;
@@ -371,7 +355,6 @@
 		}
 		g_object_unref (volume);
 	}
-#endif
 	return result;
 }