[rhythmbox/gobject-introspection: 205/205] fix more annotations, accept unprefixed stuff into rb/rhythmdb girs

[Jonathan Matthew <jmatthew src gnome org>]

commit 42ae276e050474ffb58a4ec34f5f6ca1c8e0a9a3
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Oct 26 20:40:10 2010 +1000

    fix more annotations, accept unprefixed stuff into rb/rhythmdb girs

 bindings/gi/Makefile.am   |    4 ++--
 lib/rb-string-value-map.c |    2 +-
 rhythmdb/rhythmdb.h       |    2 --
 3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/bindings/gi/Makefile.am b/bindings/gi/Makefile.am
index ee2c931..07a23a1 100644
--- a/bindings/gi/Makefile.am
+++ b/bindings/gi/Makefile.am
@@ -137,7 +137,7 @@ RhythmDB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $
 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_
+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
@@ -145,7 +145,7 @@ RB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_
 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_
+RB_0_13_gir_SCANNERFLAGS = --symbol-prefix rb_ --accept-unprefixed
 
 INTROSPECTION_GIRS += MPID-0.13.gir RhythmDB-0.13.gir RB-0.13.gir
 
diff --git a/lib/rb-string-value-map.c b/lib/rb-string-value-map.c
index 3130f06..d31dca9 100644
--- a/lib/rb-string-value-map.c
+++ b/lib/rb-string-value-map.c
@@ -197,7 +197,7 @@ rb_string_value_map_peek (RBStringValueMap *map,
  * Extracts and returns the underlying hash table from the map,
  * and creates a new empty map.
  *
- * Return value: #GHashTable from the map
+ * Return value: (transfer full): #GHashTable from the map
  */
 GHashTable*
 rb_string_value_map_steal_hashtable (RBStringValueMap *map)
diff --git a/rhythmdb/rhythmdb.h b/rhythmdb/rhythmdb.h
index 3927806..4c68f3b 100644
--- a/rhythmdb/rhythmdb.h
+++ b/rhythmdb/rhythmdb.h
@@ -306,8 +306,6 @@ struct _RhythmDBClass
 
 GType		rhythmdb_get_type	(void);
 
-RhythmDB *	rhythmdb_new		(const char *name);
-
 void		rhythmdb_shutdown	(RhythmDB *db);
 
 void		rhythmdb_load		(RhythmDB *db);