[rhythmbox] fix include paths and cflags for gnome-keyring and brasero (bug #636482)

[Jonathan Matthew <jmatthew src gnome org>]

commit e7524d8e1dc74bf65f1cd17aef43efc32466878a
Author: Chris Vine <chris cvine freeserve co uk>
Date:   Sun Dec 5 09:26:17 2010 +1000

    fix include paths and cflags for gnome-keyring and brasero (bug #636482)

 plugins/audioscrobbler/Makefile.am                 |    1 +
 .../rb-audioscrobbler-radio-source.c               |    2 +-
 .../rb-disc-recorder-plugin.c                      |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/plugins/audioscrobbler/Makefile.am b/plugins/audioscrobbler/Makefile.am
index 9c54b38..747b7c2 100644
--- a/plugins/audioscrobbler/Makefile.am
+++ b/plugins/audioscrobbler/Makefile.am
@@ -52,6 +52,7 @@ INCLUDES = 						\
 	$(TOTEM_PLPARSER_CFLAGS)			\
 	$(JSON_GLIB_CFLAGS)				\
 	$(RHYTHMBOX_CFLAGS)				\
+	$(GNOME_KEYRING_CFLAGS)				\
 	-D_XOPEN_SOURCE -D_BSD_SOURCE
 
 gtkbuilderdir = $(plugindir)
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
index cd1e6ea..b68bdea 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
@@ -36,7 +36,7 @@
 #include <glib/gstdio.h>
 
 #ifdef WITH_GNOME_KEYRING
-#include <gnome-keyring-1/gnome-keyring.h>
+#include <gnome-keyring.h>
 #endif
 
 #include <totem-pl-parser.h>
diff --git a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
index ae4e69a..03f712d 100644
--- a/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
+++ b/plugins/brasero-disc-recorder/rb-disc-recorder-plugin.c
@@ -40,8 +40,8 @@
 #include <glib-object.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkx.h>
-#include <brasero/brasero-media.h>
-#include <brasero/brasero-medium-monitor.h>
+#include <brasero-media.h>
+#include <brasero-medium-monitor.h>
 
 #include <libxml/xmlerror.h>
 #include <libxml/xmlwriter.h>