Index: configure.in
===================================================================
RCS file: /cvs/gnome/pango/configure.in,v
retrieving revision 1.208
diff -u -p -r1.208 configure.in
--- configure.in	15 Aug 2005 22:45:13 -0000	1.208
+++ configure.in	3 Oct 2005 08:56:16 -0000
@@ -636,7 +636,7 @@ done
 IFS="$pango_save_ifs"
 
 cat >> pango/module-defs-x.c <<EOTEXT
- { NULL, NULL, NULL },
+ { NULL, NULL, NULL, NULL },
 };
 EOTEXT
 ])
@@ -665,7 +665,7 @@ done
 IFS="$pango_save_ifs"
 
 cat >> pango/module-defs-fc.c <<EOTEXT
- { NULL, NULL, NULL },
+ { NULL, NULL, NULL, NULL },
 };
 EOTEXT
 ])
@@ -694,7 +694,7 @@ done
 IFS="$pango_save_ifs"
 
 cat >> pango/module-defs-win32.c <<EOTEXT
- { NULL, NULL, NULL },
+ { NULL, NULL, NULL, NULL },
 };
 EOTEXT
 ])
Index: examples/argcontext.c
===================================================================
RCS file: /cvs/gnome/pango/examples/argcontext.c,v
retrieving revision 1.2
diff -u -p -r1.2 argcontext.c
--- examples/argcontext.c	5 Apr 2004 20:40:35 -0000	1.2
+++ examples/argcontext.c	3 Oct 2005 08:56:16 -0000
@@ -99,7 +99,7 @@ parse_int (const char *arg_name,
 void
 arg_context_print_help (ArgContext *context)
 {
-  int j, k;
+  unsigned int j, k;
   int max_name_len = 0;
 
   for (j = 0; j < context->tables->len; j++)
@@ -169,7 +169,7 @@ arg_context_parse (ArgContext *context,
 			if (strncmp (arg, table[k].name, len) == 0 &&
 			    (arg[len] == '=' || arg[len] == 0))
 			  {
-			    char *value = NULL;
+			    const char *value = NULL;
 
 			    (*argv)[i] = NULL;
 
@@ -187,7 +187,7 @@ arg_context_parse (ArgContext *context,
 			    switch (table[k].type)
 			      {
 			      case ARG_STRING:
-				*(gchar **)table[k].location = value;
+				*(const gchar **)table[k].location = value;
 				break;
 			      case ARG_INT:
 				if (!parse_int (table[k].name, value,
Index: examples/cairoview.c
===================================================================
RCS file: /cvs/gnome/pango/examples/cairoview.c,v
retrieving revision 1.13
diff -u -p -r1.13 cairoview.c
--- examples/cairoview.c	29 Aug 2005 09:16:28 -0000	1.13
+++ examples/cairoview.c	3 Oct 2005 08:56:16 -0000
@@ -123,7 +123,7 @@ do_cairo_transform (PangoContext *contex
 }
 
 void
-update ()
+update (void)
 {
   RenderData render_data;
   cairo_surface_t *surface;
Index: examples/renderdemo.c
===================================================================
RCS file: /cvs/gnome/pango/examples/renderdemo.c,v
retrieving revision 1.19
diff -u -p -r1.19 renderdemo.c
--- examples/renderdemo.c	26 Jul 2005 11:08:08 -0000	1.19
+++ examples/renderdemo.c	3 Oct 2005 08:56:16 -0000
@@ -42,7 +42,7 @@ char *prog_name;
 
 gboolean opt_display = FALSE;
 int opt_dpi = 96;
-char *opt_font = MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE);
+const char *opt_font = MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE);
 gboolean opt_header = FALSE;
 char *opt_output = NULL;
 int opt_margin = 10;
@@ -73,7 +73,7 @@ fail (const char *format, ...)
   exit (1);
 }
 
-PangoFontDescription *
+static PangoFontDescription *
 get_font_description (void)
 {
   PangoFontDescription *font_description = pango_font_description_from_string (opt_font);
@@ -301,9 +301,15 @@ do_output (PangoContext     *context,
 
 static void
 show_help (ArgContext *context,
-	   const char *name,
-	   const char *arg,
-	   gpointer    data)
+	   const char *name G_GNUC_UNUSED,
+	   const char *arg G_GNUC_UNUSED,
+	   gpointer    data G_GNUC_UNUSED) G_GNUC_NORETURN;
+
+static void
+show_help (ArgContext *context,
+	   const char *name G_GNUC_UNUSED,
+	   const char *arg G_GNUC_UNUSED,
+	   gpointer    data G_GNUC_UNUSED)
 {
   g_print ("%s - An example viewer for Pango\n"
 	   "\n"
@@ -321,7 +327,8 @@ show_help (ArgContext *context,
  * want metrics that are independent of scale.
  */
 void
-fc_substitute_func (FcPattern *pattern, gpointer   data)
+fc_substitute_func (FcPattern *pattern,
+		    gpointer   data G_GNUC_UNUSED)
 {
   if (opt_hinting != HINT_DEFAULT)
     {
@@ -333,11 +340,11 @@ fc_substitute_func (FcPattern *pattern, 
     }
 }
 
-void
-parse_ellipsis (ArgContext *arg_context,
-		const char *name,
+static void
+parse_ellipsis (ArgContext *arg_context G_GNUC_UNUSED,
+		const char *name G_GNUC_UNUSED,
 		const char *arg,
-		gpointer    data)
+		gpointer    data G_GNUC_UNUSED)
 {
   static GEnumClass *class = NULL;
   GEnumValue *value;
@@ -352,11 +359,11 @@ parse_ellipsis (ArgContext *arg_context,
   opt_ellipsize = value->value;
 }
 
-void
-parse_hinting (ArgContext *arg_context,
-	       const char *name,
+static void
+parse_hinting (ArgContext *arg_context G_GNUC_UNUSED,
+	       const char *name G_GNUC_UNUSED,
 	       const char *arg,
-	       gpointer    data)
+	       gpointer    data G_GNUC_UNUSED)
 {
   static GEnumClass *class = NULL;
 
@@ -378,40 +385,40 @@ parse_options (int argc, char *argv[])
 {
   static const ArgDesc args[] = {
     { "no-auto-dir","Don't set layout direction according to contents",
-      ARG_NOBOOL,   &opt_auto_dir },
+      ARG_NOBOOL,   &opt_auto_dir, NULL },
     { "display",    "Show output using ImageMagick",
-      ARG_BOOL,     &opt_display },
+      ARG_BOOL,     &opt_display, NULL },
     { "dpi",        "Set the dpi'",
-      ARG_INT,      &opt_dpi },
+      ARG_INT,      &opt_dpi, NULL },
     { "ellipsize",  "Ellipsization mode [=none/start/middle/end]",
       ARG_CALLBACK, NULL, parse_ellipsis },
     { "font",       "Set the font name",
-      ARG_STRING,   &opt_font },
+      ARG_STRING,   &opt_font, NULL },
     { "header",     "Display the options in the output",
-      ARG_BOOL,     &opt_header },
+      ARG_BOOL,     &opt_header, NULL },
     { "help",       "Show this output",
-      ARG_CALLBACK, NULL, show_help, },
+      ARG_CALLBACK, NULL, show_help },
     { "hinting",    "Hinting style [=none/auto/full]",
-      ARG_CALLBACK, NULL, parse_hinting, },
+      ARG_CALLBACK, NULL, parse_hinting },
     { "margin",     "Set the margin on the output in pixels",
-      ARG_INT,      &opt_margin },
+      ARG_INT,      &opt_margin, NULL },
     { "markup",     "Interpret contents as Pango markup",
-      ARG_BOOL,     &opt_markup },
+      ARG_BOOL,     &opt_markup, NULL },
     { "output",     "Name of output file",
-      ARG_STRING,   &opt_output },
+      ARG_STRING,   &opt_output, NULL },
     { "rtl",        "Set base dir to RTL",
-      ARG_BOOL,     &opt_rtl },
+      ARG_BOOL,     &opt_rtl, NULL },
     { "rotate",     "Angle at which to rotate results",
-      ARG_INT,      &opt_rotate },
+      ARG_INT,      &opt_rotate, NULL },
     { "text",       "Text to display (instead of a file)",
-      ARG_STRING,   &opt_text },
+      ARG_STRING,   &opt_text, NULL },
     { "waterfall",  "Create a waterfall display",
-      ARG_BOOL,     &opt_waterfall },
+      ARG_BOOL,     &opt_waterfall, NULL },
     { "width",      "Width in points to which to wrap output",
-      ARG_INT,      &opt_width },
+      ARG_INT,      &opt_width, NULL },
     { "indent",     "Width in points to indent paragraphs",
-      ARG_INT,      &opt_indent },
-    { NULL }
+      ARG_INT,      &opt_indent, NULL },
+    { NULL, NULL, 0, NULL, NULL }
   };
 
   ArgContext *arg_context;
Index: examples/renderdemo.h
===================================================================
RCS file: /cvs/gnome/pango/examples/renderdemo.h,v
retrieving revision 1.5
diff -u -p -r1.5 renderdemo.h
--- examples/renderdemo.h	26 Jul 2005 11:08:08 -0000	1.5
+++ examples/renderdemo.h	3 Oct 2005 08:56:16 -0000
@@ -37,7 +37,7 @@ typedef void (*TransformCallback) (Pango
 				   PangoMatrix  *transform,
 				   gpointer      data);
 
-void fail (const char *format, ...) G_GNUC_PRINTF (1, 2);
+void fail (const char *format, ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN;
 
 void   parse_options      (int               argc,
 			   char             *argv[]);
@@ -47,7 +47,8 @@ void   do_output          (PangoContext 
 			   gpointer          cb_data,
 			   int              *width,
 			   int              *height);
-void   finalize (void);
+void   update             (void);
+void   finalize           (void);
 void   fc_substitute_func (FcPattern        *pattern,
 			   gpointer          data);
 gchar *get_options_string (void);
@@ -56,7 +57,7 @@ extern char *prog_name;
 
 extern gboolean opt_display;
 extern int opt_dpi;
-extern char *opt_font;
+extern const char *opt_font;
 extern gboolean opt_header;
 extern char *opt_output;
 extern int opt_margin;
Index: examples/xftview.c
===================================================================
RCS file: /cvs/gnome/pango/examples/xftview.c,v
retrieving revision 1.3
diff -u -p -r1.3 xftview.c
--- examples/xftview.c	3 Feb 2005 20:23:18 -0000	1.3
+++ examples/xftview.c	3 Oct 2005 08:56:16 -0000
@@ -38,7 +38,7 @@ static void
 xft_render (PangoLayout *layout,
 	    int          x,
 	    int          y,
-	    gpointer     data)
+	    gpointer     data G_GNUC_UNUSED)
 {
   XftColor color;
 
@@ -51,7 +51,7 @@ xft_render (PangoLayout *layout,
 }
 
 void
-update ()
+update (void)
 {
   XRectangle area;
   XftColor color;
Index: modules/arabic/arabic-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/arabic/arabic-fc.c,v
retrieving revision 1.19
diff -u -p -r1.19 arabic-fc.c
--- modules/arabic/arabic-fc.c	23 Jul 2005 19:24:46 -0000	1.19
+++ modules/arabic/arabic-fc.c	3 Oct 2005 08:56:16 -0000
@@ -154,14 +154,18 @@ swap_range (PangoGlyphString *glyphs, in
 }
 
 static void
-set_glyph (PangoFont *font, PangoGlyphString *glyphs, int i, int offset, PangoGlyph glyph)
+set_glyph (PangoFont *font G_GNUC_UNUSED,
+	   PangoGlyphString *glyphs,
+	   int i,
+	   int offset,
+	   PangoGlyph glyph)
 {
   glyphs->glyphs[i].glyph = glyph;
   glyphs->log_clusters[i] = offset;
 }
 
 static void 
-fallback_shape (PangoEngineShape *engine,
+fallback_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		PangoFont        *font,
 		const char       *text,
 		gint              length,
Index: modules/basic/basic-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/basic/basic-fc.c,v
retrieving revision 1.20
diff -u -p -r1.20 basic-fc.c
--- modules/basic/basic-fc.c	23 Jul 2005 19:24:46 -0000	1.20
+++ modules/basic/basic-fc.c	3 Oct 2005 08:56:16 -0000
@@ -119,7 +119,7 @@ set_glyph (PangoFont        *font,
 }
 
 static void 
-basic_engine_shape (PangoEngineShape *engine,
+basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		    PangoFont        *font,
 		    const char       *text,
 		    gint              length,
Index: modules/basic/basic-x.c
===================================================================
RCS file: /cvs/gnome/pango/modules/basic/basic-x.c,v
retrieving revision 1.39
diff -u -p -r1.39 basic-x.c
--- modules/basic/basic-x.c	23 Jul 2005 19:24:46 -0000	1.39
+++ modules/basic/basic-x.c	3 Oct 2005 08:56:16 -0000
@@ -51,8 +51,8 @@ typedef PangoGlyph (*ConvFunc) (CharCach
 struct _Charset
 {
   int   index;
-  char *id;
-  char *x_charset;
+  const char *id;
+  const char *x_charset;
   ConvFunc conv_func;
 };
 
@@ -214,7 +214,7 @@ find_char (CharCache *cache, PangoFont *
     mask_table = cache->mask_tables[mask_index];
   else
     {
-      char *charset_names[G_N_ELEMENTS(charsets)];
+      const char *charset_names[G_N_ELEMENTS(charsets)];
       Charset *charsets_map[G_N_ELEMENTS(charsets)];
       guint mask;
       int n_charsets = 0;
@@ -227,7 +227,7 @@ find_char (CharCache *cache, PangoFont *
       /* Find the character sets that are included in this mask
        */
 
-      for (i=0; i<G_N_ELEMENTS(charsets); i++)
+      for (i=0; i<(int)G_N_ELEMENTS(charsets); i++)
 	{
 	  int charset_index = cache->ordering->charsets[i];
 	  
@@ -240,7 +240,7 @@ find_char (CharCache *cache, PangoFont *
 	    }
 	}
       
-      mask_table->n_subfonts = pango_x_list_subfonts (font, charset_names, n_charsets, &mask_table->subfonts, &subfont_charsets);
+      mask_table->n_subfonts = pango_x_list_subfonts (font, (char**)charset_names, n_charsets, &mask_table->subfonts, &subfont_charsets);
 
       mask_table->charsets = g_new (Charset *, mask_table->n_subfonts);
       for (i=0; i<mask_table->n_subfonts; i++)
@@ -303,7 +303,7 @@ set_glyph (PangoFont *font, PangoGlyphSt
 }
 
 static PangoGlyph
-conv_8bit (CharCache  *cache,
+conv_8bit (CharCache  *cache G_GNUC_UNUSED,
 	   GIConv      cd,
 	   const char *input)
 {
@@ -322,7 +322,7 @@ conv_8bit (CharCache  *cache,
 }
 
 static PangoGlyph
-conv_eucjp (CharCache  *cache,
+conv_eucjp (CharCache  *cache G_GNUC_UNUSED,
 	    GIConv      cd,
 	    const char *input)
 {
@@ -348,7 +348,7 @@ conv_eucjp (CharCache  *cache,
 }
 
 static PangoGlyph
-conv_16bit (CharCache  *cache,
+conv_16bit (CharCache  *cache G_GNUC_UNUSED,
 	    GIConv      cd,
 	    const char *input)
 {
@@ -370,9 +370,9 @@ conv_16bit (CharCache  *cache,
 }
 
 static PangoGlyph
-conv_16bit_MSB_on (CharCache  *cache,
-	    GIConv      cd,
-	    const char *input)
+conv_16bit_MSB_on (CharCache  *cache G_GNUC_UNUSED,
+	           GIConv      cd,
+	           const char *input)
 {
   char outbuf[2];
 
@@ -392,7 +392,7 @@ conv_16bit_MSB_on (CharCache  *cache,
 }
 
 static PangoGlyph
-conv_gb18030_1 (CharCache  *cache,
+conv_gb18030_1 (CharCache  *cache G_GNUC_UNUSED,
 		GIConv      cd,
 		const char *input)
 {
@@ -415,7 +415,7 @@ conv_gb18030_1 (CharCache  *cache,
 }
 
 static PangoGlyph
-conv_euctw (CharCache  *cache,
+conv_euctw (CharCache  *cache G_GNUC_UNUSED,
 	    GIConv      cd,
 	    const char *input)
 {
@@ -440,8 +440,8 @@ conv_euctw (CharCache  *cache,
 }
 
 static PangoGlyph
-conv_ucs4 (CharCache  *cache,
-	   GIConv      cd,
+conv_ucs4 (CharCache  *cache G_GNUC_UNUSED,
+	   GIConv      cd G_GNUC_UNUSED,
 	   const char *input)
 {
   return g_utf8_get_char (input);
@@ -490,7 +490,7 @@ ordering_for_lang (PangoLanguage *lang)
 {
   int i;
 
-  for (i = 0; i < G_N_ELEMENTS (charset_orderings) - 1; i++)
+  for (i = 0; i < (int)G_N_ELEMENTS (charset_orderings) - 1; i++)
     {
       if (pango_language_matches (lang, charset_orderings[i].langs))
 	return &charset_orderings[i];
@@ -555,7 +555,7 @@ get_char_cache (PangoFont     *font,
 }
 
 static void 
-basic_engine_shape (PangoEngineShape *engine,
+basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		    PangoFont        *font,
 		    const char       *text,
 		    gint              length,
@@ -669,7 +669,7 @@ basic_engine_shape (PangoEngineShape *en
 }
 
 static PangoCoverageLevel
-basic_engine_covers (PangoEngineShape *engine,
+basic_engine_covers (PangoEngineShape *engine G_GNUC_UNUSED,
 		     PangoFont        *font,
 		     PangoLanguage    *lang,
 		     gunichar          wc)
Index: modules/hangul/hangul-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/hangul/hangul-fc.c,v
retrieving revision 1.17
diff -u -p -r1.17 hangul-fc.c
--- modules/hangul/hangul-fc.c	23 Jul 2005 19:24:47 -0000	1.17
+++ modules/hangul/hangul-fc.c	3 Oct 2005 08:56:16 -0000
@@ -300,11 +300,11 @@ render_basic (PangoFont *font, gunichar 
 }
 
 static void 
-hangul_engine_shape (PangoEngineShape *engine,
+hangul_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		     PangoFont        *font,
 		     const char       *text,
 		     gint              length,
-		     PangoAnalysis    *analysis,
+		     PangoAnalysis    *analysis G_GNUC_UNUSED,
 		     PangoGlyphString *glyphs)
 {
   int n_chars, n_glyphs;
@@ -312,7 +312,7 @@ hangul_engine_shape (PangoEngineShape *e
   const char *p, *start;
 
   gunichar jamos_static[8];
-  guint max_jamos = G_N_ELEMENTS (jamos_static);
+  gint max_jamos = G_N_ELEMENTS (jamos_static);
   gunichar *jamos = jamos_static;
   int n_jamos;
 
Index: modules/hebrew/hebrew-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/hebrew/hebrew-fc.c,v
retrieving revision 1.12
diff -u -p -r1.12 hebrew-fc.c
--- modules/hebrew/hebrew-fc.c	5 Mar 2005 00:50:28 -0000	1.12
+++ modules/hebrew/hebrew-fc.c	3 Oct 2005 08:56:16 -0000
@@ -118,15 +118,15 @@ add_glyph (PangoGlyphString *glyphs, 
 }
 
 static void
-add_cluster(PangoFont        *font,
+add_cluster(PangoFont        *font G_GNUC_UNUSED,
 	    PangoGlyphString *glyphs,
-	    int              cluster_size,
-	    int              cluster_start,
-	    int              glyph_num[],
-	    PangoGlyph       glyph[],
-	    int              width[],
-	    int              x_offset[],
-	    int              y_offset[])
+	    int               cluster_size,
+	    int               cluster_start,
+	    int               glyph_num[] G_GNUC_UNUSED,
+	    PangoGlyph        glyph[],
+	    int               width[],
+	    int               x_offset[],
+	    int               y_offset[])
 {
   int i;
 
@@ -225,7 +225,7 @@ get_ruleset (FT_Face face)
 }
 
 static void 
-fallback_shape (PangoEngineShape *engine,
+fallback_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		PangoFont        *font,
 		const char       *text,
 		gint              length,
Index: modules/hebrew/hebrew-shaper.c
===================================================================
RCS file: /cvs/gnome/pango/modules/hebrew/hebrew-shaper.c,v
retrieving revision 1.7
diff -u -p -r1.7 hebrew-shaper.c
--- modules/hebrew/hebrew-shaper.c	24 Sep 2003 22:38:14 -0000	1.7
+++ modules/hebrew/hebrew-shaper.c	3 Oct 2005 08:56:16 -0000
@@ -31,6 +31,7 @@
 
 #include <glib.h>
 #include "pango-engine.h"
+#include "hebrew-shaper.h"
 
 /* Wrap all characters above 0xF00 to ALEF. */
 #define ishebrew(wc)                    ((wc)>0x590 && (wc)<0x600)
Index: modules/hebrew/hebrew-shaper.h
===================================================================
RCS file: /cvs/gnome/pango/modules/hebrew/hebrew-shaper.h,v
retrieving revision 1.2
diff -u -p -r1.2 hebrew-shaper.h
--- modules/hebrew/hebrew-shaper.h	21 Jul 2005 18:15:35 -0000	1.2
+++ modules/hebrew/hebrew-shaper.h	3 Oct 2005 08:56:16 -0000
@@ -23,7 +23,7 @@
 #ifndef HEBREW_SHAPER_H
 #define HEBREW_SHAPER_H
 
-char *
+const char *
 hebrew_shaper_get_next_cluster(const char	*text,
 			       gint		length,
 			       gunichar       *cluster,
Index: modules/indic/indic-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/indic-fc.c,v
retrieving revision 1.17
diff -u -p -r1.17 indic-fc.c
--- modules/indic/indic-fc.c	23 Jul 2005 19:24:47 -0000	1.17
+++ modules/indic/indic-fc.c	3 Oct 2005 08:56:16 -0000
@@ -45,8 +45,8 @@ struct _PangoIndicInfo
 {
   PangoOTTag               scriptTag; 
   const IndicOTClassTable *classTable;
-  gchar                   *gsubQuarkName;
-  gchar                   *gposQuarkName;
+  const gchar             *gsubQuarkName;
+  const gchar             *gposQuarkName;
 };
 
 #define ENGINE_SUFFIX "ScriptEngineFc"
@@ -250,7 +250,13 @@ get_gpos_ruleset (FT_Face face, const Pa
 }
 
 static void
-set_glyphs (PangoFont *font, FT_Face face, const gunichar *wcs, gulong *tags, glong n_glyphs, PangoOTBuffer *buffer, gboolean process_zwj)
+set_glyphs (PangoFont      *font G_GNUC_UNUSED,
+	    FT_Face         face,
+	    const gunichar *wcs,
+	    gulong         *tags,
+	    glong           n_glyphs,
+	    PangoOTBuffer  *buffer,
+	    gboolean        process_zwj)
 {
   gint i;
 
@@ -416,7 +422,7 @@ PANGO_MODULE_ENTRY(list) (PangoEngineInf
 PangoEngine *
 PANGO_MODULE_ENTRY(create) (const char *id)
 {
-  gint i;
+  guint i;
 
   for (i = 0; i < G_N_ELEMENTS(script_engines); i += 1)
     {
Index: modules/indic/mprefixups.c
===================================================================
RCS file: /cvs/gnome/pango/modules/indic/mprefixups.c,v
retrieving revision 1.4
diff -u -p -r1.4 mprefixups.c
--- modules/indic/mprefixups.c	20 Sep 2004 18:04:13 -0000	1.4
+++ modules/indic/mprefixups.c	3 Oct 2005 08:56:16 -0000
@@ -64,8 +64,8 @@ void indic_mprefixups_apply(MPreFixups *
     glong fixup;
 
     for (fixup = 0; fixup < mprefixups->fFixupCount; fixup += 1) {
-	glong baseIndex = mprefixups->fFixupData[fixup].fBaseIndex;
-	glong mpreIndex = mprefixups->fFixupData[fixup].fMPreIndex;
+	gulong baseIndex = mprefixups->fFixupData[fixup].fBaseIndex;
+	gulong mpreIndex = mprefixups->fFixupData[fixup].fMPreIndex;
 	glong baseGlyph = -1;
 	glong mpreGlyph = -1;
 	glong mpreLimit = -1;
Index: modules/khmer/khmer-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/khmer/khmer-fc.c,v
retrieving revision 1.5
diff -u -p -r1.5 khmer-fc.c
--- modules/khmer/khmer-fc.c	21 Jul 2005 22:13:51 -0000	1.5
+++ modules/khmer/khmer-fc.c	3 Oct 2005 08:56:16 -0000
@@ -516,11 +516,11 @@ get_index (PangoFcFont *fc_font, gunicha
 
 
 static void
-khmer_engine_shape (PangoEngineShape *engine,
+khmer_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
                     PangoFont        *font,
                     const char       *text,
                     int               length,
-                    PangoAnalysis    *analysis,
+                    PangoAnalysis    *analysis G_GNUC_UNUSED,
                     PangoGlyphString *glyphs)
 {
   PangoFcFont *fc_font = PANGO_FC_FONT (font);
Index: modules/syriac/syriac-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/syriac/syriac-fc.c,v
retrieving revision 1.3
diff -u -p -r1.3 syriac-fc.c
--- modules/syriac/syriac-fc.c	23 Jul 2005 19:24:47 -0000	1.3
+++ modules/syriac/syriac-fc.c	3 Oct 2005 08:56:16 -0000
@@ -161,14 +161,18 @@ swap_range (PangoGlyphString *glyphs, in
 }
 
 static void
-set_glyph (PangoFont *font, PangoGlyphString *glyphs, int i, int offset, PangoGlyph glyph)
+set_glyph (PangoFont        *font G_GNUC_UNUSED,
+	   PangoGlyphString *glyphs,
+	   int               i,
+	   int               offset,
+	   PangoGlyph        glyph)
 {
   glyphs->glyphs[i].glyph = glyph;
   glyphs->log_clusters[i] = offset;
 }
 
 static void 
-fallback_shape (PangoEngineShape *engine,
+fallback_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		PangoFont        *font,
 		const char       *text,
 		gint              length,
Index: modules/thai/thai-shaper.c
===================================================================
RCS file: /cvs/gnome/pango/modules/thai/thai-shaper.c,v
retrieving revision 1.18
diff -u -p -r1.18 thai-shaper.c
--- modules/thai/thai-shaper.c	21 Jul 2005 18:15:36 -0000	1.18
+++ modules/thai/thai-shaper.c	3 Oct 2005 08:56:16 -0000
@@ -525,11 +525,11 @@ get_next_cluster(const char	*text,
 }
 
 void 
-thai_engine_shape (PangoEngineShape *engine,
+thai_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		   PangoFont        *font,
 		   const char       *text,
 		   gint              length,
-		   PangoAnalysis    *analysis,
+		   PangoAnalysis    *analysis G_GNUC_UNUSED,
 		   PangoGlyphString *glyphs)
 {
   ThaiFontInfo *font_info;
Index: modules/tibetan/tibetan-fc.c
===================================================================
RCS file: /cvs/gnome/pango/modules/tibetan/tibetan-fc.c,v
retrieving revision 1.1
diff -u -p -r1.1 tibetan-fc.c
--- modules/tibetan/tibetan-fc.c	16 Dec 2004 00:08:00 -0000	1.1
+++ modules/tibetan/tibetan-fc.c	3 Oct 2005 08:56:16 -0000
@@ -126,7 +126,7 @@ get_gsub_ruleset (FT_Face face)
 }
 
 static PangoOTRuleset *
-get_gpos_ruleset (FT_Face face)
+get_gpos_ruleset (FT_Face face G_GNUC_UNUSED)
 {
 #ifdef DO_GPOS
   PangoOTInfo    *info = pango_ot_info_get (face);
@@ -249,11 +249,11 @@ ot_shape (PangoFont        *font,
 }
 
 static void
-tibetan_engine_shape (PangoEngineShape *engine,
+tibetan_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		      PangoFont        *font,
 		      const char       *text,
 		      int               length,
-		      PangoAnalysis    *analysis,
+		      PangoAnalysis    *analysis G_GNUC_UNUSED,
 		      PangoGlyphString *glyphs)
 {
   PangoFcFont *fc_font = PANGO_FC_FONT(font);
Index: pango/break.c
===================================================================
RCS file: /cvs/gnome/pango/pango/break.c,v
retrieving revision 1.32
diff -u -p -r1.32 break.c
--- pango/break.c	26 Aug 2005 18:52:17 -0000	1.32
+++ pango/break.c	3 Oct 2005 08:56:16 -0000
@@ -429,7 +429,7 @@ typedef enum
 void
 pango_default_break (const gchar   *text,
                      gint           length,
-                     PangoAnalysis *analysis,
+                     PangoAnalysis *analysis G_GNUC_UNUSED,
                      PangoLogAttr  *attrs,
                      int            attrs_len)
 {
@@ -1523,7 +1523,7 @@ pango_get_log_attrs (const char    *text
   int chars_in_range;
   static guint engine_type_id = 0;
   static guint render_type_id = 0;
-  PangoAnalysis analysis = { NULL, NULL, NULL, 0 };
+  PangoAnalysis analysis = { NULL, NULL, NULL, 0, NULL, NULL };
 
   analysis.level = level;
 
Index: pango/fonts.c
===================================================================
RCS file: /cvs/gnome/pango/pango/fonts.c,v
retrieving revision 1.68
diff -u -p -r1.68 fonts.c
--- pango/fonts.c	5 Mar 2005 00:50:29 -0000	1.68
+++ pango/fonts.c	3 Oct 2005 08:56:16 -0000
@@ -867,7 +867,7 @@ parse_size (const char *word,
   char *end;
   double size = g_ascii_strtod (word, &end);
 
-  if (end - word == wordlen) /* word is a valid float */
+  if ((size_t)(end - word) == wordlen) /* word is a valid float */
     {
       if (pango_size)
 	*pango_size = (int)(size * PANGO_SCALE + 0.5);
@@ -1094,12 +1094,12 @@ pango_font_description_to_filename (cons
 G_DEFINE_TYPE (PangoFont, pango_font, G_TYPE_OBJECT)
 
 static void
-pango_font_class_init (PangoFontClass *class)
+pango_font_class_init (PangoFontClass *class G_GNUC_UNUSED)
 {
 }
 
 static void
-pango_font_init (PangoFont *font)
+pango_font_init (PangoFont *font G_GNUC_UNUSED)
 {
 }
 
@@ -1465,12 +1465,12 @@ pango_font_metrics_get_strikethrough_thi
 G_DEFINE_TYPE (PangoFontFamily, pango_font_family, G_TYPE_OBJECT)
 
 static void
-pango_font_family_class_init (PangoFontFamilyClass *class)
+pango_font_family_class_init (PangoFontFamilyClass *class G_GNUC_UNUSED)
 {
 }
 
 static void
-pango_font_family_init (PangoFontFamily *family)
+pango_font_family_init (PangoFontFamily *family G_GNUC_UNUSED)
 {
 }
 
@@ -1552,12 +1552,12 @@ pango_font_family_is_monospace (PangoFon
 G_DEFINE_TYPE (PangoFontFace, pango_font_face, G_TYPE_OBJECT)
 
 static void
-pango_font_face_class_init (PangoFontFaceClass *class)
+pango_font_face_class_init (PangoFontFaceClass *class G_GNUC_UNUSED)
 {
 }
 
 static void
-pango_font_face_init (PangoFontFace *face)
+pango_font_face_init (PangoFontFace *face G_GNUC_UNUSED)
 {
 }
 
Index: pango/modules.c
===================================================================
RCS file: /cvs/gnome/pango/pango/modules.c,v
retrieving revision 1.49
diff -u -p -r1.49 modules.c
--- pango/modules.c	12 Dec 2004 21:52:09 -0000	1.49
+++ pango/modules.c	3 Oct 2005 08:56:16 -0000
@@ -172,7 +172,7 @@ pango_module_load (GTypeModule *module)
       pango_module->library = g_module_open (pango_module->path, 0);
       if (!pango_module->library)
 	{
-	  g_warning (g_module_error());
+	  g_warning ("%s", g_module_error());
 	  return FALSE;
 	}
       
@@ -186,7 +186,7 @@ pango_module_load (GTypeModule *module)
 	  !g_module_symbol (pango_module->library, "script_engine_create", 
 			    (gpointer *)&pango_module->create))
 	{
-	  g_warning (g_module_error());
+	  g_warning ("%s", g_module_error());
 	  g_module_close (pango_module->library);
 	  
 	  return FALSE;
@@ -545,7 +545,7 @@ map_add_engine (PangoMapInfo    *info,
 	}
 
       script = pair->info.scripts[i].script;
-      if (script >= map->entries->len)
+      if (script >= (PangoScript)map->entries->len)
 	g_array_set_size (map->entries, script + 1);
 
       entry = &g_array_index (map->entries, PangoMapEntry, script);
@@ -635,7 +635,7 @@ pango_map_get_engine (PangoMap   *map,
   PangoMapEntry *entry = NULL;
   PangoMapEntry *common_entry = NULL;
   
-  if (script < map->entries->len)
+  if (script < (PangoScript)map->entries->len)
     entry = &g_array_index (map->entries, PangoMapEntry, script);
 
   if (PANGO_SCRIPT_COMMON < map->entries->len)
@@ -692,7 +692,7 @@ pango_map_get_engines (PangoMap     *map
   PangoMapEntry *entry = NULL;
   PangoMapEntry *common_entry = NULL;
   
-  if (script < map->entries->len)
+  if (script < (PangoScript)map->entries->len)
     entry = &g_array_index (map->entries, PangoMapEntry, script);
 
   if (PANGO_SCRIPT_COMMON < map->entries->len)
Index: pango/pango-attributes.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-attributes.c,v
retrieving revision 1.53
diff -u -p -r1.53 pango-attributes.c
--- pango/pango-attributes.c	12 Sep 2005 11:36:27 -0000	1.53
+++ pango/pango-attributes.c	3 Oct 2005 08:56:16 -0000
@@ -63,7 +63,7 @@ static PangoAttribute *pango_attr_size_n
  * Return value: the new type ID.
  **/
 PangoAttrType
-pango_attr_type_register (const gchar *name)
+pango_attr_type_register (const gchar *name G_GNUC_UNUSED)
 {
   static guint current_type = 0x1000000;
 
Index: pango/pango-context.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-context.c,v
retrieving revision 1.77
diff -u -p -r1.77 pango-context.c
--- pango/pango-context.c	14 Jun 2005 19:54:18 -0000	1.77
+++ pango/pango-context.c	3 Oct 2005 08:56:16 -0000
@@ -873,7 +873,7 @@ typedef struct {
 } GetShaperFontInfo;
 
 static gboolean
-get_shaper_and_font_foreach (PangoFontset *fontset,
+get_shaper_and_font_foreach (PangoFontset *fontset G_GNUC_UNUSED,
 			     PangoFont    *font,
 			     gpointer      data)
 {
Index: pango/pango-coverage.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-coverage.c,v
retrieving revision 1.15
diff -u -p -r1.15 pango-coverage.c
--- pango/pango-coverage.c	15 Apr 2003 20:44:35 -0000	1.15
+++ pango/pango-coverage.c	3 Oct 2005 08:56:16 -0000
@@ -208,7 +208,7 @@ pango_coverage_set (PangoCoverage     *c
   
   g_return_if_fail (coverage != NULL);
   g_return_if_fail (index >= 0);
-  g_return_if_fail (level >= 0 || level <= 3);
+  g_return_if_fail (level >= 0 && level <= 3);
 
   block_index = index / 256;
 
Index: pango/pango-engine.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-engine.c,v
retrieving revision 1.3
diff -u -p -r1.3 pango-engine.c
--- pango/pango-engine.c	23 Sep 2003 23:11:57 -0000	1.3
+++ pango/pango-engine.c	3 Oct 2005 08:56:16 -0000
@@ -32,7 +32,7 @@ PANGO_DEFINE_TYPE_ABSTRACT (PangoEngineL
 			    PANGO_TYPE_ENGINE);
 
 static PangoCoverageLevel
-pango_engine_shape_real_covers (PangoEngineShape *engine,
+pango_engine_shape_real_covers (PangoEngineShape *engine G_GNUC_UNUSED,
 				PangoFont        *font,
 				PangoLanguage    *language,
 				gunichar          wc)
@@ -46,7 +46,7 @@ pango_engine_shape_real_covers (PangoEng
   return result;
 }
 
-void
+static void
 pango_engine_shape_class_init (PangoEngineShapeClass *class)
 {
   class->covers = pango_engine_shape_real_covers;
@@ -97,7 +97,7 @@ typedef PangoEngineShape PangoFallbackEn
 typedef PangoEngineShapeClass PangoFallbackEngineClass;
 
 static void 
-fallback_engine_shape (PangoEngineShape *engine,
+fallback_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED,
 		       PangoFont        *font,
                        const char       *text,
                        gint              length,
@@ -134,10 +134,10 @@ fallback_engine_shape (PangoEngineShape 
 }
 
 static PangoCoverageLevel
-fallback_engine_covers (PangoEngineShape *engine,
-			PangoFont        *font,
-			PangoLanguage    *lang,
-			gunichar          wc)
+fallback_engine_covers (PangoEngineShape *engine G_GNUC_UNUSED,
+			PangoFont        *font G_GNUC_UNUSED,
+			PangoLanguage    *lang G_GNUC_UNUSED,
+			gunichar          wc G_GNUC_UNUSED)
 {
   return PANGO_COVERAGE_NONE;
 }
Index: pango/pango-engine.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-engine.h,v
retrieving revision 1.12
diff -u -p -r1.12 pango-engine.h
--- pango/pango-engine.h	3 Oct 2005 03:21:47 -0000	1.12
+++ pango/pango-engine.h	3 Oct 2005 08:56:16 -0000
@@ -274,10 +274,11 @@ prefix ## _register_type (GTypeModule *m
       (GBaseFinalizeFunc) NULL,						  \
       (GClassInitFunc) class_init,					  \
       (GClassFinalizeFunc) NULL,					  \
-      NULL,           /* class_data */					  \
+      NULL,          /* class_data */					  \
       sizeof (name),					  		  \
       0,             /* n_prelocs */					  \
       (GInstanceInitFunc) instance_init,				  \
+      NULL           /* value_table */					  \
     };									  \
 									  \
   prefix ## _type =  g_type_module_register_type (module, parent_type,	  \
Index: pango/pango-fontmap.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-fontmap.c,v
retrieving revision 1.15
diff -u -p -r1.15 pango-fontmap.c
--- pango/pango-fontmap.c	3 Mar 2005 19:51:31 -0000	1.15
+++ pango/pango-fontmap.c	3 Oct 2005 08:56:16 -0000
@@ -38,7 +38,7 @@ pango_font_map_class_init (PangoFontMapC
 }
 
 static void
-pango_font_map_init (PangoFontMap *fontmap)
+pango_font_map_init (PangoFontMap *fontmap G_GNUC_UNUSED)
 {
 }
 
@@ -111,7 +111,7 @@ pango_font_map_fontset_add_fonts (PangoF
 				  PangoContext          *context,
 				  PangoFontsetSimple    *fonts,
 				  PangoFontDescription  *desc,
-				  char                  *family)
+				  const char            *family)
 {
   char **aliases;
   int n_aliases;
Index: pango/pango-fontset.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-fontset.c,v
retrieving revision 1.8
diff -u -p -r1.8 pango-fontset.c
--- pango/pango-fontset.c	8 Jul 2004 19:30:45 -0000	1.8
+++ pango/pango-fontset.c	3 Oct 2005 08:56:16 -0000
@@ -274,7 +274,7 @@ pango_fontset_simple_finalize (GObject *
 {
   PangoFontsetSimple *fontset = PANGO_FONTSET_SIMPLE (object);
   PangoCoverage *coverage;
-  int i;
+  unsigned int i;
 
   for (i = 0; i < fontset->fonts->len; i++)
     g_object_unref (g_ptr_array_index(fontset->fonts, i));
@@ -352,7 +352,7 @@ pango_fontset_simple_get_font (PangoFont
   PangoFont *font;
   PangoCoverage *coverage;
   int result = -1;
-  int i;
+  unsigned int i;
   
   for (i = 0; i < simple->fonts->len; i++)
     {
@@ -387,7 +387,7 @@ pango_fontset_simple_foreach (PangoFonts
 			      gpointer                data)
 {
   PangoFontsetSimple *simple = PANGO_FONTSET_SIMPLE (fontset);
-  int i;
+  unsigned int i;
   
   for (i = 0; i < simple->fonts->len; i++)
     {
Index: pango/pango-impl-utils.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-impl-utils.h,v
retrieving revision 1.1
diff -u -p -r1.1 pango-impl-utils.h
--- pango/pango-impl-utils.h	3 Aug 2003 21:57:33 -0000	1.1
+++ pango/pango-impl-utils.h	3 Oct 2005 08:56:16 -0000
@@ -43,10 +43,11 @@ prefix ## _get_type (void)				          
 	  (GBaseFinalizeFunc) NULL,					   \
 	  (GClassInitFunc) class_init,					   \
 	  (GClassFinalizeFunc) NULL,					   \
-	  NULL,           /* class_data */				   \
+	  NULL,          /* class_data */				   \
 	  sizeof (name),						   \
 	  0,             /* n_prelocs */				   \
-	  (GInstanceInitFunc) instance_init				   \
+	  (GInstanceInitFunc) instance_init,				   \
+	  NULL           /* value_table */				   \
 	};								   \
       									   \
       object_type = g_type_register_static (parent_type,	   	   \
Index: pango/pango-layout.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-layout.c,v
retrieving revision 1.142
diff -u -p -r1.142 pango-layout.c
--- pango/pango-layout.c	5 Sep 2005 07:56:50 -0000	1.142
+++ pango/pango-layout.c	3 Oct 2005 08:56:16 -0000
@@ -2304,7 +2304,7 @@ pango_layout_clear_lines (PangoLayout *l
 static void
 imposed_shape (const char       *text,
 	       gint              n_chars,
-	       PangoRectangle   *shape_ink,
+	       PangoRectangle   *shape_ink G_GNUC_UNUSED,
 	       PangoRectangle   *shape_logical,
 	       PangoGlyphString *glyphs)
 {
@@ -3116,7 +3116,7 @@ pango_layout_get_effective_attributes (P
 
 static gboolean
 no_shape_filter_func (PangoAttribute *attribute,
-		      gpointer        data)
+		      gpointer        data G_GNUC_UNUSED)
 {
   static const PangoAttrType no_shape_types[] = {
     PANGO_ATTR_FOREGROUND,
@@ -3128,7 +3128,7 @@ no_shape_filter_func (PangoAttribute *at
 
   int i;
 
-  for (i = 0; i < G_N_ELEMENTS (no_shape_types); i++)
+  for (i = 0; i < (int)G_N_ELEMENTS (no_shape_types); i++)
     if (attribute->klass->type == no_shape_types[i])
       return TRUE;
 
Index: pango/pango-layout.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-layout.h,v
retrieving revision 1.36
diff -u -p -r1.36 pango-layout.h
--- pango/pango-layout.h	22 Jul 2005 15:33:12 -0000	1.36
+++ pango/pango-layout.h	3 Oct 2005 08:56:16 -0000
@@ -163,6 +163,11 @@ void     pango_layout_get_log_attrs (Pan
 void     pango_layout_index_to_pos         (PangoLayout    *layout,
 					    int             index_,
 					    PangoRectangle *pos);
+void     pango_layout_index_to_line_x      (PangoLayout    *layout,
+			                    int             index_,
+			                    gboolean        trailing,
+			                    int            *line,
+			                    int            *x_pos);
 void     pango_layout_get_cursor_pos       (PangoLayout    *layout,
 					    int             index_,
 					    PangoRectangle *strong_pos,
Index: pango/pango-markup.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-markup.c,v
retrieving revision 1.23
diff -u -p -r1.23 pango-markup.c
--- pango/pango-markup.c	5 Mar 2005 00:50:29 -0000	1.23
+++ pango/pango-markup.c	3 Oct 2005 08:56:16 -0000
@@ -403,20 +403,20 @@ start_element_handler  (GMarkupParseCont
 }
 
 static void
-end_element_handler    (GMarkupParseContext *context,
-                        const gchar         *element_name,
+end_element_handler    (GMarkupParseContext *context G_GNUC_UNUSED,
+                        const gchar         *element_name G_GNUC_UNUSED,
                         gpointer             user_data,
-                        GError             **error)
+                        GError             **error G_GNUC_UNUSED)
 {
   markup_data_close_tag (user_data);
 }
 
 static void
-text_handler           (GMarkupParseContext *context,
+text_handler           (GMarkupParseContext *context G_GNUC_UNUSED,
                         const gchar         *text,
                         gsize                text_len,
                         gpointer             user_data,
-                        GError             **error)
+                        GError             **error G_GNUC_UNUSED)
 {
   MarkupData *md = user_data;
 
@@ -744,10 +744,10 @@ add_attribute (OpenTag        *ot,
          } }G_STMT_END
 
 static gboolean
-b_parse_func        (MarkupData            *md,
+b_parse_func        (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -757,10 +757,10 @@ b_parse_func        (MarkupData         
 }
 
 static gboolean
-big_parse_func      (MarkupData            *md,
+big_parse_func      (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -836,7 +836,7 @@ parse_absolute_size (OpenTag            
           }}G_STMT_END
 
 static gboolean
-span_parse_func     (MarkupData            *md,
+span_parse_func     (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
                      const gchar          **values,
@@ -1321,10 +1321,10 @@ span_parse_func     (MarkupData         
 }
 
 static gboolean
-i_parse_func        (MarkupData            *md,
+i_parse_func        (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1335,12 +1335,12 @@ i_parse_func        (MarkupData         
 }
 
 static gboolean
-markup_parse_func (MarkupData            *md,
-                   OpenTag               *tag,
-                   const gchar          **names,
-                   const gchar          **values,
-                   GMarkupParseContext   *context,
-                   GError               **error)
+markup_parse_func (MarkupData            *md G_GNUC_UNUSED,
+                   OpenTag               *tag G_GNUC_UNUSED,
+                   const gchar          **names G_GNUC_UNUSED,
+                   const gchar          **values G_GNUC_UNUSED,
+                   GMarkupParseContext   *context G_GNUC_UNUSED,
+                   GError               **error G_GNUC_UNUSED)
 {
   /* We don't do anything with this tag at the moment. */
   
@@ -1348,10 +1348,10 @@ markup_parse_func (MarkupData           
 }
 
 static gboolean
-s_parse_func        (MarkupData            *md,
+s_parse_func        (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1364,10 +1364,10 @@ s_parse_func        (MarkupData         
 #define SUPERSUB_RISE 5000
 
 static gboolean
-sub_parse_func      (MarkupData            *md,
+sub_parse_func      (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1386,10 +1386,10 @@ sub_parse_func      (MarkupData         
 }
 
 static gboolean
-sup_parse_func      (MarkupData            *md,
+sup_parse_func      (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1408,10 +1408,10 @@ sup_parse_func      (MarkupData         
 }
 
 static gboolean
-small_parse_func    (MarkupData            *md,
+small_parse_func    (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1428,10 +1428,10 @@ small_parse_func    (MarkupData         
 }
 
 static gboolean
-tt_parse_func       (MarkupData            *md,
+tt_parse_func       (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
@@ -1443,10 +1443,10 @@ tt_parse_func       (MarkupData         
 }
 
 static gboolean
-u_parse_func        (MarkupData            *md,
+u_parse_func        (MarkupData            *md G_GNUC_UNUSED,
                      OpenTag               *tag,
                      const gchar          **names,
-                     const gchar          **values,
+                     const gchar          **values G_GNUC_UNUSED,
                      GMarkupParseContext   *context,
                      GError               **error)
 {
Index: pango/pango-renderer.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-renderer.c,v
retrieving revision 1.8
diff -u -p -r1.8 pango-renderer.c
--- pango/pango-renderer.c	3 Oct 2005 02:48:29 -0000	1.8
+++ pango/pango-renderer.c	3 Oct 2005 08:56:16 -0000
@@ -289,7 +289,7 @@ add_underline (PangoRenderer    *rendere
 	       int               base_x,
 	       int               base_y,
 	       PangoRectangle   *ink_rect,
-	       PangoRectangle   *logical_rect)
+	       PangoRectangle   *logical_rect G_GNUC_UNUSED)
 {
   PangoRectangle *current_rect = &state->underline_rect;
   PangoRectangle new_rect;
@@ -300,6 +300,7 @@ add_underline (PangoRenderer    *rendere
   new_rect.x = base_x + ink_rect->x;
   new_rect.width = ink_rect->width;
   new_rect.height = underline_thickness;
+  new_rect.y = base_y;
   
   switch (renderer->underline)
     {
@@ -309,10 +310,10 @@ add_underline (PangoRenderer    *rendere
     case PANGO_UNDERLINE_SINGLE:
     case PANGO_UNDERLINE_DOUBLE:
     case PANGO_UNDERLINE_ERROR:
-      new_rect.y = base_y - underline_position;
+      new_rect.y -= underline_position;
       break;
     case PANGO_UNDERLINE_LOW:
-      new_rect.y = base_y + ink_rect->y + ink_rect->height + underline_thickness;
+      new_rect.y += ink_rect->y + ink_rect->height + underline_thickness;
       break;
     }
   
@@ -340,7 +341,7 @@ add_strikethrough (PangoRenderer    *ren
 		   int               base_x,
 		   int               base_y,
 		   PangoRectangle   *ink_rect,
-		   PangoRectangle   *logical_rect)
+		   PangoRectangle   *logical_rect G_GNUC_UNUSED)
 {
   PangoRectangle *current_rect = &state->strikethrough_rect;
   PangoRectangle new_rect;
Index: pango/pango-script.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-script.c,v
retrieving revision 1.11
diff -u -p -r1.11 pango-script.c
--- pango/pango-script.c	15 Aug 2005 21:22:16 -0000	1.11
+++ pango/pango-script.c	3 Oct 2005 08:56:16 -0000
@@ -411,7 +411,7 @@ pango_language_includes_script (PangoLan
 				PangoScript    script)
 {
   PangoScriptForLang *script_for_lang;
-  int j;
+  unsigned int j;
 
   g_return_val_if_fail (language != NULL, FALSE);
 
@@ -551,7 +551,7 @@ pango_script_get_sample_language (PangoS
   const char *sample_language;
   
   g_return_val_if_fail (script >= 0, NULL);
-  g_return_val_if_fail (script < G_N_ELEMENTS (sample_languages), NULL);
+  g_return_val_if_fail (script < (PangoScript)G_N_ELEMENTS (sample_languages), NULL);
   
   sample_language = sample_languages[script];
 
Index: pango/pango-utils.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pango-utils.c,v
retrieving revision 1.59
diff -u -p -r1.59 pango-utils.c
--- pango/pango-utils.c	27 Jul 2005 22:14:46 -0000	1.59
+++ pango/pango-utils.c	3 Oct 2005 08:56:16 -0000
@@ -423,7 +423,7 @@ pango_scan_string (const char **pos, GSt
 gboolean
 pango_scan_int (const char **pos, int *out)
 {
-  int i = 0;
+  unsigned int i = 0;
   char buf[32];
   const char *p = *pos;
 
@@ -1206,8 +1206,9 @@ pango_language_copy (PangoLanguage *lang
 {
   return language; /* language tags are const */
 }
+
 static void
-pango_language_free (PangoLanguage *language)
+pango_language_free (PangoLanguage *language G_GNUC_UNUSED)
 {
   return; /* nothing */
 }
Index: pango/pangocairo-fc.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pangocairo-fc.h,v
retrieving revision 1.5
diff -u -p -r1.5 pangocairo-fc.h
--- pango/pangocairo-fc.h	21 Jul 2005 13:55:19 -0000	1.5
+++ pango/pangocairo-fc.h	3 Oct 2005 08:56:16 -0000
@@ -49,6 +49,7 @@ PangoFcFont *_pango_cairo_fc_font_new (P
 				       PangoContext               *context,
 				       const PangoFontDescription *desc,
 				       FcPattern	          *pattern);
+FT_Library   _pango_cairo_fc_font_map_get_library (PangoCairoFcFontMap *fontmap);
 
 G_END_DECLS
 
Index: pango/pangocairo-fcfont.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangocairo-fcfont.c,v
retrieving revision 1.15
diff -u -p -r1.15 pangocairo-fcfont.c
--- pango/pangocairo-fcfont.c	15 Aug 2005 19:41:00 -0000	1.15
+++ pango/pangocairo-fcfont.c	3 Oct 2005 08:56:16 -0000
@@ -313,8 +313,8 @@ pango_cairo_fc_font_unlock_face (PangoFc
 }
 
 static PangoGlyph
-pango_cairo_fc_font_real_get_unknown_glyph (PangoFcFont *font,
-					    gunichar     wc)
+pango_cairo_fc_font_real_get_unknown_glyph (PangoFcFont *font G_GNUC_UNUSED,
+					    gunichar     wc G_GNUC_UNUSED)
 {
   return 0;
 }
Index: pango/pangocairo-fcfontmap.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangocairo-fcfontmap.c,v
retrieving revision 1.5
diff -u -p -r1.5 pangocairo-fcfontmap.c
--- pango/pangocairo-fcfontmap.c	21 Jul 2005 13:55:19 -0000	1.5
+++ pango/pangocairo-fcfontmap.c	3 Oct 2005 08:56:16 -0000
@@ -87,7 +87,7 @@ pango_cairo_fc_font_map_finalize (GObjec
 }
 
 static void
-pango_cairo_fc_font_map_context_substitute (PangoFcFontMap *fcfontmap,
+pango_cairo_fc_font_map_context_substitute (PangoFcFontMap *fcfontmap G_GNUC_UNUSED,
 					    PangoContext   *context,
 					    FcPattern      *pattern)
 {
@@ -120,21 +120,21 @@ pango_cairo_fc_font_map_get_resolution_f
 }
 
 static gconstpointer
-pango_cairo_fc_font_map_context_key_get (PangoFcFontMap *fcfontmap,
+pango_cairo_fc_font_map_context_key_get (PangoFcFontMap *fcfontmap G_GNUC_UNUSED,
 					 PangoContext   *context)
 {
   return _pango_cairo_context_get_merged_font_options (context);
 }
 
 static gpointer
-pango_cairo_fc_font_map_context_key_copy (PangoFcFontMap *fcfontmap,
+pango_cairo_fc_font_map_context_key_copy (PangoFcFontMap *fcfontmap G_GNUC_UNUSED,
 					  gconstpointer   key)
 {
   return cairo_font_options_copy (key);
 }
 
 static void
-pango_cairo_fc_font_map_context_key_free (PangoFcFontMap *fcfontmap,
+pango_cairo_fc_font_map_context_key_free (PangoFcFontMap *fcfontmap G_GNUC_UNUSED,
 					  gpointer        key)
 {
   cairo_font_options_destroy (key);
@@ -142,14 +142,14 @@ pango_cairo_fc_font_map_context_key_free
 
 
 static guint32
-pango_cairo_fc_font_map_context_key_hash (PangoFcFontMap *fcfontmap,
+pango_cairo_fc_font_map_context_key_hash (PangoFcFontMap *fcfontmap G_GNUC_UNUSED,
 					  gconstpointer        key)
 {
   return (guint32)cairo_font_options_hash (key);
 }
 
 static gboolean
-pango_cairo_fc_font_map_context_key_equal (PangoFcFontMap *fcfontmap,
+pango_cairo_fc_font_map_context_key_equal (PangoFcFontMap *fcfontmap G_GNUC_UNUSED,
 					   gconstpointer   key_a,
 					   gconstpointer   key_b)
 {
Index: pango/pangocairo-font.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangocairo-font.c,v
retrieving revision 1.4
diff -u -p -r1.4 pangocairo-font.c
--- pango/pangocairo-font.c	8 Apr 2005 16:11:52 -0000	1.4
+++ pango/pangocairo-font.c	3 Oct 2005 08:56:16 -0000
@@ -39,6 +39,7 @@ pango_cairo_font_get_type (void)
 	NULL,		/* class_data */
 	0,
 	0,
+	NULL,
 	NULL
       };
 
Index: pango/pangocairo-fontmap.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangocairo-fontmap.c,v
retrieving revision 1.9
diff -u -p -r1.9 pangocairo-fontmap.c
--- pango/pangocairo-fontmap.c	11 Sep 2005 02:40:12 -0000	1.9
+++ pango/pangocairo-fontmap.c	3 Oct 2005 08:56:16 -0000
@@ -47,6 +47,7 @@ pango_cairo_font_map_get_type (void)
 	NULL,		/* class_data */
 	0,
 	0,
+	NULL,
 	NULL
       };
 
Index: pango/pangocairo-private.h
===================================================================
RCS file: /cvs/gnome/pango/pango/pangocairo-private.h,v
retrieving revision 1.4
diff -u -p -r1.4 pangocairo-private.h
--- pango/pangocairo-private.h	21 Jul 2005 13:55:19 -0000	1.4
+++ pango/pangocairo-private.h	3 Oct 2005 08:56:16 -0000
@@ -75,6 +75,7 @@ GType pango_cairo_renderer_get_type    (
 
 const cairo_font_options_t *_pango_cairo_context_get_merged_font_options (PangoContext *context);
 
+
 G_END_DECLS
 
 #endif /* __PANGOCAIRO_PRIVATE_H__ */
Index: pango/pangocairo-render.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangocairo-render.c,v
retrieving revision 1.9
diff -u -p -r1.9 pangocairo-render.c
--- pango/pangocairo-render.c	3 Oct 2005 02:48:29 -0000	1.9
+++ pango/pangocairo-render.c	3 Oct 2005 08:56:16 -0000
@@ -255,7 +255,7 @@ pango_cairo_renderer_draw_error_underlin
 }
 
 static void
-pango_cairo_renderer_init (PangoCairoRenderer *renderer)
+pango_cairo_renderer_init (PangoCairoRenderer *renderer G_GNUC_UNUSED)
 {
 }
 
Index: pango/pangofc-decoder.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangofc-decoder.c,v
retrieving revision 1.4
diff -u -p -r1.4 pangofc-decoder.c
--- pango/pangofc-decoder.c	6 Aug 2004 18:33:23 -0000	1.4
+++ pango/pangofc-decoder.c	3 Oct 2005 08:56:16 -0000
@@ -24,18 +24,12 @@
 G_DEFINE_ABSTRACT_TYPE (PangoFcDecoder, pango_fc_decoder, G_TYPE_OBJECT)
 
 static void
-pango_fc_decoder_init (PangoFcDecoder *decoder);
-
-static void
-pango_fc_decoder_class_init (PangoFcDecoderClass *klass);
-
-static void
-pango_fc_decoder_init (PangoFcDecoder *decoder)
+pango_fc_decoder_init (PangoFcDecoder *decoder G_GNUC_UNUSED)
 {
 }
 
 static void
-pango_fc_decoder_class_init (PangoFcDecoderClass *klass)
+pango_fc_decoder_class_init (PangoFcDecoderClass *klass G_GNUC_UNUSED)
 {
 }
 
Index: pango/pangofc-font.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangofc-font.c,v
retrieving revision 1.19
diff -u -p -r1.19 pangofc-font.c
--- pango/pangofc-font.c	15 Aug 2005 19:41:00 -0000	1.19
+++ pango/pangofc-font.c	3 Oct 2005 08:56:16 -0000
@@ -93,7 +93,7 @@ pango_fc_font_class_init (PangoFcFontCla
 }
 
 static void
-pango_fc_font_init (PangoFcFont *fcfont)
+pango_fc_font_init (PangoFcFont *fcfont G_GNUC_UNUSED)
 {
 }
 
@@ -212,7 +212,7 @@ pango_fc_get_shaper_map (PangoLanguage *
 }
 
 static PangoEngineShape *
-pango_fc_font_find_shaper (PangoFont     *font,
+pango_fc_font_find_shaper (PangoFont     *font G_GNUC_UNUSED,
 			   PangoLanguage *language,
 			   guint32        ch)
 {
@@ -224,7 +224,7 @@ pango_fc_font_find_shaper (PangoFont    
 
 static PangoCoverage *
 pango_fc_font_get_coverage (PangoFont     *font,
-			    PangoLanguage *language)
+			    PangoLanguage *language G_GNUC_UNUSED)
 {
   PangoFcFont *fcfont = (PangoFcFont *)font;
   PangoFcFontPrivate *priv = PANGO_FC_FONT_GET_PRIVATE (fcfont);
@@ -505,7 +505,7 @@ pango_fc_font_real_get_glyph (PangoFcFon
   face = pango_fc_font_lock_face (font);
   
   index = FcFreeTypeCharIndex (face, wc);
-  if (index > face->num_glyphs)
+  if (index > (FT_UInt)face->num_glyphs)
     index = 0;
 
   pango_fc_font_unlock_face (font);
Index: pango/pangofc-fontmap.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangofc-fontmap.c,v
retrieving revision 1.40
diff -u -p -r1.40 pangofc-fontmap.c
--- pango/pangofc-fontmap.c	22 Jul 2005 22:39:27 -0000	1.40
+++ pango/pangofc-fontmap.c	3 Oct 2005 08:56:16 -0000
@@ -1147,7 +1147,7 @@ pango_fc_font_map_get_patterns (PangoFon
 }
 
 static gboolean
-get_first_font (PangoFontset  *fontset,
+get_first_font (PangoFontset  *fontset G_GNUC_UNUSED,
 		PangoFont     *font,
 		gpointer       data)
 {
@@ -1452,7 +1452,7 @@ pango_fc_font_map_create_context (PangoF
 }
 
 static void
-cleanup_font (gpointer        key,
+cleanup_font (gpointer        key G_GNUC_UNUSED,
 	      PangoFcFont    *fcfont)
 {
   _pango_fc_font_shutdown (fcfont);
@@ -1836,6 +1836,7 @@ pango_fc_face_get_type (void)
         sizeof (PangoFcFace),
         0,              /* n_preallocs */
         (GInstanceInitFunc) NULL,
+	NULL            /* value_table */
       };
       
       object_type = g_type_register_static (PANGO_TYPE_FONT_FACE,
@@ -1963,6 +1964,7 @@ pango_fc_family_get_type (void)
         sizeof (PangoFcFamily),
         0,              /* n_preallocs */
         (GInstanceInitFunc) pango_fc_family_init,
+	NULL            /* value_table */
       };
       
       object_type = g_type_register_static (PANGO_TYPE_FONT_FAMILY,
Index: pango/pangoft2-render.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangoft2-render.c,v
retrieving revision 1.6
diff -u -p -r1.6 pangoft2-render.c
--- pango/pangoft2-render.c	1 Mar 2005 20:48:51 -0000	1.6
+++ pango/pangoft2-render.c	3 Oct 2005 08:56:16 -0000
@@ -64,7 +64,7 @@ static void pango_ft2_renderer_draw_trap
 G_DEFINE_TYPE (PangoFT2Renderer, pango_ft2_renderer, PANGO_TYPE_RENDERER)
 
 static void
-pango_ft2_renderer_init (PangoFT2Renderer *renderer)
+pango_ft2_renderer_init (PangoFT2Renderer *renderer G_GNUC_UNUSED)
 {
 }
 
@@ -315,7 +315,7 @@ interpolate_position (Position *result,
  */
 static void
 pango_ft2_renderer_draw_trapezoid (PangoRenderer   *renderer,
-				   PangoRenderPart  part,
+				   PangoRenderPart  part G_GNUC_UNUSED,
 				   double           y1,
 				   double           x11,
 				   double           x21,
Index: pango/pangoft2.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangoft2.c,v
retrieving revision 1.76
diff -u -p -r1.76 pangoft2.c
--- pango/pangoft2.c	9 Jan 2005 00:12:39 -0000	1.76
+++ pango/pangoft2.c	3 Oct 2005 08:56:16 -0000
@@ -356,19 +356,21 @@ pango_ft2_font_real_lock_face (PangoFcFo
 }
 
 static void
-pango_ft2_font_real_unlock_face (PangoFcFont *font)
+pango_ft2_font_real_unlock_face (PangoFcFont *font G_GNUC_UNUSED)
 {
 }
 
 static PangoGlyph
-pango_ft2_font_real_get_unknown_glyph (PangoFcFont *font,
-				       gunichar     wc)
+pango_ft2_font_real_get_unknown_glyph (PangoFcFont *font G_GNUC_UNUSED,
+				       gunichar     wc G_GNUC_UNUSED)
 {
   return 0;
 }
 
 static gboolean
-pango_ft2_free_glyph_info_callback (gpointer key, gpointer value, gpointer data)
+pango_ft2_free_glyph_info_callback (gpointer key G_GNUC_UNUSED,
+				    gpointer value,
+				    gpointer data)
 {
   PangoFT2Font *font = PANGO_FT2_FONT (data);
   PangoFT2GlyphInfo *info = value;
@@ -426,7 +428,7 @@ pango_ft2_font_get_coverage (PangoFont  
  * Return value: a glyph index into @font
  **/
 PangoGlyph
-pango_ft2_get_unknown_glyph (PangoFont *font)
+pango_ft2_get_unknown_glyph (PangoFont *font G_GNUC_UNUSED)
 {
   return 0;
 }
Index: pango/pangox-fontcache.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangox-fontcache.c,v
retrieving revision 1.6
diff -u -p -r1.6 pangox-fontcache.c
--- pango/pangox-fontcache.c	12 Mar 2002 00:15:06 -0000	1.6
+++ pango/pangox-fontcache.c	3 Oct 2005 08:56:16 -0000
@@ -52,7 +52,9 @@ struct _CacheEntry
 };
 
 static void
-free_cache_entry (char *xlfd, CacheEntry *entry, PangoXFontCache *cache)
+free_cache_entry (char            *xlfd G_GNUC_UNUSED,
+		  CacheEntry      *entry,
+		  PangoXFontCache *cache)
 {
   g_free (entry->xlfd);
   XFreeFont (cache->display, entry->fs);
Index: pango/pangox-fontmap.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangox-fontmap.c,v
retrieving revision 1.40
diff -u -p -r1.40 pangox-fontmap.c
--- pango/pangox-fontmap.c	22 Jul 2005 19:05:45 -0000	1.40
+++ pango/pangox-fontmap.c	3 Oct 2005 08:56:16 -0000
@@ -190,6 +190,7 @@ pango_x_font_map_get_type (void)
         sizeof (PangoXFontMap),
         0,              /* n_preallocs */
         (GInstanceInitFunc) pango_x_font_map_init,
+	NULL            /* value_table */
       };
       
       object_type = g_type_register_static (PANGO_TYPE_FONT_MAP,
@@ -230,7 +231,7 @@ static GSList *registered_displays;
 
 static int
 close_display_cb (Display   *display,
-		  XExtCodes *extcodes)
+		  XExtCodes *extcodes G_GNUC_UNUSED)
 {
   pango_x_shutdown_display (display);
   registered_displays = g_slist_remove (registered_displays, display);
@@ -380,7 +381,9 @@ pango_x_font_map_finalize (GObject *obje
 }
 
 static void
-list_families_foreach (gpointer key, gpointer value, gpointer user_data)
+list_families_foreach (gpointer key G_GNUC_UNUSED,
+		       gpointer value,
+		       gpointer user_data)
 {
   GSList **list = user_data;
 
@@ -440,7 +443,7 @@ pango_x_get_font_family (PangoXFontMap *
 
 static PangoFont *
 pango_x_font_map_load_font (PangoFontMap               *fontmap,
-			    PangoContext               *context,
+			    PangoContext               *context G_GNUC_UNUSED,
 			    const PangoFontDescription *description)
 {
   PangoXFontMap *xfontmap = (PangoXFontMap *)fontmap;
@@ -527,7 +530,8 @@ pango_x_font_map_load_font (PangoFontMap
 static gboolean error_occured;
 
 static int 
-ignore_error (Display *d, XErrorEvent *e)
+ignore_error (Display     *d G_GNUC_UNUSED,
+	      XErrorEvent *e G_GNUC_UNUSED)
 {
   return 0;
 }
@@ -1087,7 +1091,7 @@ pango_x_insert_font (PangoXFontMap *xfon
   PangoXFace *xface;
   PangoXSizeInfo *size_info;
   char *identifier;
-  int i;
+  unsigned int i;
 
   /* First insert the XLFD into the list of XLFDs for the "identifier" - which
    * is the 2-4th fields of the XLFD
@@ -1205,7 +1209,7 @@ pango_x_insert_font (PangoXFontMap *xfon
 
 /* Compare the tail of a to b */
 static gboolean
-match_end (char *a, char *b)
+match_end (const char *a, const char *b)
 {
   size_t len_a = strlen (a);
   size_t len_b = strlen (b);
@@ -1502,6 +1506,7 @@ pango_x_face_get_type (void)
         sizeof (PangoXFace),
         0,              /* n_preallocs */
         (GInstanceInitFunc) NULL,
+	NULL            /* value_table */
       };
       
       object_type = g_type_register_static (PANGO_TYPE_FONT_FACE,
@@ -1660,6 +1665,7 @@ pango_x_family_get_type (void)
         sizeof (PangoXFamily),
         0,              /* n_preallocs */
         (GInstanceInitFunc) NULL,
+	NULL            /* value_table */
       };
       
       object_type = g_type_register_static (PANGO_TYPE_FONT_FAMILY,
Index: pango/pangox.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangox.c,v
retrieving revision 1.86
diff -u -p -r1.86 pangox.c
--- pango/pangox.c	25 Feb 2005 20:16:29 -0000	1.86
+++ pango/pangox.c	3 Oct 2005 08:56:16 -0000
@@ -243,6 +243,7 @@ pango_x_font_get_type (void)
         sizeof (PangoXFont),
         0,              /* n_preallocs */
         (GInstanceInitFunc) pango_x_font_init,
+	NULL            /* value_table */
       };
       
       object_type = g_type_register_static (PANGO_TYPE_FONT,
@@ -853,7 +854,7 @@ get_font_metrics_from_subfonts (PangoFon
 }
 
 static void
-get_subfonts_foreach (PangoFont      *font,
+get_subfonts_foreach (PangoFont      *font G_GNUC_UNUSED,
 		      PangoGlyphInfo *glyph_info,
 		      gpointer        data)
 {
@@ -885,7 +886,7 @@ get_font_metrics_from_string (PangoFont 
 }
 
 static void
-average_width_foreach (PangoFont      *font,
+average_width_foreach (PangoFont      *font G_GNUC_UNUSED,
 		       PangoGlyphInfo *glyph_info,
 		       gpointer        data)
 {
@@ -956,7 +957,7 @@ pango_x_font_get_font_map (PangoFont *fo
 
 /* Compare the tail of a to b */
 static gboolean
-match_end (char *a, char *b)
+match_end (const char *a, const char *b)
 {
   size_t len_a = strlen (a);
   size_t len_b = strlen (b);
@@ -1227,7 +1228,7 @@ pango_x_font_dispose (GObject *object)
 
 
 static void
-subfonts_foreach (gpointer key, gpointer value, gpointer data)
+subfonts_foreach (gpointer key, gpointer value, gpointer data G_GNUC_UNUSED)
 {
   g_free (key);
   g_free (value);
@@ -1321,7 +1322,7 @@ pango_x_font_get_coverage (PangoFont    
 }
 
 static PangoEngineShape *
-pango_x_font_find_shaper (PangoFont     *font,
+pango_x_font_find_shaper (PangoFont     *font G_GNUC_UNUSED,
 			  PangoLanguage *language,
 			  guint32        ch)
 {
@@ -1418,7 +1419,7 @@ pango_x_find_glyph (PangoFont *font,
  * Return value: a glyph index into @font.
  **/
 PangoGlyph
-pango_x_get_unknown_glyph (PangoFont *font)
+pango_x_get_unknown_glyph (PangoFont *font G_GNUC_UNUSED)
 {
   return PANGO_X_UNKNOWN_FLAG;
 }
@@ -1658,11 +1659,11 @@ pango_x_get_item_properties (PangoItem  
  * Return value: %FALSE, always.
  */
 gboolean
-pango_x_apply_ligatures (PangoFont     *font, 
-                         PangoXSubfont  subfont_id,
-                         gunichar     **glyphs, 
-                         int           *n_glyphs,
-                         int           **clusters) 
+pango_x_apply_ligatures (PangoFont     *font G_GNUC_UNUSED, 
+                         PangoXSubfont  subfont_id G_GNUC_UNUSED,
+                         gunichar     **glyphs G_GNUC_UNUSED, 
+                         int           *n_glyphs G_GNUC_UNUSED,
+                         int           **clusters G_GNUC_UNUSED) 
 {
   return FALSE;
 }
Index: pango/pangoxft-font.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangoxft-font.c,v
retrieving revision 1.61
diff -u -p -r1.61 pangoxft-font.c
--- pango/pangoxft-font.c	21 Jul 2005 21:49:57 -0000	1.61
+++ pango/pangoxft-font.c	3 Oct 2005 08:56:16 -0000
@@ -79,7 +79,7 @@ pango_xft_font_class_init (PangoXftFontC
 }
 
 static void
-pango_xft_font_init (PangoXftFont *xftfont)
+pango_xft_font_init (PangoXftFont *xftfont G_GNUC_UNUSED)
 {
 }
 
@@ -358,7 +358,7 @@ load_fallback_font (PangoXftFont *xfont)
   _pango_xft_font_map_get_info (fcfont->fontmap, &display, &screen);
   
   size_is_absolute = pango_font_description_get_size_is_absolute (fcfont->description);
-  size = (double)pango_font_description_get_size (fcfont->description) / PANGO_SCALE;
+  size = pango_font_description_get_size (fcfont->description) / PANGO_SCALE;
       
   xft_font = XftFontOpen (display,  screen,
                           FC_FAMILY, FcTypeString, "sans",
@@ -441,7 +441,7 @@ pango_xft_font_real_get_glyph (PangoFcFo
 }
 
 static PangoGlyph
-pango_xft_font_real_get_unknown_glyph (PangoFcFont *font,
+pango_xft_font_real_get_unknown_glyph (PangoFcFont *font G_GNUC_UNUSED,
 				       gunichar     wc)
 {
   return wc | PANGO_XFT_UNKNOWN_FLAG;
Index: pango/pangoxft-fontmap.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangoxft-fontmap.c,v
retrieving revision 1.44
diff -u -p -r1.44 pangoxft-fontmap.c
--- pango/pangoxft-fontmap.c	19 Nov 2004 22:57:11 -0000	1.44
+++ pango/pangoxft-fontmap.c	3 Oct 2005 08:56:16 -0000
@@ -80,7 +80,7 @@ pango_xft_font_map_class_init (PangoXftF
 }
 
 static void
-pango_xft_font_map_init (PangoXftFontMap *xftfontmap)
+pango_xft_font_map_init (PangoXftFontMap *xftfontmap G_GNUC_UNUSED)
 {
 }
 
@@ -129,7 +129,7 @@ static GSList *registered_displays;
 
 static int
 close_display_cb (Display   *display,
-		  XExtCodes *extcodes)
+		  XExtCodes *extcodes G_GNUC_UNUSED)
 {
   GSList *tmp_list;
   
Index: pango/pangoxft-render.c
===================================================================
RCS file: /cvs/gnome/pango/pango/pangoxft-render.c,v
retrieving revision 1.6
diff -u -p -r1.6 pangoxft-render.c
--- pango/pangoxft-render.c	21 Jun 2005 16:22:44 -0000	1.6
+++ pango/pangoxft-render.c	3 Oct 2005 08:56:16 -0000
@@ -402,11 +402,11 @@ pango_xft_renderer_draw_glyphs (PangoRen
 }
 
 static void
-pango_xft_renderer_draw_glyph (PangoRenderer   *renderer,
-			       PangoFont       *font,
-			       PangoGlyph       glyph,
-			       double           x,
-			       double           y)
+pango_xft_renderer_draw_glyph (PangoRenderer   *renderer G_GNUC_UNUSED,
+			       PangoFont       *font G_GNUC_UNUSED,
+			       PangoGlyph       glyph G_GNUC_UNUSED,
+			       double           x G_GNUC_UNUSED,
+			       double           y G_GNUC_UNUSED)
 {
   g_error ("pango_xft_renderer_draw_glyph(): should not be called\n");
 }
Index: pango/querymodules.c
===================================================================
RCS file: /cvs/gnome/pango/pango/querymodules.c,v
retrieving revision 1.22
diff -u -p -r1.22 querymodules.c
--- pango/querymodules.c	15 Sep 2004 19:25:37 -0000	1.22
+++ pango/querymodules.c	3 Oct 2005 08:56:16 -0000
@@ -120,7 +120,7 @@ script_from_string (PangoScript script)
   return value->value_nick;
 }
 
-void 
+static void 
 query_module (const char *dir, const char *name)
 {
   void (*list) (PangoEngineInfo **engines, gint *n_engines);
Index: pango/opentype/ftglue.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/ftglue.c,v
retrieving revision 1.2
diff -u -p -r1.2 ftglue.c
--- pango/opentype/ftglue.c	22 Jul 2005 18:03:58 -0000	1.2
+++ pango/opentype/ftglue.c	3 Oct 2005 08:56:16 -0000
@@ -138,7 +138,7 @@ ftglue_stream_seek( FT_Stream   stream,
     if ( stream->read( stream, pos, 0, 0 ) )
       error = FT_Err_Invalid_Stream_Operation;
   }
-  else if ( pos > stream->size )
+  else if ( pos > (FT_Long)stream->size )
     error = FT_Err_Invalid_Stream_Operation;
 
   LOG(( "ftglue:stream:seek(%ld) -> %d\n", pos, error ));
Index: pango/opentype/pango-ot-buffer.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/pango-ot-buffer.c,v
retrieving revision 1.4
diff -u -p -r1.4 pango-ot-buffer.c
--- pango/opentype/pango-ot-buffer.c	14 Sep 2004 13:45:41 -0000	1.4
+++ pango/opentype/pango-ot-buffer.c	3 Oct 2005 08:56:16 -0000
@@ -212,7 +212,7 @@ pango_ot_buffer_output (PangoOTBuffer   
   FT_Face face;
   PangoOTInfo *info;
   TTO_GDEF gdef = NULL;
-  int i;
+  unsigned int i;
   int last_cluster;
 
   face = pango_fc_font_lock_face (buffer->font);
@@ -241,7 +241,7 @@ pango_ot_buffer_output (PangoOTBuffer   
   gdef = pango_ot_info_get_gdef (info);
   
   /* Apply default positioning */
-  for (i = 0; i < glyphs->num_glyphs; i++)
+  for (i = 0; i < (unsigned int)glyphs->num_glyphs; i++)
     {
       if (glyphs->glyphs[i].glyph)
 	{
Index: pango/opentype/pango-ot-info.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/pango-ot-info.c,v
retrieving revision 1.13
diff -u -p -r1.13 pango-ot-info.c
--- pango/opentype/pango-ot-info.c	22 Jul 2005 17:56:37 -0000	1.13
+++ pango/opentype/pango-ot-info.c	3 Oct 2005 08:56:16 -0000
@@ -52,7 +52,8 @@ pango_ot_info_get_type (void)
         NULL,           /* class_data */
         sizeof (PangoOTInfo),
         0,              /* n_preallocs */
-	NULL            /* init */
+	NULL,           /* init */
+	NULL,           /* value_table */
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
@@ -217,7 +218,7 @@ synthesize_class_def (PangoOTInfo *info)
   FT_UShort *classes;
   FT_ULong charcode;
   FT_UInt glyph;
-  int i, j;
+  unsigned int i, j;
   FT_CharMap old_charmap;
   
   old_charmap = info->face->charmap;
Index: pango/opentype/pango-ot-ruleset.c
===================================================================
RCS file: /cvs/gnome/pango/pango/opentype/pango-ot-ruleset.c,v
retrieving revision 1.12
diff -u -p -r1.12 pango-ot-ruleset.c
--- pango/opentype/pango-ot-ruleset.c	22 Jul 2005 17:56:37 -0000	1.12
+++ pango/opentype/pango-ot-ruleset.c	3 Oct 2005 08:56:16 -0000
@@ -55,6 +55,7 @@ pango_ot_ruleset_get_type (void)
         sizeof (PangoOTRuleset),
         0,              /* n_preallocs */
         (GInstanceInitFunc)pango_ot_ruleset_init,
+	NULL            /* value_table */
       };
       
       object_type = g_type_register_static (G_TYPE_OBJECT,
@@ -140,7 +141,7 @@ void
 pango_ot_ruleset_substitute  (PangoOTRuleset   *ruleset,
 			      PangoOTBuffer    *buffer)
 {
-  int i;
+  unsigned int i;
   
   TTO_GSUB gsub = NULL;
   
@@ -186,7 +187,7 @@ void
 pango_ot_ruleset_position (PangoOTRuleset   *ruleset,
 			   PangoOTBuffer    *buffer)
 {
-  int i;
+  unsigned int i;
   
   TTO_GPOS gpos = NULL;
   
Index: tests/dump-boundaries.c
===================================================================
RCS file: /cvs/gnome/pango/tests/dump-boundaries.c,v
retrieving revision 1.2
diff -u -p -r1.2 dump-boundaries.c
--- tests/dump-boundaries.c	17 Dec 2001 22:33:35 -0000	1.2
+++ tests/dump-boundaries.c	3 Oct 2005 08:56:16 -0000
@@ -28,9 +28,8 @@
 
 #define CHFORMAT "%0#6x"
 
-static void
-fail (const char *format,
-      ...)
+static void fail (const char *format, ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN;
+static void fail (const char *format, ...)
 {
   char *str;
   
Index: tests/gen-all-unicode.c
===================================================================
RCS file: /cvs/gnome/pango/tests/gen-all-unicode.c,v
retrieving revision 1.2
diff -u -p -r1.2 gen-all-unicode.c
--- tests/gen-all-unicode.c	12 Jun 2002 15:20:01 -0000	1.2
+++ tests/gen-all-unicode.c	3 Oct 2005 08:56:16 -0000
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 int
-main (int argc, char **argv)
+main (void)
 {
   gunichar i;
   gint j;
Index: tests/testboundaries.c
===================================================================
RCS file: /cvs/gnome/pango/tests/testboundaries.c,v
retrieving revision 1.6
diff -u -p -r1.6 testboundaries.c
--- tests/testboundaries.c	29 Aug 2005 09:16:27 -0000	1.6
+++ tests/testboundaries.c	3 Oct 2005 08:56:16 -0000
@@ -66,9 +66,8 @@ static gunichar current_wc = 0;
 static const char *line_start = NULL;
 static const char *line_end = NULL;
 
-static void
-fail (const char *format,
-      ...)
+static void fail (const char *format, ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN;
+static void fail (const char *format, ...)
 {
   char *str;
   char *line_text;
@@ -175,13 +174,13 @@ static void
 check_line_char (gunichar      wc,
                  gunichar      prev_wc,
                  gunichar      next_wc,
-                 GUnicodeType  type,
-                 GUnicodeType  prev_type,
-                 GUnicodeType  next_type,
+                 GUnicodeType  type G_GNUC_UNUSED,
+                 GUnicodeType  prev_type G_GNUC_UNUSED,
+                 GUnicodeType  next_type G_GNUC_UNUSED,
                  PangoLogAttr *attr,
                  PangoLogAttr *prev_attr,
                  PangoLogAttr *next_attr,
-                 gpointer      data)
+                 gpointer      data G_GNUC_UNUSED)
 {
   GUnicodeBreakType break_type;
   GUnicodeBreakType prev_break_type;
@@ -252,29 +251,31 @@ check_line_invariants (const char   *tex
 }
 
 static void
-check_word_invariants (const char   *text,
-                       PangoLogAttr *attrs)
+check_word_invariants (const char   *text G_GNUC_UNUSED,
+                       PangoLogAttr *attrs G_GNUC_UNUSED)
 {
 
 
 }
 
 static void
-check_sentence_invariants (const char   *text,
-                           PangoLogAttr *attrs)
+check_sentence_invariants (const char   *text G_GNUC_UNUSED,
+                           PangoLogAttr *attrs G_GNUC_UNUSED)
 {
 
 
 }
 
 static void
-check_grapheme_invariants (const char   *text,
-                           PangoLogAttr *attrs)
+check_grapheme_invariants (const char   *text G_GNUC_UNUSED,
+                           PangoLogAttr *attrs G_GNUC_UNUSED)
 {
 
 
 }
 
+static void print_sentences (const char   *text,
+                             PangoLogAttr *attrs) G_GNUC_UNUSED;
 static void
 print_sentences (const char   *text,
                  PangoLogAttr *attrs)
@@ -333,12 +334,11 @@ check_invariants (const char *text)
 }
 
 int
-main (int    argc,
-      char **argv)
+main (void)
 {
   gchar *text;
-  gchar *srcdir;
-  gchar *filename;
+  const gchar *srcdir;
+  const gchar *filename;
 
   srcdir = getenv ("srcdir");
   if (!srcdir)
Index: tests/testcolor.c
===================================================================
RCS file: /cvs/gnome/pango/tests/testcolor.c,v
retrieving revision 1.2
diff -u -p -r1.2 testcolor.c
--- tests/testcolor.c	21 Jul 2005 18:15:37 -0000	1.2
+++ tests/testcolor.c	3 Oct 2005 08:56:16 -0000
@@ -30,7 +30,7 @@ typedef struct _ColorSpec {
   guint16 blue;
 } ColorSpec;
 
-gboolean test_color (ColorSpec *spec)
+static gboolean test_color (ColorSpec *spec)
 {
   PangoColor color;
   gboolean accepted;
@@ -63,27 +63,26 @@ ColorSpec specs [] = {
   { "#000000000",    1, 0x0000, 0x0000, 0x0000 },
   { "#000000000000", 1, 0x0000, 0x0000, 0x0000 },
   { "#AAAABBBBCCCC", 1, 0xaaaa, 0xbbbb, 0xcccc },
-  { "#aa bb cc ",    0 },
-  { "#aa bb ccc",    0 },
-  { "#ab",           0 },
-  { "#aabb",         0 },
-  { "#aaabb",        0 },
-  { "aaabb",         0 },
-  { "",              0 },
-  { "#",             0 },
-  { "##fff",         0 },
-  { "#0000ff+",      0 },
-  { "#0000f+",       0 },
-  { "#0x00x10x2",    0 },
-  { NULL,            0 }
+  { "#aa bb cc ",    0, 0, 0, 0 },
+  { "#aa bb ccc",    0, 0, 0, 0 },
+  { "#ab",           0, 0, 0, 0 },
+  { "#aabb",         0, 0, 0, 0 },
+  { "#aaabb",        0, 0, 0, 0 },
+  { "aaabb",         0, 0, 0, 0 },
+  { "",              0, 0, 0, 0 },
+  { "#",             0, 0, 0, 0 },
+  { "##fff",         0, 0, 0, 0 },
+  { "#0000ff+",      0, 0, 0, 0 },
+  { "#0000f+",       0, 0, 0, 0 },
+  { "#0x00x10x2",    0, 0, 0, 0 },
+  { NULL,            0, 0, 0, 0 }
 };
 
 int 
-main (int argc, char *argv[]) 
+main (void) 
 {
   gboolean success;
   ColorSpec *spec;
-  gchar *blob;
 
   success = TRUE;
   for (spec = specs; spec->spec; spec++)
@@ -91,7 +90,3 @@ main (int argc, char *argv[]) 
 
   return !success;
 }
-
-
-
-
Index: tests/testiter.c
===================================================================
RCS file: /cvs/gnome/pango/tests/testiter.c,v
retrieving revision 1.1
diff -u -p -r1.1 testiter.c
--- tests/testiter.c	21 Jun 2005 22:37:59 -0000	1.1
+++ tests/testiter.c	3 Oct 2005 08:56:16 -0000
@@ -34,8 +34,9 @@
 
 #undef VERBOSE
 
+static void verbose (const char *format, ...) G_GNUC_PRINTF (1, 2);
 static void
-verbose (const char *format, ...)
+verbose (const char *format G_GNUC_UNUSED, ...)
 {
 #ifdef VERBOSE  
   va_list vap;
@@ -53,7 +54,7 @@ verbose (const char *format, ...)
  * I think the iterator itself should support \r\n without trouble,
  * but there are comments in layout-iter.c suggesting otherwise.
  */
-char *test_texts[] =
+const char *test_texts[] =
   {
     /* English with embedded RTL runs (from ancient-hebrew.org) */
     "The Hebrew word \xd7\x90\xd7\x93\xd7\x9d\xd7\x94 (adamah) is the feminine form of \xd7\x90\xd7\x93\xd7\x9d meaning \"ground\"\n",
@@ -72,7 +73,7 @@ char *test_texts[] =
     NULL
   };
 
-void
+static void
 iter_char_test (PangoLayout *layout)
 {
   PangoRectangle   extents, run_extents;
@@ -157,7 +158,7 @@ iter_char_test (PangoLayout *layout)
  *  - Total num of iterations match number of chars
  *  - GlyphString's index_to_x positions match those returned by the Iter
  */
-void
+static void
 iter_cluster_test (PangoLayout *layout)
 {
   PangoRectangle   extents;
@@ -210,9 +211,9 @@ iter_cluster_test (PangoLayout *layout)
 }
 
 int
-main (int argc, char *argv[])
+main (void)
 {
-  char        **ptext;
+  const char  **ptext;
   PangoFontMap *fontmap;
   PangoContext *context;
   PangoLayout  *layout;
@@ -227,8 +228,8 @@ main (int argc, char *argv[])
     {
       verbose ("--------- checking next text ----------\n");
       verbose (" <%s>\n", *ptext);
-      verbose ( "len=%d, bytes=%d\n",
-		g_utf8_strlen (*ptext, -1), strlen (*ptext));
+      verbose ( "len=%ld, bytes=%ld\n",
+		(long)g_utf8_strlen (*ptext, -1), (long)strlen (*ptext));
 
       pango_layout_set_text (layout, *ptext, -1);
       iter_char_test (layout);
Index: tests/testscript.c
===================================================================
RCS file: /cvs/gnome/pango/tests/testscript.c,v
retrieving revision 1.1
diff -u -p -r1.1 testscript.c
--- tests/testscript.c	3 Aug 2003 21:57:34 -0000	1.1
+++ tests/testscript.c	3 Oct 2005 08:56:16 -0000
@@ -140,10 +140,11 @@ unescape (const char *text)
 }
 
 static void
-test_script_lookup ()
+test_script_lookup (void)
 {
   gunichar ch = 0;
-  int i, j;
+  unsigned int i;
+  int j;
 
   for (i = 0; i < G_N_ELEMENTS (pango_script_table); i++)
     {
@@ -185,7 +186,7 @@ test_script_iter (void)
   const char *start;
   const char *end;
   PangoScript script;
-  int i;
+  unsigned int i;
     
   for (i = 0; i < G_N_ELEMENTS(test_data); i++)
     {
@@ -245,7 +246,7 @@ test_script_iter (void)
 }
 
 int
-main (int argc, char **argv)
+main (void)
 {
   test_script_lookup ();
   test_script_iter ();
Index: tools/gen-script-for-lang.c
===================================================================
RCS file: /cvs/gnome/pango/tools/gen-script-for-lang.c,v
retrieving revision 1.5
diff -u -p -r1.5 gen-script-for-lang.c
--- tools/gen-script-for-lang.c	21 Jul 2005 18:15:45 -0000	1.5
+++ tools/gen-script-for-lang.c	3 Oct 2005 08:56:16 -0000
@@ -40,7 +40,7 @@ static void scripts_for_file (const char
 			      const char *file_part,
 			      LangInfo   *info);
 
-const char *get_script_name (PangoScript script)
+static const char *get_script_name (PangoScript script)
 {
   static GEnumClass *class = NULL;
   GEnumValue *value;
@@ -53,7 +53,8 @@ const char *get_script_name (PangoScript
   return value->value_name;
 }
 
-int fail (char *format, ...)
+static void fail (const char *format, ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN;
+static void fail (const char *format, ...)
 {
   va_list vap;
   
@@ -64,7 +65,7 @@ int fail (char *format, ...)
   exit (1);
 }
 
-gboolean scan_hex (const char **str, gunichar *result)
+static gboolean scan_hex (const char **str, gunichar *result)
 {
   const char *end;
 
@@ -76,14 +77,6 @@ gboolean scan_hex (const char **str, gun
   return TRUE;
 }
 
-void warn_mismatch (const char *file_part,
-		    PangoScript script1,
-		    PangoScript script2)
-{
-  g_printerr ("%s has characters for both %s and %s\n",
-	      file_part, get_script_name (script1), get_script_name (script2));
-}
-
 static void
 scripts_for_line (const char  *base_dir,
 		  const char  *file_part,
@@ -172,11 +165,11 @@ scripts_for_file (const char *base_dir,
   GIOStatus status = G_IO_STATUS_NORMAL;
 
   if (!channel)
-    fail ("Error opening '%s': %s\n", filename, error);
+    fail ("Error opening '%s': %s\n", filename, error->message);
 
   /* The files have ISO-8859-1 copyright signs in them */
   if (!g_io_channel_set_encoding (channel, "ISO-8859-1", &error))
-      fail ("Cannot set encoding when reading '%s': %s\n", filename, error);
+      fail ("Cannot set encoding when reading '%s': %s\n", filename, error->message);
   
   while (status == G_IO_STATUS_NORMAL)
     {
@@ -209,7 +202,7 @@ scripts_for_file (const char *base_dir,
     }
 
   if (!g_io_channel_shutdown (channel, FALSE, &error))
-    fail ("Error closing '%s': %s\n", channel, error);
+    fail ("Error closing '%s': %s\n", filename, error->message);
 
   g_free (filename);
 }
@@ -240,7 +233,7 @@ compare_lang (gconstpointer a,
 	      gconstpointer b)
 {
   const LangInfo *info_a = a;
-  const LangInfo *info_b = a;
+  const LangInfo *info_b = b;
 
   return strcmp (pango_language_to_string (info_a->lang),
 		 pango_language_to_string (info_b->lang));
@@ -251,7 +244,8 @@ int main (int argc, char **argv)
   GDir *dir;
   GError *error = NULL;
   GArray *script_array;
-  int i, j;
+  unsigned int i;
+  int j;
   int max_lang_len = 0;
 
   g_type_init ();
@@ -282,7 +276,7 @@ int main (int argc, char **argv)
       LangInfo *info = &g_array_index (script_array, LangInfo, i);
       
       max_lang_len = MAX (max_lang_len,
-			  1 + strlen (pango_language_to_string (info->lang)));
+			  1 + (int)strlen (pango_language_to_string (info->lang)));
     }
       
   g_print ("typedef struct {\n"