[rhythmbox] fix a bunch of badly merged #include/#ifdef changes (oops)

[Jonathan Matthew <jmatthew src gnome org>]

commit cb09dc131c9dbfa78aa48835844ad13e8ec33697
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Aug 5 20:29:07 2009 +1000

    fix a bunch of badly merged #include/#ifdef changes (oops)

 lib/rb-util.c                                     |    5 -----
 plugins/generic-player/rb-generic-player-plugin.c |    6 ++----
 plugins/generic-player/rb-generic-player-source.c |    8 +++-----
 plugins/generic-player/rb-generic-player-source.h |    2 ++
 plugins/generic-player/rb-nokia770-source.c       |    4 ++--
 plugins/generic-player/rb-nokia770-source.h       |    2 ++
 plugins/generic-player/rb-psp-source.c            |    4 ++--
 plugins/generic-player/rb-psp-source.h            |    2 ++
 plugins/ipod/rb-ipod-helpers.c                    |    6 +-----
 plugins/ipod/rb-ipod-plugin.c                     |    2 ++
 shell/rb-removable-media-manager.c                |    7 ++++++-
 shell/rb-removable-media-manager.h                |    2 ++
 12 files changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/lib/rb-util.c b/lib/rb-util.c
index fc5f7c7..9d4cdcc 100644
--- a/lib/rb-util.c
+++ b/lib/rb-util.c
@@ -38,11 +38,6 @@
 #include <gobject/gvaluecollector.h>
 #include <gio/gio.h>
 
-#ifdef HAVE_HAL
-#include <libhal.h>
-#include <dbus/dbus.h>
-#endif
-
 #include "rb-util.h"
 #include "rb-debug.h"
 
diff --git a/plugins/generic-player/rb-generic-player-plugin.c b/plugins/generic-player/rb-generic-player-plugin.c
index 476fe7c..17b7c08 100644
--- a/plugins/generic-player/rb-generic-player-plugin.c
+++ b/plugins/generic-player/rb-generic-player-plugin.c
@@ -46,13 +46,11 @@
 #include "rb-removable-media-manager.h"
 #include "rb-generic-player-source.h"
 #include "rb-generic-player-playlist-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"
 #include "rb-sourcelist.h"
+#include "rb-nokia770-source.h"
+#include "rb-psp-source.h"
 
 
 #define RB_TYPE_GENERIC_PLAYER_PLUGIN		(rb_generic_player_plugin_get_type ())
diff --git a/plugins/generic-player/rb-generic-player-source.c b/plugins/generic-player/rb-generic-player-source.c
index e15161a..91dbe0a 100644
--- a/plugins/generic-player/rb-generic-player-source.c
+++ b/plugins/generic-player/rb-generic-player-source.c
@@ -37,12 +37,10 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#ifdef HAVE_HAL
-#include <libhal.h>
-#include <dbus/dbus.h>
-#endif
 #include <totem-pl-parser.h>
 
+#include "mediaplayerid.h"
+
 #include "eel-gconf-extensions.h"
 #include "rb-generic-player-source.h"
 #include "rb-generic-player-playlist-source.h"
@@ -525,7 +523,7 @@ rb_generic_player_is_mount_player (GMount *mount, MPIDDevice *device_info)
 	char **protocols;
 	gboolean result = FALSE;
 	int i;
-#ifdef HAVE_HAL
+
 	/* claim anything with 'storage' as an access protocol */
 	g_object_get (device_info, "access-protocols", &protocols, NULL);
 	if (protocols != NULL) {
diff --git a/plugins/generic-player/rb-generic-player-source.h b/plugins/generic-player/rb-generic-player-source.h
index f4a5e0b..5c6c350 100644
--- a/plugins/generic-player/rb-generic-player-source.h
+++ b/plugins/generic-player/rb-generic-player-source.h
@@ -34,6 +34,8 @@
 #include "rb-removable-media-source.h"
 #include "rhythmdb.h"
 
+#include "mediaplayerid.h"
+
 #include <totem-pl-parser.h>
 
 G_BEGIN_DECLS
diff --git a/plugins/generic-player/rb-nokia770-source.c b/plugins/generic-player/rb-nokia770-source.c
index 76de444..b2b674f 100644
--- a/plugins/generic-player/rb-nokia770-source.c
+++ b/plugins/generic-player/rb-nokia770-source.c
@@ -36,8 +36,8 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <dbus/dbus.h>
-#include <libhal.h>
+
+#include "mediaplayerid.h"
 
 #include "eel-gconf-extensions.h"
 #include "rb-nokia770-source.h"
diff --git a/plugins/generic-player/rb-nokia770-source.h b/plugins/generic-player/rb-nokia770-source.h
index 4e98ed3..8f43ebd 100644
--- a/plugins/generic-player/rb-nokia770-source.h
+++ b/plugins/generic-player/rb-nokia770-source.h
@@ -30,6 +30,8 @@
 #ifndef __RB_NOKIA770_SOURCE_H
 #define __RB_NOKIA770_SOURCE_H
 
+#include "mediaplayerid.h"
+
 #include "rb-shell.h"
 #include "rb-generic-player-source.h"
 #include "rhythmdb.h"
diff --git a/plugins/generic-player/rb-psp-source.c b/plugins/generic-player/rb-psp-source.c
index 8e02c00..7c430dc 100644
--- a/plugins/generic-player/rb-psp-source.c
+++ b/plugins/generic-player/rb-psp-source.c
@@ -37,8 +37,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libhal.h>
-#include <dbus/dbus.h>
+#include "mediaplayerid.h"
 
 #include "eel-gconf-extensions.h"
 #include "rb-psp-source.h"
@@ -49,6 +48,7 @@
 #include "rhythmdb.h"
 #include "rb-plugin.h"
 
+
 static void rb_psp_source_create_playlists (RBGenericPlayerSource *source);
 
 typedef struct
diff --git a/plugins/generic-player/rb-psp-source.h b/plugins/generic-player/rb-psp-source.h
index f437895..51d7f4a 100644
--- a/plugins/generic-player/rb-psp-source.h
+++ b/plugins/generic-player/rb-psp-source.h
@@ -30,6 +30,8 @@
 #ifndef __RB_PSP_SOURCE_H
 #define __RB_PSP_SOURCE_H
 
+#include "mediaplayerid.h"
+
 #include "rb-shell.h"
 #include "rb-generic-player-source.h"
 #include "rhythmdb.h"
diff --git a/plugins/ipod/rb-ipod-helpers.c b/plugins/ipod/rb-ipod-helpers.c
index caf769c..f45f1c0 100644
--- a/plugins/ipod/rb-ipod-helpers.c
+++ b/plugins/ipod/rb-ipod-helpers.c
@@ -37,10 +37,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gpod/itdb.h>
-#ifdef HAVE_HAL
-#include <libhal.h>
-#include <dbus/dbus.h>
-#endif
 
 #include "rb-ipod-helpers.h"
 #include "rb-util.h"
@@ -453,7 +449,7 @@ rb_ipod_helpers_is_ipod (GMount *mount, MPIDDevice *device_info)
 	g_strfreev (protocols);
 	return result;
 }
-#endif
+
 gboolean
 rb_ipod_helpers_needs_init (GMount *mount)
 {
diff --git a/plugins/ipod/rb-ipod-plugin.c b/plugins/ipod/rb-ipod-plugin.c
index 215243b..26fa38b 100644
--- a/plugins/ipod/rb-ipod-plugin.c
+++ b/plugins/ipod/rb-ipod-plugin.c
@@ -36,6 +36,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include "mediaplayerid.h"
+
 #include "rb-ipod-helpers.h"
 #include "rb-removable-media-manager.h"
 #include "rb-sourcelist.h"
diff --git a/shell/rb-removable-media-manager.c b/shell/rb-removable-media-manager.c
index 6cac256..bd86540 100644
--- a/shell/rb-removable-media-manager.c
+++ b/shell/rb-removable-media-manager.c
@@ -44,6 +44,11 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
+#if defined(HAVE_GUDEV)
+#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
+#include <gudev/gudev.h>
+#endif
+
 #include "rb-removable-media-manager.h"
 #include "rb-library-source.h"
 #include "rb-removable-media-source.h"
@@ -556,7 +561,7 @@ mount_removed_cb (GVolumeMonitor *monitor,
 	rb_removable_media_manager_remove_mount (mgr, mount);
 }
 
-
+#if defined(HAVE_GUDEV)
 static void
 uevent_cb (GUdevClient *client, const char *action, GUdevDevice *device, RBRemovableMediaManager *mgr)
 {
diff --git a/shell/rb-removable-media-manager.h b/shell/rb-removable-media-manager.h
index 4586c8d..8116554 100644
--- a/shell/rb-removable-media-manager.h
+++ b/shell/rb-removable-media-manager.h
@@ -36,6 +36,8 @@
 #include "rhythmdb.h"
 #include "rb-shell.h"
 
+#include "mediaplayerid.h"
+
 G_BEGIN_DECLS
 
 #define RB_TYPE_REMOVABLE_MEDIA_MANAGER         (rb_removable_media_manager_get_type ())