glibmm r508 - in trunk: . glib glib/glibmm/private glib/src

[murrayc svn gnome org]

Author: murrayc
Date: Sat Jan 12 19:50:43 2008
New Revision: 508
URL: http://svn.gnome.org/viewvc/glibmm?rev=508&view=rev

Log:
1.5.1:

2008-01-12  Murray Cumming  <murrayc murrayc com>

        * glib/glibmm.h: Added uriutils.h
        * glib/glibmm/private/Makefile.am: Renamed some variables to 
        avoid clashes with the build_shared/ variables, which caused 
        a dist failure involving wrap_init.h


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in
   trunk/glib/glibmm.h
   trunk/glib/glibmm/private/Makefile.am
   trunk/glib/src/Makefile_list_of_hg.am_fragment

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Jan 12 19:50:43 2008
@@ -1,3 +1,36 @@
+2.15.1 (unstable):
+
+Gio:
+* Actually build the giomm library.
+* Added API reference documentation.
+  (Murray Cumming)
+* Added AppInfo and AppLaunchContext.
+* Drive:
+  - Added poll_for_media() and poll_for_media_finish().
+  - Added capability-checking functions.
+  (Marko Anastasov)
+* File: Renamed create() to create_file(), 
+  create_async() to create_file_async() and 
+  create_finish() to create_file_finish() to slightly 
+  reduce confusion with the static create*() methods.
+* FileInputStream, FileOutputStream: Derive from Seekable.
+  (Murray Cumming)
+* FileInputStream, InputStream, Volume: Modified *_finish 
+  functions to take a const AsyncResult.
+  (Marko Anastasov)
+* Added LoadableIcon.
+  (Murray Cumming)
+* MountOperation: Added MountOperationResult enumeration and make 
+  reply() take this instead of a bool.
+  (Jonathon Jongsma)
+
+  (Murray Cumming)
+ 
+Glib:
+* Added uri_unescape_string(), uri_get_scheme() and uri_escape_string().
+  (Murray Cumming
+
+
 2.15.0 (unstable):
 
 * New giomm library (check for giomm-2.4 with pkg-config) 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jan 12 19:50:43 2008
@@ -11,7 +11,7 @@
 #  Copyright 1999 gtkmm Development Team
 #  Copyright 1998 Stephan Kulow 
 #
-AC_INIT([glibmm], [2.15.0])
+AC_INIT([glibmm], [2.15.1])
 AC_PREREQ([2.58])
 AC_CONFIG_SRCDIR([glib/glibmmconfig.h.in])
 AC_CONFIG_MACRO_DIR([scripts])

Modified: trunk/glib/glibmm.h
==============================================================================
--- trunk/glib/glibmm.h	(original)
+++ trunk/glib/glibmm.h	Sat Jan 12 19:50:43 2008
@@ -66,6 +66,7 @@
 #include <glibmm/threadpool.h>
 #include <glibmm/timer.h>
 #include <glibmm/timeval.h>
+#include <glibmm/uriutils.h>
 #include <glibmm/ustring.h>
 #include <glibmm/value.h>
 #include <glibmm/wrap.h>

Modified: trunk/glib/glibmm/private/Makefile.am
==============================================================================
--- trunk/glib/glibmm/private/Makefile.am	(original)
+++ trunk/glib/glibmm/private/Makefile.am	Sat Jan 12 19:50:43 2008
@@ -3,17 +3,17 @@
 
 include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment
 
-files_built_h		= $(files_hg:.hg=_p.h)
-files_built_all_h	= $(files_all_hg:.hg=_p.h)
-files_extra_h		= interface_p.h object_p.h
-files_extra_all_h	= interface_p.h object_p.h
+files_built_p_h		= $(files_hg:.hg=_p.h)
+files_built_all_p_h	= $(files_all_hg:.hg=_p.h)
+files_extra_p_h		= interface_p.h object_p.h
+files_extra_all_p_h	= interface_p.h object_p.h
 
-dist_sources = $(files_built_all_h) $(files_extra_all_h)
+dist_sources = $(files_built_all_p_h) $(files_extra_all_p_h)
 DISTFILES = $(DIST_COMMON) $(dist_sources)
 
 private_includedir	= $(includedir)/glibmm-2.4/glibmm/private
-private_include_HEADERS	= $(files_built_h) $(files_extra_h)
+private_include_HEADERS	= $(files_built_p_h) $(files_extra_p_h)
 
 maintainer-clean-local:
-	(cd $(srcdir) && rm -f $(files_built_h))
+	(cd $(srcdir) && rm -f $(files_built_p_h))
 

Modified: trunk/glib/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- trunk/glib/src/Makefile_list_of_hg.am_fragment	(original)
+++ trunk/glib/src/Makefile_list_of_hg.am_fragment	Sat Jan 12 19:50:43 2008
@@ -7,6 +7,7 @@
 files_win32_hg =
 files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg \
                    module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg \
-                   shell.hg spawn.hg thread.hg unicode.hg uriutils.hg 
+                   shell.hg spawn.hg thread.hg unicode.hg uriutils.hg
+files_general_deprecated_hg =
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment