[rhythmbox/gobject-introspection: 4/39] move rhythmdb stuff into RB gir, since that might actually work

[Jonathan Matthew <jmatthew src gnome org>]

commit f4989d57dad1f3323bef047f14d490b55b2e196a
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Oct 27 09:34:36 2010 +1000

    move rhythmdb stuff into RB gir, since that might actually work

 bindings/gi/Makefile.am          |   56 +++++++++++++++----------------------
 shell/rb-history.c               |    2 +-
 sources/rb-media-player-source.c |    8 +++---
 sources/rb-source.c              |   12 ++++----
 4 files changed, 34 insertions(+), 44 deletions(-)
---
diff --git a/bindings/gi/Makefile.am b/bindings/gi/Makefile.am
index 07a23a1..71b585d 100644
--- a/bindings/gi/Makefile.am
+++ b/bindings/gi/Makefile.am
@@ -26,6 +26,8 @@ rb_introspection_sources = \
 		lib/rb-preferences.h \
 		lib/rb-stock-icons.h \
 		lib/rb-stock-icons.c \
+		lib/rb-string-value-map.h \
+		lib/rb-string-value-map.c \
 		lib/rb-util.h \
 		lib/rb-util.c \
 		metadata/rb-metadata.h \
@@ -34,6 +36,23 @@ rb_introspection_sources = \
 		podcast/rb-podcast-manager.c \
 		podcast/rb-podcast-parse.h \
 		podcast/rb-podcast-parse.c \
+		rhythmdb/rhythmdb.h \
+		rhythmdb/rhythmdb.c \
+		rhythmdb/rhythmdb-entry.h \
+		rhythmdb/rhythmdb-entry-type.h \
+		rhythmdb/rhythmdb-entry-type.c \
+		rhythmdb/rhythmdb-property-model.h \
+		rhythmdb/rhythmdb-property-model.c \
+		rhythmdb/rhythmdb-query.c \
+		rhythmdb/rhythmdb-query-model.h \
+		rhythmdb/rhythmdb-query-model.c \
+		rhythmdb/rhythmdb-query-results.h \
+		rhythmdb/rhythmdb-query-results.c \
+		rhythmdb/rhythmdb-import-job.h \
+		rhythmdb/rhythmdb-import-job.c \
+		rhythmdb/rhythmdb-song-entry-types.c \
+		rhythmdb/rb-refstring.h \
+		rhythmdb/rb-refstring.c \
 		shell/rb-shell.h \
 		shell/rb-shell.c \
 		shell/rb-shell-player.h \
@@ -102,27 +121,6 @@ rb_introspection_sources = \
 		widgets/rb-uri-dialog.h \
 		widgets/rb-uri-dialog.c
 
-rhythmdb_introspection_sources = \
-		lib/rb-string-value-map.h \
-		lib/rb-string-value-map.c \
-		rhythmdb/rhythmdb.h \
-		rhythmdb/rhythmdb.c \
-		rhythmdb/rhythmdb-entry.h \
-		rhythmdb/rhythmdb-entry-type.h \
-		rhythmdb/rhythmdb-entry-type.c \
-		rhythmdb/rhythmdb-property-model.h \
-		rhythmdb/rhythmdb-property-model.c \
-		rhythmdb/rhythmdb-query.c \
-		rhythmdb/rhythmdb-query-model.h \
-		rhythmdb/rhythmdb-query-model.c \
-		rhythmdb/rhythmdb-query-results.h \
-		rhythmdb/rhythmdb-query-results.c \
-		rhythmdb/rhythmdb-import-job.h \
-		rhythmdb/rhythmdb-import-job.c \
-		rhythmdb/rhythmdb-song-entry-types.c \
-		rhythmdb/rb-refstring.h \
-		rhythmdb/rb-refstring.c
-
 MPID-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la
 MPID_0_13_gir_INCLUDES = GObject-2.0
 MPID_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(GUDEV_CFLAGS) -I../..
@@ -131,23 +129,15 @@ MPID_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(mpid_introspection_sources))
 MPID_0_13_gir_PACKAGES = rhythmbox
 MPID_0_13_gir_SCANNERFLAGS = --symbol-prefix mpid_
 
-RhythmDB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la
-RhythmDB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-$(GTK_MAJ_VER) Gst-0.10 libxml2-2.0
-RhythmDB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
-RhythmDB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
-RhythmDB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rhythmdb_introspection_sources))
-RhythmDB_0_13_gir_PACKAGES = rhythmbox
-RhythmDB_0_13_gir_SCANNERFLAGS = --symbol-prefix rhythmdb_ --accept-unprefixed
-
-RB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la RhythmDB-0.13.gir
-RB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-$(GTK_MAJ_VER) Gst-0.10 libxml2-2.0 RhythmDB-0.13
+RB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la
+RB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-$(GTK_MAJ_VER) Gst-0.10 libxml2-2.0  MPID-0.13
 RB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
 RB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
 RB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rb_introspection_sources))
 RB_0_13_gir_PACKAGES = rhythmbox
-RB_0_13_gir_SCANNERFLAGS = --symbol-prefix rb_ --accept-unprefixed
+RB_0_13_gir_SCANNERFLAGS = --symbol-prefix rb_ --identifier-prefix RB --accept-unprefixed
 
-INTROSPECTION_GIRS += MPID-0.13.gir RhythmDB-0.13.gir RB-0.13.gir
+INTROSPECTION_GIRS += MPID-0.13.gir RB-0.13.gir
 
 girdir = $(datadir)/gir-1.0
 dist_gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/shell/rb-history.c b/shell/rb-history.c
index cae1a31..4e114eb 100644
--- a/shell/rb-history.c
+++ b/shell/rb-history.c
@@ -667,7 +667,7 @@ rb_history_clear (RBHistory *hist)
  * The caller does not own any references on the entries in the returned array.
  * Takes O(Nlog(N)) time.
  *
- * Return value: (element-type RhythmDB.Entry) (transfer container): a copy of the history list
+ * Return value: (element-type RB.RhythmDBEntry) (transfer container): a copy of the history list
  */
 GPtrArray *
 rb_history_dump (RBHistory *hist)
diff --git a/sources/rb-media-player-source.c b/sources/rb-media-player-source.c
index 644e346..1d479ec 100644
--- a/sources/rb-media-player-source.c
+++ b/sources/rb-media-player-source.c
@@ -273,7 +273,7 @@ rb_media_player_source_get_free_space (RBMediaPlayerSource *source)
  * rb_media_player_source_get_entries:
  * @source: the #RBMediaPlayerSource
  * @category: the sync category name
- * @entries: (element-type utf8 RhythmDB.Entry): map to hold the entries
+ * @entries: (element-type utf8 RB.RhythmDBEntry): map to hold the entries
  */
 void
 rb_media_player_source_get_entries (RBMediaPlayerSource *source,
@@ -287,7 +287,7 @@ rb_media_player_source_get_entries (RBMediaPlayerSource *source,
 /**
  * rb_media_player_source_delete_entries:
  * @source: the #RBMediaPlayerSource
- * @entries: (element-type RhythmDB.Entry) (transfer full): list of entries to delete
+ * @entries: (element-type RB.RhythmDBEntry) (transfer full): list of entries to delete
  * @callback: callback to call on completion
  * @user_data: (closure) (scope notified): data for callback
  * @destroy_data: callback to free the callback data
@@ -767,7 +767,7 @@ sync_cmd (GtkAction *action, RBSource *source)
 /**
  * impl_delete_entries:
  * @source: the source
- * @entries: (element-type RhythmDB.Entry) (transfer full): list of entries to delete
+ * @entries: (element-type RB.RhythmDBEntry) (transfer full): list of entries to delete
  * @callback: callback to call on completion
  * @data: (closure) (scope notified): callback data
  * @destroy_data: callback to free callback data
@@ -777,5 +777,5 @@ sync_cmd (GtkAction *action, RBSource *source)
  * impl_add_playlist:
  * @source: the source
  * @name: new playlist name
- * @entries: (element-type RhythmDB.Entry) (transfer full): list of entries to add
+ * @entries: (element-type RB.RhythmDBEntry) (transfer full): list of entries to add
  */
diff --git a/sources/rb-source.c b/sources/rb-source.c
index f5daf28..65125c0 100644
--- a/sources/rb-source.c
+++ b/sources/rb-source.c
@@ -1094,7 +1094,7 @@ rb_source_can_copy (RBSource *source)
  * Removes the currently selected entries from the source and
  * returns them so they can be pasted into another source.
  *
- * Return value: (element-type RhythmDB.Entry) (transfer full): entries cut
+ * Return value: (element-type RB.RhythmDBEntry) (transfer full): entries cut
  * from the source.
  */
 GList *
@@ -1122,7 +1122,7 @@ default_copy (RBSource *source)
  *
  * Copies the selected entries to the clipboard.
  *
- * Return value: (element-type RhythmDB.Entry) (transfer full): a list containing
+ * Return value: (element-type RB.RhythmDBEntry) (transfer full): a list containing
  * the currently selected entries from the source.
  */
 GList *
@@ -1136,7 +1136,7 @@ rb_source_copy (RBSource *source)
 /**
  * rb_source_paste:
  * @source: a #RBSource
- * @entries: (element-type RhythmDB.Entry): a list of #RhythmDBEntry objects to paste in
+ * @entries: (element-type RB.RhythmDBEntry): a list of #RhythmDBEntry objects to paste in
  *
  * Adds a list of entries previously cut or copied from another
  * source.  If the entries are not of the type used by the source,
@@ -2044,20 +2044,20 @@ rb_source_search_type_get_type (void)
  * impl_cut:
  * @source: a #RBSource
  *
- * Return value: (element-type RhythmDB.Entry) (transfer full): list of entries
+ * Return value: (element-type RB.RhythmDBEntry) (transfer full): list of entries
  */
 
 /**
  * impl_copy:
  * @source: a #RBSource
  *
- * Return value: (element-type RhythmDB.Entry) (transfer full): list of entries
+ * Return value: (element-type RB.RhythmDBEntry) (transfer full): list of entries
  */
 
 /**
  * impl_paste:
  * @source: a #RBSource
- * @entries: (element-type RhythmDB.Entry) (transfer none): list of entries to paste
+ * @entries: (element-type RB.RhythmDBEntry) (transfer none): list of entries to paste
  */
 
 /**