Add a missing include.

diff --git a/ChangeLog b/ChangeLog
index facaefd..801c900 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
 2004-10-26  Gora Mohanty  <gmohanty@cvs.gnome.org>
- 
-        * configure.in: Added 'or' to ALL_LINGUAS.
-  
+
+       * configure.in: Added 'or' to ALL_LINGUAS.
+
 2004-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Include galias.h.
+       
+       * glib/gkeyfile.c (g_key_file_parse_value_as_comment): 
+       Don't compare strings and chars.
+
        * glib/glib.symbols: Add new symbols.
 
        * glib/gkeyfile.c (g_key_file_new): Fix docs.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index facaefd..801c900 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,9 +1,14 @@
 2004-10-26  Gora Mohanty  <gmohanty@cvs.gnome.org>
- 
-        * configure.in: Added 'or' to ALL_LINGUAS.
-  
+
+       * configure.in: Added 'or' to ALL_LINGUAS.
+
 2004-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Include galias.h.
+       
+       * glib/gkeyfile.c (g_key_file_parse_value_as_comment): 
+       Don't compare strings and chars.
+
        * glib/glib.symbols: Add new symbols.
 
        * glib/gkeyfile.c (g_key_file_new): Fix docs.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index facaefd..801c900 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,9 +1,14 @@
 2004-10-26  Gora Mohanty  <gmohanty@cvs.gnome.org>
- 
-        * configure.in: Added 'or' to ALL_LINGUAS.
-  
+
+       * configure.in: Added 'or' to ALL_LINGUAS.
+
 2004-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Include galias.h.
+       
+       * glib/gkeyfile.c (g_key_file_parse_value_as_comment): 
+       Don't compare strings and chars.
+
        * glib/glib.symbols: Add new symbols.
 
        * glib/gkeyfile.c (g_key_file_new): Fix docs.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index facaefd..801c900 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,9 +1,14 @@
 2004-10-26  Gora Mohanty  <gmohanty@cvs.gnome.org>
- 
-        * configure.in: Added 'or' to ALL_LINGUAS.
-  
+
+       * configure.in: Added 'or' to ALL_LINGUAS.
+
 2004-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Include galias.h.
+       
+       * glib/gkeyfile.c (g_key_file_parse_value_as_comment): 
+       Don't compare strings and chars.
+
        * glib/glib.symbols: Add new symbols.
 
        * glib/gkeyfile.c (g_key_file_new): Fix docs.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index facaefd..801c900 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,9 +1,14 @@
 2004-10-26  Gora Mohanty  <gmohanty@cvs.gnome.org>
- 
-        * configure.in: Added 'or' to ALL_LINGUAS.
-  
+
+       * configure.in: Added 'or' to ALL_LINGUAS.
+
 2004-10-26  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gkeyfile.c: Include galias.h.
+       
+       * glib/gkeyfile.c (g_key_file_parse_value_as_comment): 
+       Don't compare strings and chars.
+
        * glib/glib.symbols: Add new symbols.
 
        * glib/gkeyfile.c (g_key_file_new): Fix docs.

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 4b02af6..acddd9f 100644 (file)
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -22,6 +22,8 @@
  */
 
 #include "config.h"
+#include "galias.h"
+
 #include "gkeyfile.h"
 
 #include <errno.h>
@@ -629,7 +631,7 @@ static gboolean
 g_key_file_locale_is_interesting (GKeyFile    *key_file,
                                  const gchar *locale)
 {
-  const const gchar * const * current_locales;
+  const gchar * const * current_locales;
   gsize i;
 
   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
@@ -3134,7 +3136,7 @@ g_key_file_parse_value_as_comment (GKeyFile    *key_file,
 
   for (i = 0; lines[i] != NULL; i++)
     {
-        if (lines[i][0] != "#")
+        if (lines[i][0] != '#')
            g_string_append_printf (string, "%s\n", lines[i]);
         else 
            g_string_append_printf (string, "%s\n", lines[i] + 1);