talons

commit cf4dab3fb6505a13c4233b096819e2c48a707308
parent 68bcb4368e9451006f7c0868b01d52acad9e416b
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sun, 11 Jan 2009 16:43:51 +0000

2009-01-11 [paul]	3.7.0cvs32

	* src/addrindex.c
		clean up some build warnings

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/addrindex.c
 | 
3
++-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-11 [paul]	3.7.0cvs32
+
+	* src/addrindex.c
+		clean up some build warnings
+
 2009-01-11 [colin]	3.7.0cvs31
 
 	* src/addrindex.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3693,3 +3693,4 @@
 ( cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/addrclip.c;  cvs diff -u -r 1.28.2.38 -r 1.28.2.39 src/addrindex.c;  cvs diff -u -r 1.13.2.18 -r 1.13.2.19 src/addritem.c;  cvs diff -u -r 1.4.12.8 -r 1.4.12.9 src/foldersel.h;  cvs diff -u -r 1.207.2.210 -r 1.207.2.211 src/folderview.c;  cvs diff -u -r 1.52.2.71 -r 1.52.2.72 src/prefs_folder_item.c;  ) > 3.7.0cvs29.patchset
 ( cvs diff -u -r 1.213.2.186 -r 1.213.2.187 src/folder.c;  ) > 3.7.0cvs30.patchset
 ( cvs diff -u -r 1.28.2.39 -r 1.28.2.40 src/addrindex.c;  ) > 3.7.0cvs31.patchset
+( cvs diff -u -r 1.28.2.40 -r 1.28.2.41 src/addrindex.c;  ) > 3.7.0cvs32.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=32
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/addrindex.c b/src/addrindex.c
@@ -979,6 +979,7 @@ static int addrindex_write_attr( FILE *fp, const gchar *name, const gchar *value
 	return 0;
 }
 
+#if !defined(USE_LDAP) || !defined(USE_JPILOT)
 /**
  * Return DOM fragment for current XML tag from file.
  * \param  file XML file being processed.
@@ -1087,7 +1088,7 @@ static int addrindex_write_fragment(
 	
 	return 0;
 }
-
+#endif
 /**
  * Read/parse address index file, creating a data source for a regular
  * intrinsic XML addressbook.