2007-12-04 [holger] 3.1.0cvs53

	* src/addrduplicates.c
	* src/addrduplicates.h
		Export addressbook entry deletion

diff --git a/ChangeLog b/ChangeLog
index 5db0eb5d2b3b6ce8454ba5c54d3429de4c21f311..7e2cac700367e535dffbad0e8ed4ebf3f3585176 100644 (file)
--- 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 c3ad85f2564f9177b903e878877d10f676607d48..989cf19ed3c1eb9be2778ee8b030a633d44a4997 100644 (file)
--- 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 72a1d7e32af08e862068480ab144a2951c39f82f..f134fcf47d6d46c42d463f1635775238cf99dea4 100644 (file)
--- 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 a009789ce1c76c29fc124d2ace9fb7686dc82ce1..da0543d6720e4db4a42d9d5c723e8935656f4ca6 100644 (file)
--- 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 cfefa800160c46ec8141d65c375bd039b945c957..64112b01f81ea04f7534dbfcbef019e76a21cde2 100644 (file)
--- a/src/addrduplicates.h
+++ b/src/addrduplicates.h
@@ -21,6 +21,10 @@
 
 #include <gtk/gtk.h>
 
+#include "addritem.h"
+#include "addrindex.h"
+
 void addrduplicates_find(GtkWindow *parent);
+gboolean addrduplicates_delete_item_person(ItemPerson*, AddressDataSource*);
 
 #endif /*__ADDRDUPLICATES_H__*/