From e2e44b312b3314a99e89d0e73bf7016620b03b22 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 28 Sep 2007 21:14:41 +0000 Subject: [PATCH] 2007-09-28 [colin] 3.0.1cvs45 * src/addressbook.c * src/addrindex.c Fix warnings --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/addressbook.c | 2 ++ src/addrindex.c | 9 ++++++--- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3fff0920..8949e6e38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-28 [colin] 3.0.1cvs45 + + * src/addressbook.c + * src/addrindex.c + Fix warnings + 2007-09-28 [paul] 3.0.1cvs44 * src/mimeview.c diff --git a/PATCHSETS b/PATCHSETS index 6af40586e..64a61855e 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2908,3 +2908,4 @@ ( cvs diff -u -r 1.56.2.55 -r 1.56.2.56 src/pop.c; ) > 3.0.1cvs42.patchset ( cvs diff -u -r 1.61.2.69 -r 1.61.2.70 src/account.c; ) > 3.0.1cvs43.patchset ( cvs diff -u -r 1.83.2.116 -r 1.83.2.117 src/mimeview.c; ) > 3.0.1cvs44.patchset +( cvs diff -u -r 1.60.2.97 -r 1.60.2.98 src/addressbook.c; cvs diff -u -r 1.28.2.30 -r 1.28.2.31 src/addrindex.c; ) > 3.0.1cvs45.patchset diff --git a/configure.ac b/configure.ac index 704159674..fec920f97 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=44 +EXTRA_VERSION=45 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/addressbook.c b/src/addressbook.c index 1c326f6c5..a67411536 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -3404,7 +3404,9 @@ static void addressbook_folder_load_one_person( gchar *text[N_LIST_COLS]; gboolean flgFirst = TRUE, haveAddr = FALSE; GList *node; +#ifdef USE_LDAP AddressBookFile *abf = addressbook_get_book_file(); +#endif if( person == NULL ) return; diff --git a/src/addrindex.c b/src/addrindex.c index 6885b5644..ea3aeb958 100644 --- a/src/addrindex.c +++ b/src/addrindex.c @@ -1716,12 +1716,15 @@ static gint addrindex_write_to( AddressIndex *addrIndex, const gchar *newFile ) * return: Status code, from addrIndex->retVal. */ gint addrindex_save_data( AddressIndex *addrIndex ) { - GList *nodeIf, *nodeDS; - +#ifdef USE_LDAP + GList *nodeIf; + GList *nodeDS; +#endif + g_return_val_if_fail( addrIndex != NULL, -1 ); - nodeIf = addrIndex->interfaceList; #ifdef USE_LDAP + nodeIf = addrIndex->interfaceList; /* save LDAP interfaces */ while ( nodeIf ) { AddressInterface *iface = nodeIf->data; -- 2.25.1