[grilo] [core] Revert changes to make grl_media_source_gen_browse_id protected. This is not needed any more.

[Iago Toral Quiroga <itoral src gnome org>]

commit dcbf9c765a7adbbb59990cad8f7a7d7325e2216b
Author: Iago Toral Quiroga <itoral igalia com>
Date:   Wed Jun 2 10:39:22 2010 +0200

    [core] Revert changes to make grl_media_source_gen_browse_id protected.
    This is not needed any more.

 src/Makefile.am             |    3 +--
 src/grl-media-source-priv.h |   41 -----------------------------------------
 src/grl-media-source.c      |   18 ++++++++++--------
 src/grl-multiple.c          |    1 -
 4 files changed, 11 insertions(+), 52 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index f105141..7a7564a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ lib GRL_NAME@_la_SOURCES =					\
 	grl-plugin-registry.c					\
 	grl-metadata-key.c grl-metadata-key-priv.h		\
 	grl-metadata-source.c grl-metadata-source-priv.h	\
-	grl-media-source.c grl-media-source-priv.h		\
+	grl-media-source.c					\
 	grl-multiple.c						\
 	grl-log.c						\
 	grilo.c
@@ -67,7 +67,6 @@ lib GRL_NAME@inc_HEADERS += $(data_h_headers)
 noinst_HEADERS =			\
 	grl-media-plugin-priv.h		\
 	grl-metadata-source-priv.h	\
-	grl-media-source-priv.h		\
 	grl-metadata-key-priv.h
 
 MAINTAINERCLEANFILES =	\
diff --git a/src/grl-media-source.c b/src/grl-media-source.c
index 61f9670..d2290ec 100644
--- a/src/grl-media-source.c
+++ b/src/grl-media-source.c
@@ -163,6 +163,8 @@ static gboolean
 operation_is_finished (GrlMediaSource *source,
 		       guint operation_id) __attribute__ ((unused)) ;
 
+static guint grl_media_source_gen_browse_id (GrlMediaSource *source);
+
 /* ================ GrlMediaSource GObject ================ */
 
 G_DEFINE_ABSTRACT_TYPE (GrlMediaSource,
@@ -214,6 +216,14 @@ grl_media_source_init (GrlMediaSource *source)
     g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
 }
 
+static guint
+grl_media_source_gen_browse_id (GrlMediaSource *source)
+{
+  GrlMediaSourceClass *klass;
+  klass = GRL_MEDIA_SOURCE_GET_CLASS (source);
+  return klass->browse_id++;
+}
+
 static void
 grl_media_source_get_property (GObject *object,
                                guint prop_id,
@@ -1076,14 +1086,6 @@ metadata_full_resolution_ctl_cb (GrlMediaSource *source,
   }
 }
 
-guint
-grl_media_source_gen_browse_id (GrlMediaSource *source)
-{
-  GrlMediaSourceClass *klass;
-  klass = GRL_MEDIA_SOURCE_GET_CLASS (source);
-  return klass->browse_id++;
-}
-
 /* ================ API ================ */
 
 /**
diff --git a/src/grl-multiple.c b/src/grl-multiple.c
index eb0ac6a..aea177d 100644
--- a/src/grl-multiple.c
+++ b/src/grl-multiple.c
@@ -22,7 +22,6 @@
 
 #include "grl-multiple.h"
 #include "grl-plugin-registry.h"
-#include "grl-media-source-priv.h"
 #include "grl-error.h"
 
 #undef G_LOG_DOMAIN