aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-09-05 07:11:00 +0800
committerIain Holmes <iain@src.gnome.org>2001-09-05 07:11:00 +0800
commitbd7a7a7bb93234e0a8ccfa6776cf8e6e7b3ecadf (patch)
treee006fb055035ca8830a40dab4fe9e6733372ebce
parentfef8a881026a6dac9e73a5b7d928811b66e77495 (diff)
downloadgsoc2013-evolution-bd7a7a7bb93234e0a8ccfa6776cf8e6e7b3ecadf.tar.gz
gsoc2013-evolution-bd7a7a7bb93234e0a8ccfa6776cf8e6e7b3ecadf.tar.zst
gsoc2013-evolution-bd7a7a7bb93234e0a8ccfa6776cf8e6e7b3ecadf.zip
Check if the file is a VCard before importing
svn path=/trunk/; revision=12610
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/backend/ebook/evolution-vcard-importer.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 553c3be34a..8947dd94d4 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-04 Iain Holmes <iain@ximian.com>
+
+ * backend/ebook/evolution-vcard-importer.c (load_file_fn): Return FALSE
+ if the file isn't a valid VCard file.
+
2001-08-05 Zbigniew Chyla <cyba@gnome.pl>
I18n fixes (mainly making buttons on the right side less Anglocentric :-)
diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c
index ea474f780b..246c5ecb6e 100644
--- a/addressbook/backend/ebook/evolution-vcard-importer.c
+++ b/addressbook/backend/ebook/evolution-vcard-importer.c
@@ -187,6 +187,10 @@ load_file_fn (EvolutionImporter *importer,
{
VCardImporter *gci;
+ if (check_file_is_vcard (filename) == FALSE) {
+ return FALSE;
+ }
+
gci = (VCardImporter *) closure;
gci->filename = g_strdup (filename);
gci->folderpath = g_strdup (folderpath);