2007-10-09 [iwkse] 3.0.2cvs41

	* src/addressbook.c
	* src/addritem.c
	* src/addritem.h
	* src/editaddress.c
	* src/editaddress_other_attributes_ldap.h
	* src/addrbook.c
	* src/Makefile.am
		set contact's picture in the Addressbook

diff --git a/ChangeLog b/ChangeLog
index 119b6d7733b40c3868dab9a3ce7fcbab7c32414d..744c8e1cdd797b403ad8e65f993b29754f041b3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2007-10-09 [iwkse]     3.0.2cvs41
+
+       * src/addressbook.c
+       * src/addritem.c
+       * src/addritem.h
+       * src/editaddress.c
+       * src/editaddress_other_attributes_ldap.h
+       * src/addrbook.c
+       * src/Makefile.am
+               set contact's picture in the Addressbook
+
+2007-10-09 [salvatore] 3.0.2cvs40
+
+       * src/addressbook.c
+       * src/addritem.c
+       * src/addritem.h
+       * src/editaddress.c
+       * src/editaddress_other_attributes_ldap.h
+       * src/addrbook.c
+       * src/Makefile.am
+               set a contact's photo in the Addressbook
+
+2007-10-09 [iwkse]     3.0.2cvs39
+
+       * Makefile.am
+       * src/addressbook.c
+       * src/addritem.c
+       * src/addritem.h
+       * src/editaddress.c
+       * src/editaddress_other_attributes_ldap.h
+       * src/addrbook.c
+       * src/Makefile.am
+               set a photo in the Addressbook
+

 2007-10-08 [colin]     3.0.2cvs38
 
        * src/prefs_toolbar.c
 2007-10-08 [colin]     3.0.2cvs38
 
        * src/prefs_toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index e5a98c6bcfaa7702c2a8992e8d1db3665874bdfe..0e7f6f484030f0874a0f82522eb574587191f7d9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2951,3 +2951,6 @@
 ( cvs diff -u -r 1.382.2.413 -r 1.382.2.414 src/compose.c;  cvs diff -u -r 1.50.2.42 -r 1.50.2.43 src/compose.h;  ) > 3.0.2cvs36.patchset
 ( cvs diff -u -r 1.30.2.42 -r 1.30.2.43 src/prefs_toolbar.c;  ) > 3.0.2cvs37.patchset
 ( cvs diff -u -r 1.30.2.43 -r 1.30.2.44 src/prefs_toolbar.c;  ) > 3.0.2cvs38.patchset
 ( cvs diff -u -r 1.382.2.413 -r 1.382.2.414 src/compose.c;  cvs diff -u -r 1.50.2.42 -r 1.50.2.43 src/compose.h;  ) > 3.0.2cvs36.patchset
 ( cvs diff -u -r 1.30.2.42 -r 1.30.2.43 src/prefs_toolbar.c;  ) > 3.0.2cvs37.patchset
 ( cvs diff -u -r 1.30.2.43 -r 1.30.2.44 src/prefs_toolbar.c;  ) > 3.0.2cvs38.patchset

+( cvs diff -u -r 1.24.2.23 -r 1.24.2.24 Makefile.am;  cvs diff -u -r 1.60.2.100 -r 1.60.2.101 src/addressbook.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/addritem.c;  cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/addritem.h;  cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/editaddress.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.22.2.17 -r 1.22.2.18 src/addrbook.c;  cvs diff -u -r 1.155.2.77 -r 1.155.2.78 src/Makefile.am;  ) > 3.0.2cvs39.patchset
+( cvs diff -u -r 1.60.2.100 -r 1.60.2.101 src/addressbook.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/addritem.c;  cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/addritem.h;  cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/editaddress.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.22.2.17 -r 1.22.2.18 src/addrbook.c;  cvs diff -u -r 1.155.2.77 -r 1.155.2.78 src/Makefile.am;  ) > 3.0.2cvs40.patchset
+( cvs diff -u -r 1.60.2.100 -r 1.60.2.101 src/addressbook.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/addritem.c;  cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/addritem.h;  cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/editaddress.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.22.2.17 -r 1.22.2.18 src/addrbook.c;  cvs diff -u -r 1.155.2.77 -r 1.155.2.78 src/Makefile.am;  ) > 3.0.2cvs41.patchset

diff --git a/configure.ac b/configure.ac
index 7dd45c70fdc00d8d3d7194be59bec44ddf9a22a5..62b12b7a4ac5deb0e814c08bcfcbdc3efe032c85 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl Process this file with autoconf to produce a configure script.
+

 AC_PREREQ(2.60)
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(config)
 AC_PREREQ(2.60)
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(config)


@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=38
+EXTRA_VERSION=41

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -142,7 +142,6 @@ then
 fi
 
 CFLAGS="$CFLAGS -Wall"
 fi
 
 CFLAGS="$CFLAGS -Wall"

-

 pthread_name=
 case "$target" in
 *-darwin*)
 pthread_name=
 case "$target" in
 *-darwin*)