gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug #3348 ‘Contact pictures not deleted when contact is deleted’

Browse source 
Based on original patch submitted by Charles Lehner (thanks!)
This commit is contained in:
Ricardo Mones 2017-07-03 21:55:23 +02:00
parent 13272035f8
commit 066e76a286
4 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/addrduplicates.c
View file

@ -862,10 +862,7 @@ gboolean addrduplicates_delete_item_person(ItemPerson *item, AddressDataSource *
#endif
if(item) {
gchar *filename = addritem_person_get_picture(item);
if (filename && is_file_exist(filename))
claws_unlink(filename);
g_free(filename);
addritem_person_remove_picture(item);
addritem_free_item_person(item);
}
return TRUE;

5
src/addressbook.c
View file

@ -1573,10 +1573,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
}
#endif
if( item ) {
gchar *filename = addritem_person_get_picture(item);
if (filename && is_file_exist(filename))
claws_unlink(filename);
g_free(filename);
addritem_person_remove_picture(item);
addritem_free_item_person( item );
}
}

32
src/addritem.c
View file

@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 2001-2012 Match Grun and the Claws Mail team
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 2001-2017 Match Grun and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
/*
@ -25,6 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "defs.h"
#include "utils.h"
#include "addritem.h"
#include "mgutils.h"
@ -272,13 +272,37 @@ void addritem_person_set_picture( ItemPerson *person, const gchar *value ) {
/**
* Get picture for person object.
* \param person Person object.
* \param value Picture.
*/
gchar *addritem_person_get_picture( ItemPerson *person) {
if (person->picture)
return g_strdup(person->picture);
return NULL;
}
/**
* Delete picture for person object.
* \param person Person object.
*/
void addritem_person_remove_picture( ItemPerson *person) {
if (person->picture) {
gchar *filename = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S,
ADDRBOOK_DIR, G_DIR_SEPARATOR_S, person->picture,
".png", NULL );
if (is_file_exist(filename)) {
debug_print("removing addressbook picture %s\n",
filename);
if (claws_unlink(filename) < 0) {
FILE_OP_ERROR(filename, "remove");
g_free(filename);
return;
}
}
g_free(person->picture);
person->picture = NULL;
g_free(filename);
}
}
/**
* Specify first name for person object.
* \param person Person object.

6
src/addritem.h
View file

@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 2001-2012 Match Grun and the Claws Mail team
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 2001-2017 Match Grun and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -14,7 +14,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
/*
@ -138,6 +137,7 @@ ItemPerson *addritem_create_item_person ( void );
ItemPerson *addritem_copy_item_person ( ItemPerson *item );
void addritem_person_set_picture ( ItemPerson *person, const gchar *value );
gchar *addritem_person_get_picture ( ItemPerson *person);
void addritem_person_remove_picture ( ItemPerson *person);
void addritem_person_set_first_name ( ItemPerson *person, const gchar *value );
void addritem_person_set_last_name ( ItemPerson *person, const gchar *value );
void addritem_person_set_nick_name ( ItemPerson *person, const gchar *value );