diff options
| author | Iain Holmes <iain@src.gnome.org> | 2001-07-13 05:10:55 +0800 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2001-07-13 05:10:55 +0800 |
| commit | 0fbbeea421bb8120e58f3f2d2a9fe5d25e180608 (patch) | |
| tree | 7a117c33fa09aa552b4251f83d7767b4ca792209 | |
| parent | c65b4386072a18991f571775f89e43505404e9aa (diff) | |
| download | gsoc2013-evolution-0fbbeea421bb8120e58f3f2d2a9fe5d25e180608.tar gsoc2013-evolution-0fbbeea421bb8120e58f3f2d2a9fe5d25e180608.tar.gz gsoc2013-evolution-0fbbeea421bb8120e58f3f2d2a9fe5d25e180608.tar.bz2 gsoc2013-evolution-0fbbeea421bb8120e58f3f2d2a9fe5d25e180608.tar.lz gsoc2013-evolution-0fbbeea421bb8120e58f3f2d2a9fe5d25e180608.tar.xz gsoc2013-evolution-0fbbeea421bb8120e58f3f2d2a9fe5d25e180608.tar.zst gsoc2013-evolution-0fbbeea421bb8120e58f3f2d2a9fe5d25e180608.zip | |
Check the file even if the extension is NULL
svn path=/trunk/; revision=11066
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/backend/ebook/evolution-vcard-importer.c | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 140c76e722..69fa2e9069 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2001-07-12 Iain Holmes <iain@ximian.com> + + * backend/e-book/evolution-vcard-importer.c (support_format_fn): Check + for no extension. Actually same as Jason's fix below :) but also check + the file contents. + 2001-07-12 JP Rosevear <jpr@ximian.com> * gui/component/addressbook-config.glade: add accelerators, diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c index 7a3a56fbd6..caed08b8e0 100644 --- a/addressbook/backend/ebook/evolution-vcard-importer.c +++ b/addressbook/backend/ebook/evolution-vcard-importer.c @@ -156,12 +156,9 @@ support_format_fn (EvolutionImporter *importer, int i; ext = strrchr (filename, '.'); - - /* Require an extension in order to strcmp with our list of - supported extensions */ - if (ext == NULL) - return FALSE; - + if (ext == NULL) { + return check_file_is_vcard (filename); + } for (i = 0; supported_extensions[i] != NULL; i++) { if (strcmp (supported_extensions[i], ext) == 0) return check_file_is_vcard (filename); |