Fix typo (#114375). Also, make the function static.

2003-06-04  Noah Levitt  <nlevitt@columbia.edu>

	* glib/gunidecomp.h (combine): Fix typo (#114375). Also, make the
	function static.

diff --git a/ChangeLog b/ChangeLog
index aced312..d29f204 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-04  Noah Levitt  <nlevitt@columbia.edu>
+
+       * glib/gunidecomp.h (combine): Fix typo (#114375). Also, make the
+       function static.
+
 2003-06-03  Sebastian Wilhelmi  <seppi@seppi.de>
 
        * configure.in: Test for pthread_setschedparam. If not existant,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index aced312..d29f204 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-06-04  Noah Levitt  <nlevitt@columbia.edu>
+
+       * glib/gunidecomp.h (combine): Fix typo (#114375). Also, make the
+       function static.
+
 2003-06-03  Sebastian Wilhelmi  <seppi@seppi.de>
 
        * configure.in: Test for pthread_setschedparam. If not existant,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index aced312..d29f204 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2003-06-04  Noah Levitt  <nlevitt@columbia.edu>
+
+       * glib/gunidecomp.h (combine): Fix typo (#114375). Also, make the
+       function static.
+
 2003-06-03  Sebastian Wilhelmi  <seppi@seppi.de>
 
        * configure.in: Test for pthread_setschedparam. If not existant,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index aced312..d29f204 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-06-04  Noah Levitt  <nlevitt@columbia.edu>
+
+       * glib/gunidecomp.h (combine): Fix typo (#114375). Also, make the
+       function static.
+
 2003-06-03  Sebastian Wilhelmi  <seppi@seppi.de>
 
        * configure.in: Test for pthread_setschedparam. If not existant,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index aced312..d29f204 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-06-04  Noah Levitt  <nlevitt@columbia.edu>
+
+       * glib/gunidecomp.h (combine): Fix typo (#114375). Also, make the
+       function static.
+
 2003-06-03  Sebastian Wilhelmi  <seppi@seppi.de>
 
        * configure.in: Test for pthread_setschedparam. If not existant,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index aced312..d29f204 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-06-04  Noah Levitt  <nlevitt@columbia.edu>
+
+       * glib/gunidecomp.h (combine): Fix typo (#114375). Also, make the
+       function static.
+
 2003-06-03  Sebastian Wilhelmi  <seppi@seppi.de>
 
        * configure.in: Test for pthread_setschedparam. If not existant,

diff --git a/glib/gunidecomp.c b/glib/gunidecomp.c
index 0d73bd5..24bec04 100644 (file)
--- a/glib/gunidecomp.c
+++ b/glib/gunidecomp.c
@@ -186,7 +186,7 @@ g_unicode_canonical_decomposition (gunichar ch,
 #define COMPOSE_INDEX(Char) \
      (((Char) > (G_UNICODE_LAST_CHAR)) ? 0 : CI((Char) >> 8, (Char) & 0xff))
 
-gboolean
+static gboolean
 combine (gunichar  a,
         gunichar  b,
         gunichar *result)
@@ -218,7 +218,7 @@ combine (gunichar  a,
     }
 
   if (index_a >= COMPOSE_FIRST_START && index_a < COMPOSE_FIRST_SINGLE_START &&
-      index_b >= COMPOSE_SECOND_START && index_a < COMPOSE_SECOND_SINGLE_START)
+      index_b >= COMPOSE_SECOND_START && index_b < COMPOSE_SECOND_SINGLE_START)
     {
       gunichar res = compose_array[index_a - COMPOSE_FIRST_START][index_b - COMPOSE_SECOND_START];