From b5e4a809fa1956f13e05dc8e80600ffe4b8f1842 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 26 Oct 2004 18:48:55 +0000 Subject: [PATCH] Add a missing include. --- ChangeLog | 11 ++++++++--- ChangeLog.pre-2-10 | 11 ++++++++--- ChangeLog.pre-2-12 | 11 ++++++++--- ChangeLog.pre-2-6 | 11 ++++++++--- ChangeLog.pre-2-8 | 11 ++++++++--- glib/gkeyfile.c | 6 ++++-- 6 files changed, 44 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index facaefd9..801c9004 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,14 @@ 2004-10-26 Gora Mohanty - - * configure.in: Added 'or' to ALL_LINGUAS. - + + * configure.in: Added 'or' to ALL_LINGUAS. + 2004-10-26 Matthias Clasen + * 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 facaefd9..801c9004 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,9 +1,14 @@ 2004-10-26 Gora Mohanty - - * configure.in: Added 'or' to ALL_LINGUAS. - + + * configure.in: Added 'or' to ALL_LINGUAS. + 2004-10-26 Matthias Clasen + * 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 facaefd9..801c9004 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,9 +1,14 @@ 2004-10-26 Gora Mohanty - - * configure.in: Added 'or' to ALL_LINGUAS. - + + * configure.in: Added 'or' to ALL_LINGUAS. + 2004-10-26 Matthias Clasen + * 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 facaefd9..801c9004 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,9 +1,14 @@ 2004-10-26 Gora Mohanty - - * configure.in: Added 'or' to ALL_LINGUAS. - + + * configure.in: Added 'or' to ALL_LINGUAS. + 2004-10-26 Matthias Clasen + * 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 facaefd9..801c9004 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,9 +1,14 @@ 2004-10-26 Gora Mohanty - - * configure.in: Added 'or' to ALL_LINGUAS. - + + * configure.in: Added 'or' to ALL_LINGUAS. + 2004-10-26 Matthias Clasen + * 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 4b02af60..acddd9f0 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -22,6 +22,8 @@ */ #include "config.h" +#include "galias.h" + #include "gkeyfile.h" #include @@ -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); -- 2.34.1