Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/glib/ChangeLog,v
retrieving revision 1.2220
diff -u -u -p -r1.2220 ChangeLog
--- ChangeLog	18 Jan 2006 17:35:27 -0000	1.2220
+++ ChangeLog	19 Jan 2006 03:40:40 -0000
@@ -1,3 +1,19 @@
+2006-01-19  Emmanuele Bassi  <ebassi@cvs.gnome.org>
+
+	* glib/gbookmarkfile.c
+	* glib/gbookmarkfile.h: Add the BookmarkFile parser and builder;
+	using this object you can parse and create bookmarks for URIs,
+	along with meta-data for the resources with that URIs.
+
+	* glib/Makefile.am (libglib_2_0_la_SOURCES),
+	(glibsubinclude_HEADERS): add gbookmarkfile.[ch].
+	
+	* glib/makefile.msc.in (glib_OBJECTS): Add gbookmarkfile.obj.
+
+	* glib/makefile.mingw.in (glib_OBJECTS): Add gbookmarkfile.o.
+
+	* glib/glib.symbols: Add GBookmarkFile's exported symbols.
+
 2006-01-18  Matthias Clasen  <mclasen@redhat.com>
 
 	* Bump version
Index: glib/Makefile.am
===================================================================
RCS file: /cvs/gnome/glib/glib/Makefile.am,v
retrieving revision 1.139
diff -u -u -p -r1.139 Makefile.am
--- glib/Makefile.am	1 Dec 2005 16:34:19 -0000	1.139
+++ glib/Makefile.am	19 Jan 2006 03:40:40 -0000
@@ -72,6 +72,7 @@ libglib_2_0_la_SOURCES = 	\
 	gasyncqueue.c		\
 	gatomic.c		\
 	gbacktrace.c		\
+	gbookmarkfile.c		\
 	gbsearcharray.h		\
 	gcache.c		\
 	gcompletion.c		\
@@ -148,6 +149,7 @@ glibsubinclude_HEADERS =   \
 	gasyncqueue.h	\
 	gatomic.h	\
 	gbacktrace.h	\
+	gbookmarkfile.h	\
 	gcache.h	\
 	gcompletion.h	\
 	gconvert.h	\
Index: glib/glib.symbols
===================================================================
RCS file: /cvs/gnome/glib/glib/glib.symbols,v
retrieving revision 1.55
diff -u -u -p -r1.55 glib.symbols
--- glib/glib.symbols	5 Jan 2006 06:21:49 -0000	1.55
+++ glib/glib.symbols	19 Jan 2006 03:40:41 -0000
@@ -103,6 +103,45 @@ g_on_error_stack_trace
 #endif
 #endif
 
+#if IN_HEADER(__G_BOOKMARK_FILE_H__)
+#if IN_FILE(__G_BOOKMARK_FILE_C__)
+g_bookmark_file_error_quark
+g_bookmark_file_free
+g_bookmark_file_get_added
+g_bookmark_file_get_app_info
+g_bookmark_file_get_applications G_GNUC_MALLOC
+g_bookmark_file_get_description G_GNUC_MALLOC
+g_bookmark_file_get_groups G_GNUC_MALLOC
+g_bookmark_file_get_icon
+g_bookmark_file_get_is_private
+g_bookmark_file_get_mime_type G_GNUC_MALLOC
+g_bookmark_file_get_modified
+g_bookmark_file_get_size
+g_bookmark_file_get_title G_GNUC_MALLOC
+g_bookmark_file_get_uris G_GNUC_MALLOC
+g_bookmark_file_get_visited
+g_bookmark_file_has_item
+g_bookmark_file_load_from_data_dirs
+g_bookmark_file_load_from_data
+g_bookmark_file_load_from_file
+g_bookmark_file_move_item
+g_bookmark_file_new
+g_bookmark_file_remove_item
+g_bookmark_file_set_added
+g_bookmark_file_set_app_info
+g_bookmark_file_set_description
+g_bookmark_file_set_groups
+g_bookmark_file_set_icon
+g_bookmark_file_set_is_private
+g_bookmark_file_set_mime_type
+g_bookmark_file_set_modified
+g_bookmark_file_set_title
+g_bookmark_file_set_visited
+g_bookmark_file_to_data G_GNUC_MALLOC
+g_bookmark_file_to_file
+#endif
+#endif
+
 #if IN_HEADER(__G_CACHE_H__)
 #if IN_FILE(__G_CACHE_C__)
 g_cache_destroy
Index: glib/makefile.mingw.in
===================================================================
RCS file: /cvs/gnome/glib/glib/makefile.mingw.in,v
retrieving revision 1.30
diff -u -u -p -r1.30 makefile.mingw.in
--- glib/makefile.mingw.in	21 Nov 2002 03:25:34 -0000	1.30
+++ glib/makefile.mingw.in	19 Jan 2006 03:40:41 -0000
@@ -25,6 +25,7 @@ glib_OBJECTS =			\
 	garray.o		\
 	gasyncqueue.o		\
 	gbacktrace.o		\
+	gbookmarkfile.o		\
 	gbsearcharray.o		\
 	gcache.o		\
 	gcompletion.o		\
Index: glib/makefile.msc.in
===================================================================
RCS file: /cvs/gnome/glib/glib/makefile.msc.in,v
retrieving revision 1.47
diff -u -u -p -r1.47 makefile.msc.in
--- glib/makefile.msc.in	5 Jan 2006 23:37:02 -0000	1.47
+++ glib/makefile.msc.in	19 Jan 2006 03:40:41 -0000
@@ -32,6 +32,7 @@ glib_OBJECTS =			\
 	gasyncqueue.obj		\
 	gatomic.obj	\
 	gbacktrace.obj		\
+	gbookmarkfile.obj	\
 	gcache.obj		\
 	gcompletion.obj		\
 	gconvert.obj		\
