2009-02-22 [colin] 3.7.0cvs68

[claws.git] / src / addrduplicates.c

diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index 8674a5e8ff2853e8e296d216654beba9c37b6149..e745fbac8d1abf3b8a869c3f3c892a9cbd852925 100644 (file)
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -177,7 +177,7 @@ static void destroy_addr_hash_val(gpointer value)
 
        for(walk = list; walk; walk = walk->next) {
                AddrDupListEntry *entry = (AddrDupListEntry*) walk->data;
-               if(entry->book_path)
+               if(entry && entry->book_path)
                        g_free(entry->book_path);
                if(entry)
                        g_free(entry);
@@ -843,10 +843,11 @@ gboolean addrduplicates_delete_item_person(ItemPerson *item, AddressDataSource *
 {
        AddressBookFile *abf;
        AddressInterface *iface;
-
+       if (!ds)
+               return FALSE;
        /* Test for read only */
        iface = ds->interface;
-       if( iface->readOnly ) {
+       if( iface && iface->readOnly ) {
                alertpanel( _("Delete address"),
                            _("This address data is readonly and cannot be deleted."),
                            GTK_STOCK_CLOSE, NULL, NULL );