From 3d95e7ed152e045e311f855a8028746fc9ab38be Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 6 Jul 2000 20:07:41 +0000 Subject: Released 0.12 Thu Jul 6 15:24:38 2000 Owen Taylor * Released 0.12 * gdk/Makefile.am: Fix missing \ which was causing srcdir != builddir builds to fail. --- ChangeLog | 7 +++++++ ChangeLog.pre-1-0 | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ ChangeLog.pre-1-2 | 7 +++++++ ChangeLog.pre-1-4 | 7 +++++++ ChangeLog.pre-1-6 | 7 +++++++ ChangeLog.pre-1-8 | 7 +++++++ pango/Makefile.am | 6 ++++-- pango/pango-coverage.c | 3 +-- 9 files changed, 54 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1cb30e5..1972554e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jul 6 15:24:38 2000 Owen Taylor + + * Released 0.12 + + * gdk/Makefile.am: Fix missing \ which was causing + srcdir != builddir builds to fail. + Thu Jul 6 15:16:28 2000 Owen Taylor * docs/pango-sections.txt docs/tmpl/*: Update diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index b1cb30e5..1972554e 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,10 @@ +Thu Jul 6 15:24:38 2000 Owen Taylor + + * Released 0.12 + + * gdk/Makefile.am: Fix missing \ which was causing + srcdir != builddir builds to fail. + Thu Jul 6 15:16:28 2000 Owen Taylor * docs/pango-sections.txt docs/tmpl/*: Update diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index b1cb30e5..1972554e 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Thu Jul 6 15:24:38 2000 Owen Taylor + + * Released 0.12 + + * gdk/Makefile.am: Fix missing \ which was causing + srcdir != builddir builds to fail. + Thu Jul 6 15:16:28 2000 Owen Taylor * docs/pango-sections.txt docs/tmpl/*: Update diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index b1cb30e5..1972554e 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,10 @@ +Thu Jul 6 15:24:38 2000 Owen Taylor + + * Released 0.12 + + * gdk/Makefile.am: Fix missing \ which was causing + srcdir != builddir builds to fail. + Thu Jul 6 15:16:28 2000 Owen Taylor * docs/pango-sections.txt docs/tmpl/*: Update diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index b1cb30e5..1972554e 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +Thu Jul 6 15:24:38 2000 Owen Taylor + + * Released 0.12 + + * gdk/Makefile.am: Fix missing \ which was causing + srcdir != builddir builds to fail. + Thu Jul 6 15:16:28 2000 Owen Taylor * docs/pango-sections.txt docs/tmpl/*: Update diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index b1cb30e5..1972554e 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +Thu Jul 6 15:24:38 2000 Owen Taylor + + * Released 0.12 + + * gdk/Makefile.am: Fix missing \ which was causing + srcdir != builddir builds to fail. + Thu Jul 6 15:16:28 2000 Owen Taylor * docs/pango-sections.txt docs/tmpl/*: Update diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index b1cb30e5..1972554e 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +Thu Jul 6 15:24:38 2000 Owen Taylor + + * Released 0.12 + + * gdk/Makefile.am: Fix missing \ which was causing + srcdir != builddir builds to fail. + Thu Jul 6 15:16:28 2000 Owen Taylor * docs/pango-sections.txt docs/tmpl/*: Update diff --git a/pango/Makefile.am b/pango/Makefile.am index ee0961bc..99888ace 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -1,7 +1,9 @@ ## Process this file with automake to create Makefile.in. -INCLUDES=-DSYSCONFDIR=\"$(sysconfdir)\" -DLIBDIR=\"$(libdir)\" - -I$(top_srcdir) +INCLUDES = \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DLIBDIR=\"$(libdir)\" \ + -I$(top_srcdir) lib_LTLIBRARIES = libpango.la libpangox.la bin_PROGRAMS = pango-querymodules diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index eda0ace3..1e090f41 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -57,7 +57,6 @@ struct _PangoCoverage PangoCoverage * pango_coverage_new (void) { - int i; PangoCoverage *coverage = g_new (PangoCoverage, 1); coverage->n_blocks = N_BLOCKS_INCREMENT; @@ -117,7 +116,7 @@ pango_coverage_copy (PangoCoverage *coverage) PangoCoverage * pango_coverage_ref (PangoCoverage *coverage) { - g_return_if_fail (coverage != NULL); + g_return_val_if_fail (coverage != NULL, NULL); coverage->ref_count++; -- cgit v1.2.1