Fix doc comment. Move include outside G_BEGIN_DECLS. Add const to avoid

        * pango/pangoft2.c: Fix doc comment.
        * pango/pangoft2.h: Move include outside G_BEGIN_DECLS.
        * pango/querymodules.c: (main): Add const to avoid warning.
        * tests/dump-boundaries.c: (fail): Remove unused local.

11 files changed, 53 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 98159a9b..9769643d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* pango/pangoft2.c: Fix doc comment.
+	* pango/pangoft2.h: Move include outside G_BEGIN_DECLS.
+	* pango/querymodules.c: (main): Add const to avoid warning.
+	* tests/dump-boundaries.c: (fail): Remove unused local.
+
 2001-12-14  Sven Neumann  <sven@gimp.org>
 
 	* modules/hebrew/hebrew-x.c (hebrew_engine_get_coverage): use
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 98159a9b..9769643d 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,10 @@
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* pango/pangoft2.c: Fix doc comment.
+	* pango/pangoft2.h: Move include outside G_BEGIN_DECLS.
+	* pango/querymodules.c: (main): Add const to avoid warning.
+	* tests/dump-boundaries.c: (fail): Remove unused local.
+
 2001-12-14  Sven Neumann  <sven@gimp.org>
 
 	* modules/hebrew/hebrew-x.c (hebrew_engine_get_coverage): use
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 98159a9b..9769643d 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* pango/pangoft2.c: Fix doc comment.
+	* pango/pangoft2.h: Move include outside G_BEGIN_DECLS.
+	* pango/querymodules.c: (main): Add const to avoid warning.
+	* tests/dump-boundaries.c: (fail): Remove unused local.
+
 2001-12-14  Sven Neumann  <sven@gimp.org>
 
 	* modules/hebrew/hebrew-x.c (hebrew_engine_get_coverage): use
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 98159a9b..9769643d 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* pango/pangoft2.c: Fix doc comment.
+	* pango/pangoft2.h: Move include outside G_BEGIN_DECLS.
+	* pango/querymodules.c: (main): Add const to avoid warning.
+	* tests/dump-boundaries.c: (fail): Remove unused local.
+
 2001-12-14  Sven Neumann  <sven@gimp.org>
 
 	* modules/hebrew/hebrew-x.c (hebrew_engine_get_coverage): use
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 98159a9b..9769643d 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* pango/pangoft2.c: Fix doc comment.
+	* pango/pangoft2.h: Move include outside G_BEGIN_DECLS.
+	* pango/querymodules.c: (main): Add const to avoid warning.
+	* tests/dump-boundaries.c: (fail): Remove unused local.
+
 2001-12-14  Sven Neumann  <sven@gimp.org>
 
 	* modules/hebrew/hebrew-x.c (hebrew_engine_get_coverage): use
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 98159a9b..9769643d 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* pango/pangoft2.c: Fix doc comment.
+	* pango/pangoft2.h: Move include outside G_BEGIN_DECLS.
+	* pango/querymodules.c: (main): Add const to avoid warning.
+	* tests/dump-boundaries.c: (fail): Remove unused local.
+
 2001-12-14  Sven Neumann  <sven@gimp.org>
 
 	* modules/hebrew/hebrew-x.c (hebrew_engine_get_coverage): use
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 98159a9b..9769643d 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+2001-12-17  Darin Adler  <darin@bentspoon.com>
+
+	* pango/pangoft2.c: Fix doc comment.
+	* pango/pangoft2.h: Move include outside G_BEGIN_DECLS.
+	* pango/querymodules.c: (main): Add const to avoid warning.
+	* tests/dump-boundaries.c: (fail): Remove unused local.
+
 2001-12-14  Sven Neumann  <sven@gimp.org>
 
 	* modules/hebrew/hebrew-x.c (hebrew_engine_get_coverage): use
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 7ef2930c..897a0c3c 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -739,7 +739,7 @@ pango_ft2_render_layout_line (FT_Bitmap       *bitmap,
  * @x:         the X position of the left of the layout (in pixels)
  * @y:         the Y position of the top of the layout (in pixels)
  *
- * Render a #PangoLayoutLine onto a FreeType2 bitmap
+ * Render a #PangoLayout onto a FreeType2 bitmap
  */
 void 
 pango_ft2_render_layout (FT_Bitmap   *bitmap,
diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index dc467b74..1eaeda05 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -25,10 +25,10 @@
 
 #include <pango/pango-layout.h>
 
-G_BEGIN_DECLS
-
 #include <freetype/freetype.h>
 
+G_BEGIN_DECLS
+
 #define PANGO_RENDER_TYPE_FT2 "PangoRenderFT2"
 
 /* Calls for applications */
diff --git a/pango/querymodules.c b/pango/querymodules.c
index 7cbeeeb7..c29c8ed4 100644
--- a/pango/querymodules.c
+++ b/pango/querymodules.c
@@ -144,7 +144,7 @@ int main (int argc, char **argv)
 	  GDir *dir = g_dir_open (dirs[i], 0, NULL);
 	  if (dir)
 	    {
-	      char *dent;
+	      const char *dent;
 
 	      while ((dent = g_dir_read_name (dir)))
 		{
diff --git a/tests/dump-boundaries.c b/tests/dump-boundaries.c
index 8ea4383e..ac507cf6 100644
--- a/tests/dump-boundaries.c
+++ b/tests/dump-boundaries.c
@@ -33,7 +33,6 @@ fail (const char *format,
       ...)
 {
   char *str;
-  char *line_text;
   
   va_list args;