summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2008-01-12 19:50:43 +0000
committerMurray Cumming <murrayc@src.gnome.org>2008-01-12 19:50:43 +0000
commit40700aea66ccb6d3babc7b09b9c8f5e8eabec8bb (patch)
tree1cd656e26484a718cdc7698b26abb46e91732bf6
parent70aaad0400a7c5d81f3f40a96e9765677d577f6f (diff)
downloadglibmm-40700aea66ccb6d3babc7b09b9c8f5e8eabec8bb.tar.gz
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 svn path=/trunk/; revision=508
-rw-r--r--ChangeLog9
-rw-r--r--NEWS33
-rw-r--r--configure.in2
-rw-r--r--glib/glibmm.h1
-rw-r--r--glib/glibmm/private/Makefile.am14
-rw-r--r--glib/src/Makefile_list_of_hg.am_fragment3
6 files changed, 53 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 81c19ffd..90286a14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
+
2008-01-11 Murray Cumming <murrayc@murrayc.com>
* gio/src/appinfo.hg: Added class documentation.
diff --git a/NEWS b/NEWS
index 0df55c16..c3e87757 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
diff --git a/configure.in b/configure.in
index 9836885e..39aa7dfc 100644
--- a/configure.in
+++ b/configure.in
@@ -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])
diff --git a/glib/glibmm.h b/glib/glibmm.h
index 4b2d86bc..7f758277 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -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>
diff --git a/glib/glibmm/private/Makefile.am b/glib/glibmm/private/Makefile.am
index f97bf786..fd02e2fa 100644
--- a/glib/glibmm/private/Makefile.am
+++ b/glib/glibmm/private/Makefile.am
@@ -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))
diff --git a/glib/src/Makefile_list_of_hg.am_fragment b/glib/src/Makefile_list_of_hg.am_fragment
index c12b5591..be7df010 100644
--- a/glib/src/Makefile_list_of_hg.am_fragment
+++ b/glib/src/Makefile_list_of_hg.am_fragment
@@ -7,6 +7,7 @@ files_posix_hg =
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