summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-1-1010
-rw-r--r--ChangeLog.pre-1-210
-rw-r--r--ChangeLog.pre-1-410
-rw-r--r--ChangeLog.pre-1-610
-rw-r--r--ChangeLog.pre-1-810
-rw-r--r--configure.in2
-rw-r--r--modules/basic/basic-fc.c3
-rw-r--r--modules/basic/basic-xft.c3
-rw-r--r--modules/indic/devanagari-x.c3
-rw-r--r--pango/modules.c15
-rw-r--r--pango/pango-utils.c8
-rw-r--r--pango/pangoft2.c4
-rw-r--r--pango/querymodules.c24
14 files changed, 91 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 45a7aa88..78ebd3a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Dec 6 18:07:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/indic/devanagari-x.c, pango/modules.c
+ pango/pango-utils.c pango/pangoft2.c pango/querymodules.c:
+ Convert [sf]printf to g_[sf]printf, or, where
+ appropriate g_printerr(). (Based on patch from
+ Matthias Clasen, #99321)
+
+ * configure.in: Require glib-2.1.3.
+
Fri Dec 6 17:56:32 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add missing thai-xft to thai-modules.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 45a7aa88..78ebd3a4 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Fri Dec 6 18:07:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/indic/devanagari-x.c, pango/modules.c
+ pango/pango-utils.c pango/pangoft2.c pango/querymodules.c:
+ Convert [sf]printf to g_[sf]printf, or, where
+ appropriate g_printerr(). (Based on patch from
+ Matthias Clasen, #99321)
+
+ * configure.in: Require glib-2.1.3.
+
Fri Dec 6 17:56:32 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add missing thai-xft to thai-modules.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 45a7aa88..78ebd3a4 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+Fri Dec 6 18:07:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/indic/devanagari-x.c, pango/modules.c
+ pango/pango-utils.c pango/pangoft2.c pango/querymodules.c:
+ Convert [sf]printf to g_[sf]printf, or, where
+ appropriate g_printerr(). (Based on patch from
+ Matthias Clasen, #99321)
+
+ * configure.in: Require glib-2.1.3.
+
Fri Dec 6 17:56:32 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add missing thai-xft to thai-modules.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 45a7aa88..78ebd3a4 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Fri Dec 6 18:07:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/indic/devanagari-x.c, pango/modules.c
+ pango/pango-utils.c pango/pangoft2.c pango/querymodules.c:
+ Convert [sf]printf to g_[sf]printf, or, where
+ appropriate g_printerr(). (Based on patch from
+ Matthias Clasen, #99321)
+
+ * configure.in: Require glib-2.1.3.
+
Fri Dec 6 17:56:32 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add missing thai-xft to thai-modules.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 45a7aa88..78ebd3a4 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Fri Dec 6 18:07:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/indic/devanagari-x.c, pango/modules.c
+ pango/pango-utils.c pango/pangoft2.c pango/querymodules.c:
+ Convert [sf]printf to g_[sf]printf, or, where
+ appropriate g_printerr(). (Based on patch from
+ Matthias Clasen, #99321)
+
+ * configure.in: Require glib-2.1.3.
+
Fri Dec 6 17:56:32 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add missing thai-xft to thai-modules.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 45a7aa88..78ebd3a4 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Fri Dec 6 18:07:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/indic/devanagari-x.c, pango/modules.c
+ pango/pango-utils.c pango/pangoft2.c pango/querymodules.c:
+ Convert [sf]printf to g_[sf]printf, or, where
+ appropriate g_printerr(). (Based on patch from
+ Matthias Clasen, #99321)
+
+ * configure.in: Require glib-2.1.3.
+
Fri Dec 6 17:56:32 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add missing thai-xft to thai-modules.
diff --git a/configure.in b/configure.in
index b786d0eb..3852484d 100644
--- a/configure.in
+++ b/configure.in
@@ -251,7 +251,7 @@ fi
#
# Checks for GLib
#
-GLIB_REQUIRED_VERSION=2.0.0
+GLIB_REQUIRED_VERSION=2.1.3
AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
AC_MSG_ERROR([
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index 35f88657..c8c419a3 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -22,6 +22,7 @@
#include <string.h>
+#include <glib/gprintf.h>
#include "pangoxft.h"
#include "pango-engine.h"
#include "pango-utils.h"
@@ -142,7 +143,7 @@ basic_engine_shape (PangoFont *font,
char buf[9];
int len = (wc < 65536) ? 6 : 8;
- sprintf(buf, "[%0*X]", len - 2, wc);
+ g_sprintf (buf, "[%0*X]", len - 2, wc);
n_chars += len - 1;
pango_glyph_string_set_size (glyphs, n_chars);
diff --git a/modules/basic/basic-xft.c b/modules/basic/basic-xft.c
index 35f88657..c8c419a3 100644
--- a/modules/basic/basic-xft.c
+++ b/modules/basic/basic-xft.c
@@ -22,6 +22,7 @@
#include <string.h>
+#include <glib/gprintf.h>
#include "pangoxft.h"
#include "pango-engine.h"
#include "pango-utils.h"
@@ -142,7 +143,7 @@ basic_engine_shape (PangoFont *font,
char buf[9];
int len = (wc < 65536) ? 6 : 8;
- sprintf(buf, "[%0*X]", len - 2, wc);
+ g_sprintf (buf, "[%0*X]", len - 2, wc);
n_chars += len - 1;
pango_glyph_string_set_size (glyphs, n_chars);
diff --git a/modules/indic/devanagari-x.c b/modules/indic/devanagari-x.c
index ec8012e3..e81e600a 100644
--- a/modules/indic/devanagari-x.c
+++ b/modules/indic/devanagari-x.c
@@ -36,7 +36,6 @@
#include <glib.h>
-#include <stdio.h>
#include <string.h>
#include "pangox.h"
@@ -183,7 +182,7 @@ shuffle_one_along (gunichar *start, gunichar *end)
{
end--;
if (*end != 0)
- fprintf (stderr, "pango devanagari error, please report. bad shuffle!\n");
+ g_printerr ("pango devanagari error, please report. bad shuffle!\n");
while (end > start)
{
end[0] = end[-1];
diff --git a/pango/modules.c b/pango/modules.c
index 32ae2533..fd36243a 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -21,7 +21,6 @@
#include "config.h"
-#include <stdio.h>
#include <string.h>
#include <limits.h>
#include <errno.h>
@@ -157,16 +156,16 @@ pango_engine_pair_get_engine (PangoEnginePair *pair)
module = g_module_open (module_name, 0);
if (!module)
{
- fprintf(stderr, "Cannot load module %s: %s\n",
- module_name, g_module_error());
+ g_printerr ("Cannot load module %s: %s\n",
+ module_name, g_module_error());
return NULL;
}
g_module_symbol (module, "script_engine_load", (gpointer *) &load);
if (!load)
{
- fprintf(stderr, "cannot retrieve script_engine_load from %s: %s\n",
- module_name, g_module_error());
+ g_printerr ("cannot retrieve script_engine_load from %s: %s\n",
+ module_name, g_module_error());
g_module_close (module);
return NULL;
}
@@ -279,14 +278,14 @@ process_module_file (FILE *module_file)
range = g_new (PangoEngineRange, 1);
if (sscanf(tmp_buf->str, "%d-%d:", &start, &end) != 2)
{
- fprintf(stderr, "Error reading modules file");
+ g_printerr ("Error reading modules file");
have_error = TRUE;
goto error;
}
q = strchr (tmp_buf->str, ':');
if (!q)
{
- fprintf(stderr, "Error reading modules file");
+ g_printerr ( "Error reading modules file");
have_error = TRUE;
goto error;
}
@@ -306,7 +305,7 @@ process_module_file (FILE *module_file)
if (i<3)
{
- fprintf(stderr, "Error reading modules file");
+ g_printerr ("Error reading modules file");
have_error = TRUE;
goto error;
}
diff --git a/pango/pango-utils.c b/pango/pango-utils.c
index 29593ea2..0189328d 100644
--- a/pango/pango-utils.c
+++ b/pango/pango-utils.c
@@ -462,8 +462,8 @@ read_config_file (const char *filename, gboolean enoent_error)
if (!file)
{
if (errno != ENOENT || enoent_error)
- fprintf (stderr, "Pango:%s: Error opening config file: %s\n",
- filename, g_strerror (errno));
+ g_printerr ("Pango:%s: Error opening config file: %s\n",
+ filename, g_strerror (errno));
return;
}
@@ -573,7 +573,7 @@ read_config_file (const char *filename, gboolean enoent_error)
if (errstring)
{
- fprintf (stderr, "Pango:%s:%d: %s\n", filename, line, errstring);
+ g_printerr ("Pango:%s:%d: %s\n", filename, line, errstring);
g_free (errstring);
}
@@ -1415,7 +1415,7 @@ read_alias_file (const char *filename)
if (errstring)
{
- fprintf (stderr, "Pango:%s:%d: %s\n", filename, line, errstring);
+ g_printerr ("Pango:%s:%d: %s\n", filename, line, errstring);
g_free (errstring);
}
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index b84232ae..b404eb98 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -24,9 +24,9 @@
#include <string.h>
#include <stdlib.h>
-#include <stdio.h>
#include <math.h>
#include <glib.h>
+#include <glib/gprintf.h>
#include <freetype/freetype.h>
@@ -1088,7 +1088,7 @@ _pango_ft2_ft_strerror (FT_Error error)
{
static char default_msg[100];
- sprintf (default_msg, "Unknown FreeType2 error %#x", error);
+ g_sprintf (default_msg, "Unknown FreeType2 error %#x", error);
return default_msg;
}
}
diff --git a/pango/querymodules.c b/pango/querymodules.c
index 95c67d89..6b126409 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -33,7 +33,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include <stdio.h>
+#include <glib/gprintf.h>
#if USE_LA_MODULES
#define SOEXT ".la"
@@ -102,7 +102,7 @@ query_module (const char *dir, const char *name)
module = g_module_open (path, 0);
if (!module)
- fprintf(stderr, "Cannot load module %s: %s\n", path, g_module_error());
+ g_printerr ("Cannot load module %s: %s\n", path, g_module_error ());
if (module &&
g_module_symbol (module, "script_engine_list", (gpointer *) &list) &&
@@ -131,25 +131,25 @@ query_module (const char *dir, const char *name)
quoted_path = g_strdup (path);
}
- printf ("%s%s%s %s %s %s ", quote, quoted_path, quote,
- engines[i].id, engines[i].engine_type, engines[i].render_type);
+ g_printf ("%s%s%s %s %s %s ", quote, quoted_path, quote,
+ engines[i].id, engines[i].engine_type, engines[i].render_type);
g_free (quoted_path);
for (j=0; j < engines[i].n_ranges; j++)
{
if (j != 0)
- printf (" ");
- printf ("%d-%d:%s",
+ g_printf (" ");
+ g_printf ("%d-%d:%s",
engines[i].ranges[j].start,
engines[i].ranges[j].end,
engines[i].ranges[j].langs);
}
- printf ("\n");
+ g_printf ("\n");
}
}
else
{
- fprintf (stderr, "%s does not export Pango module API\n", path);
+ g_printerr ("%s does not export Pango module API\n", path);
}
g_free (path);
@@ -163,9 +163,9 @@ int main (int argc, char **argv)
int i;
char *path;
- printf ("# Pango Modules file\n"
- "# Automatically generated file, do not edit\n"
- "#\n");
+ g_printf ("# Pango Modules file\n"
+ "# Automatically generated file, do not edit\n"
+ "#\n");
if (argc == 1) /* No arguments given */
{
@@ -179,7 +179,7 @@ int main (int argc, char **argv)
"modules",
NULL);
- printf ("# ModulesPath = %s\n#\n", path);
+ g_printf ("# ModulesPath = %s\n#\n", path);
dirs = pango_split_file_list (path);
View Lorry Controller Status