summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-06-29 02:51:24 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-06-29 02:51:24 +0000
commit01ddd34f67aa41dbe06f09c12ef884a07669b651 (patch)
tree5e17fa6f79f31474b6837f99ef38cef704faf3ee
parent9c41176796502c33fec770dc5952bdcdc9db3783 (diff)
downloadpango-01ddd34f67aa41dbe06f09c12ef884a07669b651.tar.gz
Require GLib-1.3.7
Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7 * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c pango/pangox-fontmap.c pango/pangoxft-fontmap.c: Fix args to g_type_init().
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLog.pre-1-08
-rw-r--r--ChangeLog.pre-1-108
-rw-r--r--ChangeLog.pre-1-28
-rw-r--r--ChangeLog.pre-1-48
-rw-r--r--ChangeLog.pre-1-68
-rw-r--r--ChangeLog.pre-1-88
-rw-r--r--configure.in2
-rw-r--r--examples/viewer-qt.cc2
-rw-r--r--pango/pangoft2-fontmap.c2
-rw-r--r--pango/pangowin32-fontmap.c2
-rw-r--r--pango/pangox-fontmap.c2
-rw-r--r--pango/pangoxft-fontmap.c2
13 files changed, 62 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 847c0e96..7c1d8338 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7
+
+ * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c
+ pango/pangox-fontmap.c pango/pangoxft-fontmap.c:
+ Fix args to g_type_init().
+
Tue Jun 26 15:11:30 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (font_set_get_font)
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 847c0e96..7c1d8338 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,11 @@
+Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7
+
+ * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c
+ pango/pangox-fontmap.c pango/pangoxft-fontmap.c:
+ Fix args to g_type_init().
+
Tue Jun 26 15:11:30 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (font_set_get_font)
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 847c0e96..7c1d8338 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7
+
+ * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c
+ pango/pangox-fontmap.c pango/pangoxft-fontmap.c:
+ Fix args to g_type_init().
+
Tue Jun 26 15:11:30 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (font_set_get_font)
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 847c0e96..7c1d8338 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7
+
+ * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c
+ pango/pangox-fontmap.c pango/pangoxft-fontmap.c:
+ Fix args to g_type_init().
+
Tue Jun 26 15:11:30 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (font_set_get_font)
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 847c0e96..7c1d8338 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7
+
+ * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c
+ pango/pangox-fontmap.c pango/pangoxft-fontmap.c:
+ Fix args to g_type_init().
+
Tue Jun 26 15:11:30 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (font_set_get_font)
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 847c0e96..7c1d8338 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7
+
+ * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c
+ pango/pangox-fontmap.c pango/pangoxft-fontmap.c:
+ Fix args to g_type_init().
+
Tue Jun 26 15:11:30 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (font_set_get_font)
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 847c0e96..7c1d8338 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Thu Jun 28 21:49:30 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (GLIB_REQUIRED_VERSION): Require GLib-1.3.7
+
+ * pango/pangoft2-fontmap.c pango/pangowin32-fontmap.c
+ pango/pangox-fontmap.c pango/pangoxft-fontmap.c:
+ Fix args to g_type_init().
+
Tue Jun 26 15:11:30 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (font_set_get_font)
diff --git a/configure.in b/configure.in
index c701acd0..ee3ed155 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ AM_CONDITIONAL(HAVE_XFT, $have_xft)
#
# Checks for GLib
#
-GLIB_REQUIRED_VERSION=1.3.6
+GLIB_REQUIRED_VERSION=1.3.7
AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
AC_MSG_ERROR([
diff --git a/examples/viewer-qt.cc b/examples/viewer-qt.cc
index 881d8dec..fe2986be 100644
--- a/examples/viewer-qt.cc
+++ b/examples/viewer-qt.cc
@@ -508,7 +508,7 @@ main (int argc, char **argv)
QApplication a (argc, argv);
const char *filename;
- g_type_init ((GTypeDebugFlags) 0);
+ g_type_init ();
QApplication::setStyle (new QCDEStyle());
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index 5a15e3ff..76949e65 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -315,7 +315,7 @@ pango_ft2_font_map_for_display (void)
gboolean read_font;
/* Make sure that the type system is initialized */
- g_type_init (0);
+ g_type_init ();
if (pango_ft2_global_fontmap != NULL)
return PANGO_FONT_MAP (pango_ft2_global_fontmap);
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 95d9640a..0a12eff6 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -225,7 +225,7 @@ pango_win32_font_map_for_display (void)
RECT rect;
/* Make sure that the type system is initialized */
- g_type_init (0);
+ g_type_init ();
if (fontmap != NULL)
return PANGO_FONT_MAP (fontmap);
diff --git a/pango/pangox-fontmap.c b/pango/pangox-fontmap.c
index f95eb5d7..ae92f507 100644
--- a/pango/pangox-fontmap.c
+++ b/pango/pangox-fontmap.c
@@ -220,7 +220,7 @@ pango_x_font_map_for_display (Display *display)
g_return_val_if_fail (display != NULL, NULL);
/* Make sure that the type system is initialized */
- g_type_init (0);
+ g_type_init ();
while (tmp_list)
{
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c
index 15696143..c9f044a6 100644
--- a/pango/pangoxft-fontmap.c
+++ b/pango/pangoxft-fontmap.c
@@ -153,7 +153,7 @@ pango_xft_get_font_map (Display *display,
g_return_val_if_fail (display != NULL, NULL);
/* Make sure that the type system is initialized */
- g_type_init (0);
+ g_type_init ();
while (tmp_list)
{
View Lorry Controller Status