From 0796d0b1270b9793fd87a96ebbf74554aa158696 Mon Sep 17 00:00:00 2001 From: Holger Berndt Date: Tue, 4 Dec 2007 11:42:40 +0000 Subject: [PATCH] 2007-12-04 [holger] 3.1.0cvs53 * src/addrduplicates.c * src/addrduplicates.h Export addressbook entry deletion --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/addrduplicates.c | 6 ++---- src/addrduplicates.h | 4 ++++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5db0eb5d2..7e2cac700 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 [holger] 3.1.0cvs53 + + * src/addrduplicates.c + * src/addrduplicates.h + Export addressbook entry deletion + 2007-12-04 [colin] 3.1.0cvs52 * tools/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index c3ad85f25..989cf19ed 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3110,3 +3110,4 @@ ( cvs diff -u -r 1.1.4.90 -r 1.1.4.91 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/etpan/nntp-thread.c; ) > 3.1.0cvs50.patchset ( cvs diff -u -r 1.213.2.170 -r 1.213.2.171 src/folder.c; cvs diff -u -r 1.87.2.51 -r 1.87.2.52 src/folder.h; cvs diff -u -r 1.207.2.189 -r 1.207.2.190 src/folderview.c; cvs diff -u -r 1.179.2.202 -r 1.179.2.203 src/imap.c; cvs diff -u -r 1.274.2.222 -r 1.274.2.223 src/mainwindow.c; cvs diff -u -r 1.43.2.65 -r 1.43.2.66 src/prefs_matcher.c; ) > 3.1.0cvs51.patchset ( cvs diff -u -r 1.101.2.46 -r 1.101.2.47 src/news.c; cvs diff -u -r 1.150.2.106 -r 1.150.2.107 src/procmsg.c; cvs diff -u -r 1.25.2.24 -r 1.25.2.25 tools/Makefile.am; cvs diff -u -r -1.1.14.4 -r -1.1.14.5 tools/README.sylprint; cvs diff -u -r -1.2.14.3 -r -1.2.14.4 tools/sylprint.pl; cvs diff -u -r -1.1.14.2 -r -1.1.14.3 tools/sylprint.rc; ) > 3.1.0cvs52.patchset +( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/addrduplicates.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/addrduplicates.h; ) > 3.1.0cvs53.patchset diff --git a/configure.ac b/configure.ac index 72a1d7e32..f134fcf47 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=1 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=52 +EXTRA_VERSION=53 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/addrduplicates.c b/src/addrduplicates.c index a009789ce..da0543d67 100644 --- a/src/addrduplicates.c +++ b/src/addrduplicates.c @@ -32,7 +32,6 @@ #include "ldapupdate.h" #endif #include "addrduplicates.h" -#include "addrindex.h" #include "addrbook.h" #include "addressbook.h" #include "editaddress.h" @@ -84,7 +83,6 @@ static gboolean detail_focus_out(GtkWidget*,GdkEventFocus*,gpointer); static void cb_del_btn_clicked(GtkButton *, gpointer); static void cb_edit_btn_clicked(GtkButton *, gpointer); -static gboolean delete_item(ItemPerson*, AddressDataSource*); static gchar* get_bookpath(ItemPerson*,AddressDataSource*); static gboolean is_editing_entry_only_selection(void); static void edit_post_update_cb(ItemPerson*); @@ -824,7 +822,7 @@ static void cb_del_btn_clicked(GtkButton *button, gpointer data) path = gtk_tree_row_reference_get_path(ref); if(gtk_tree_model_get_iter(model, &iter, path)) { gtk_tree_model_get(model, &iter, COL_ITEM, &item, COL_DS, &ds, -1); - delete_item(item,ds); + addrduplicates_delete_item_person(item,ds); } gtk_tree_path_free(path); } @@ -842,7 +840,7 @@ static void cb_del_btn_clicked(GtkButton *button, gpointer data) g_free(email); } -static gboolean delete_item(ItemPerson *item, AddressDataSource *ds) +gboolean addrduplicates_delete_item_person(ItemPerson *item, AddressDataSource *ds) { AddressBookFile *abf; AddressInterface *iface; diff --git a/src/addrduplicates.h b/src/addrduplicates.h index cfefa8001..64112b01f 100644 --- a/src/addrduplicates.h +++ b/src/addrduplicates.h @@ -21,6 +21,10 @@ #include +#include "addritem.h" +#include "addrindex.h" + void addrduplicates_find(GtkWindow *parent); +gboolean addrduplicates_delete_item_person(ItemPerson*, AddressDataSource*); #endif /*__ADDRDUPLICATES_H__*/ -- 2.25.1