From f2dc09609b2ec8d8e749b7768b9f7599e21288ec Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Sat, 23 Nov 2002 03:30:38 +0000 Subject: [ rolling forward fix for #34254 from 1.2 branch ] use g-ascii_strncasecmp 2002-11-22 Chris Toshok [ rolling forward fix for #34254 from 1.2 branch ] * backend/ebook/evolution-vcard-importer.c (check_file_is_vcard): use g-ascii_strncasecmp instead of strncmp. (support_format_fn): use g_ascii_strcasecmp instead of strcmp. svn path=/trunk/; revision=18896 --- addressbook/ChangeLog | 7 +++++++ addressbook/backend/ebook/evolution-vcard-importer.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 3220bafa2c..09807f40f1 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2002-11-22 Chris Toshok + + [ rolling forward fix for #34254 from 1.2 branch ] + * backend/ebook/evolution-vcard-importer.c (check_file_is_vcard): + use g-ascii_strncasecmp instead of strncmp. + (support_format_fn): use g_ascii_strcasecmp instead of strcmp. + 2002-11-20 Chris Toshok * gui/component/addressbook-storage.h: roll forward the scope fix. diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c index b60691f87c..f221ae4a64 100644 --- a/addressbook/backend/ebook/evolution-vcard-importer.c +++ b/addressbook/backend/ebook/evolution-vcard-importer.c @@ -149,7 +149,7 @@ check_file_is_vcard (const char *filename) return FALSE; } - if (strncmp (line, "BEGIN:VCARD", 11) == 0) { + if (g_ascii_strncasecmp (line, "BEGIN:VCARD", 11) == 0) { result = TRUE; } else { result = FALSE; @@ -172,7 +172,7 @@ support_format_fn (EvolutionImporter *importer, return check_file_is_vcard (filename); } for (i = 0; supported_extensions[i] != NULL; i++) { - if (strcmp (supported_extensions[i], ext) == 0) + if (g_ascii_strcmp (supported_extensions[i], ext) == 0) return check_file_is_vcard (filename); } -- cgit v1.2.3