diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2004-04-11 14:07:06 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2004-04-11 14:07:06 +0000 |
| commit | 13ccd0e54157931fce28e6646a45dbdfbd6fa2cd (patch) | |
| tree | e49acb111b840e1e5f54dc4e62ade01503f2ae28 /glib | |
| parent | 3b1df1c0503bd03367444f4711c9ab93c5ecabcd (diff) | |
| download | glibmm-13ccd0e54157931fce28e6646a45dbdfbd6fa2cd.tar.gz | |
2.4.0:
2004-04-11 Murray Cumming <murrayc@murrayc.com>
* tools/pm/WrapParser.pm, Output.pm, m4/signal.m4: Allow _WRAP_SIGNAL()
to take an refreturn argument, so that Gtk::Widget::on_get_accessible()
can do an extra ref before returning the Atk::Object.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/Makefile.am | 4 | ||||
| -rw-r--r-- | glib/glibmm-2.4.pc.in | 4 | ||||
| -rw-r--r-- | glib/glibmm/Makefile.am | 12 | ||||
| -rw-r--r-- | glib/glibmm/private/Makefile.am | 2 | ||||
| -rw-r--r-- | glib/glibmm/ustring.h | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/glib/Makefile.am b/glib/Makefile.am index b24f4ede..34774511 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -2,10 +2,10 @@ SUBDIRS = src glibmm EXTRA_DIST = README glibmmconfig.h.in glibmm-2.4.pc.in -glibmm_includedir = $(includedir)/glibmm-2.3 +glibmm_includedir = $(includedir)/glibmm-2.4 glibmm_include_HEADERS = glibmm.h -glibmm_configdir = $(libdir)/glibmm-2.3/include +glibmm_configdir = $(libdir)/glibmm-2.4/include glibmm_config_DATA = glibmmconfig.h pkgconfigdir = $(libdir)/pkgconfig diff --git a/glib/glibmm-2.4.pc.in b/glib/glibmm-2.4.pc.in index afe813b8..db098824 100644 --- a/glib/glibmm-2.4.pc.in +++ b/glib/glibmm-2.4.pc.in @@ -7,5 +7,5 @@ Name: GLibmm Description: C++ wrapper for GLib Requires: gobject-2.0 sigc++-2.0 Version: @VERSION@ -Libs: -L${libdir} -lglibmm-2.3 -Cflags: -I${includedir}/glibmm-2.3 -I${libdir}/glibmm-2.3/include +Libs: -L${libdir} -lglibmm-2.4 +Cflags: -I${includedir}/glibmm-2.4 -I${libdir}/glibmm-2.4/include diff --git a/glib/glibmm/Makefile.am b/glib/glibmm/Makefile.am index 1659066c..6ef74877 100644 --- a/glib/glibmm/Makefile.am +++ b/glib/glibmm/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = private sublib_name = glibmm -sublib_libname = glibmm-2.3 +sublib_libname = glibmm-2.4 sublib_namespace = Glib sublib_cflags = $(GLIBMM_CFLAGS) @@ -93,12 +93,12 @@ include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment files_built_general_cc += value_basictypes.cc files_built_general_h += signalproxy.h value_basictypes.h -lib_LTLIBRARIES = libglibmm-2.3.la +lib_LTLIBRARIES = libglibmm-2.4.la if OS_WIN32 -libglibmm_2_3_la_SOURCES = $(files_all_general_cc) $(files_all_win32_cc) +libglibmm_2_4_la_SOURCES = $(files_all_general_cc) $(files_all_win32_cc) else -libglibmm_2_3_la_SOURCES = $(files_all_general_cc) $(files_all_posix_cc) +libglibmm_2_4_la_SOURCES = $(files_all_general_cc) $(files_all_posix_cc) endif -libglibmm_2_3_la_LDFLAGS = $(common_ldflags) -libglibmm_2_3_la_LIBADD = $(GLIBMM_LIBS) +libglibmm_2_4_la_LDFLAGS = $(common_ldflags) +libglibmm_2_4_la_LIBADD = $(GLIBMM_LIBS) diff --git a/glib/glibmm/private/Makefile.am b/glib/glibmm/private/Makefile.am index 58fdb14a..de70a5df 100644 --- a/glib/glibmm/private/Makefile.am +++ b/glib/glibmm/private/Makefile.am @@ -12,7 +12,7 @@ files_extra_all_h = interface_p.h object_p.h dist_sources = $(files_built_all_h) $(files_extra_all_h) DISTFILES = $(DIST_COMMON) $(dist_sources) -private_includedir = $(includedir)/glibmm-2.3/glibmm/private +private_includedir = $(includedir)/glibmm-2.4/glibmm/private private_include_HEADERS = $(files_built_h) $(files_extra_h) maintainer-clean-local: diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h index b8a7a835..63f545b8 100644 --- a/glib/glibmm/ustring.h +++ b/glib/glibmm/ustring.h @@ -509,7 +509,7 @@ public: ustring uppercase() const; /*! Returns a new UTF-8 string with all characters characters converted to - * their uppercase equivalent, while honoring the current locale. The + * their lowercase equivalent, while honoring the current locale. The * resulting string may change in the number of bytes as well as in the * number of characters. */ |