[Commits] [SCM] claws branch, master, updated. 3.16.0-112-g9b91aa8

[wwp at claws-mail.org]

The branch, master has been updated
       via  9b91aa8b0c14376e5b766628e084806728b1e360 (commit)
      from  552d84536a9d1f596d0b8f36ec771909b299d42b (commit)

Summary of changes:
 src/{addrduplicates.h => addrmerge.h} |   37 ++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)
 copy src/{addrduplicates.h => addrmerge.h} (50%)


- Log -----------------------------------------------------------------
commit 9b91aa8b0c14376e5b766628e084806728b1e360
Author: wwp <wwp at free.fr>
Date:   Tue Apr 10 09:44:20 2018 +0200

    Add missing src/addrmerge.h file from 3.16.0-107-gf25722a.

diff --git a/src/addrmerge.h b/src/addrmerge.h
new file mode 100644
index 0000000..344d361
--- /dev/null
+++ b/src/addrmerge.h
@@ -0,0 +1,51 @@
+/* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2014 Charles Lehner 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
+
+#ifndef __ADDRMERGE_H__
+#define __ADDRMERGE_H__
+
+#include <gtk/gtk.h>
+
+#include "addritem.h"
+#include "addressbook.h"
+#include "addressitem.h"
+#include "addrselect.h"
+
+struct AddrMergePage {
+   GtkCMCTree*     clist;
+   AddressObject*	   pobj;
+   AddressBookFile*    abf;
+   AddressDataSource*  ds;
+   AddrSelectList*     addressSelect;
+   ItemPerson*     target;
+   ItemPerson*     nameTarget;
+   gchar*		   picture;
+   GList*		   emails;
+   GList*		   persons;
+   gboolean 	   pickPicture;
+   gboolean 	   pickName;
+   GtkWidget*	   dialog;
+   GtkWidget*	   iconView;
+   GtkWidget*	   namesList;
+};
+
+void addrmerge_merge   ( GtkCMCTree *clist,
+			 AddressObject *pobj,
+			 AddressDataSource *ds,
+			 AddrSelectList *list );
+
+#endif /*__ADDRMERGE_H__*/

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail