[gthumb/ext] make the extension search case insensitive
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gthumb/ext] make the extension search case insensitive
- Date: Mon, 26 Oct 2009 20:34:49 +0000 (UTC)
commit 2e093f6b94ab385ef8e0157d4889c32e71eb5493
Author: Paolo Bacchilega <paobac src gnome org>
Date: Mon Oct 26 21:33:08 2009 +0100
make the extension search case insensitive
gthumb/eggfileformatchooser.c | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/gthumb/eggfileformatchooser.c b/gthumb/eggfileformatchooser.c
index ff7ceec..00772c5 100644
--- a/gthumb/eggfileformatchooser.c
+++ b/gthumb/eggfileformatchooser.c
@@ -78,8 +78,8 @@ static guint signals[SIGNAL_LAST];
G_DEFINE_TYPE (EggFileFormatChooser,
egg_file_format_chooser,
GTK_TYPE_EXPANDER);
-EGG_DEFINE_QUARK (EggFileFormatFilterInfo,
- egg_file_format_filter_info);
+static EGG_DEFINE_QUARK (EggFileFormatFilterInfo,
+ egg_file_format_filter_info);
static EggFileFormatFilterInfo*
egg_file_format_filter_info_new (const gchar *name,
@@ -288,19 +288,29 @@ static gboolean
find_in_list (gchar *list,
const gchar *needle)
{
- gchar *saveptr;
- gchar *token;
-
- for (token = strtok_r (list, ",", &saveptr); NULL != token;
+ gchar *saveptr;
+ gchar *token;
+ gchar *needle2;
+ gboolean found = FALSE;
+
+ needle2 = g_utf8_casefold (needle, -1);
+ for (token = strtok_r (list, ",", &saveptr);
+ ! found && (NULL != token);
token = strtok_r (NULL, ",", &saveptr))
{
- token = g_strstrip (token);
+ char *token2;
- if (g_str_equal (needle, token))
- return TRUE;
+ token2 = g_utf8_casefold (g_strstrip (token), -1);
+
+ if (g_utf8_collate (needle2, token2) == 0)
+ found = TRUE;
+
+ g_free (token2);
}
- return FALSE;
+ g_free (needle2);
+
+ return found;
}
static gboolean
@@ -1146,7 +1156,7 @@ egg_file_format_chooser_append_extension (EggFileFormatChooser *self,
if (0 == format)
{
- g_warning ("%s: No file format selected. Cannot append extension.", __FUNCTION__);
+ g_warning ("%s: No file format selected. Cannot append extension.", G_STRFUNC);
return NULL;
}
@@ -1173,7 +1183,7 @@ egg_file_format_chooser_append_extension (EggFileFormatChooser *self,
if (NULL == extensions)
{
g_warning ("%s: File format %d doesn't provide file extensions. "
- "Cannot append extension.", __FUNCTION__, format);
+ "Cannot append extension.", G_STRFUNC, format);
return NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]