2006-08-14 [wwp] 2.4.0cvs49

	* src/addressbook_foldersel.c
		fix strict ISO C90 compliance.

diff --git a/ChangeLog b/ChangeLog
index 588cdc4001dcc59d0dd0ec6de4020a8f3a2c7f48..c81f2900de40701f72fa380a1e54440a0bb00fbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-14 [wwp]       2.4.0cvs49
+
+       * src/addressbook_foldersel.c
+               fix strict ISO C90 compliance.
+

 2006-08-14 [paul]      2.4.0cvs48
 
        * src/gtk/prefswindow.c
 2006-08-14 [paul]      2.4.0cvs48
 
        * src/gtk/prefswindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 15ca417fac18eae75a8bc032938e7e844331dfa0..805309855b126aeae75e6dec2535bad58f06b470 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1740,3 +1740,4 @@
 ( cvs diff -u -r 1.105.2.64 -r 1.105.2.65 src/prefs_account.c;  ) > 2.4.0cvs46.patchset
 ( cvs diff -u -r 1.16.2.19 -r 1.16.2.20 src/prefs_display_header.c;  ) > 2.4.0cvs47.patchset
 ( cvs diff -u -r 1.12.2.26 -r 1.12.2.27 src/gtk/prefswindow.c;  ) > 2.4.0cvs48.patchset
 ( cvs diff -u -r 1.105.2.64 -r 1.105.2.65 src/prefs_account.c;  ) > 2.4.0cvs46.patchset
 ( cvs diff -u -r 1.16.2.19 -r 1.16.2.20 src/prefs_display_header.c;  ) > 2.4.0cvs47.patchset
 ( cvs diff -u -r 1.12.2.26 -r 1.12.2.27 src/gtk/prefswindow.c;  ) > 2.4.0cvs48.patchset

+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/addressbook_foldersel.c;  ) > 2.4.0cvs49.patchset

diff --git a/configure.ac b/configure.ac
index 36850a52f7890adbe3fcfd442af1f9bf9142d618..3e5df212d49ad2118058ac14cd46fb5eb34cd968 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=48
+EXTRA_VERSION=49

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index f33ae2dd1beaad5f7ea1d49e6ce4671c14c0f2ea..7ea655892d8a7da02192461b1981d2ec8721447f 100644 (file)
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -369,9 +369,9 @@ static void addressbook_foldersel_load_data( AddressIndex *addrIndex, gchar *pat
 gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
                                        AddressBookFile **book, ItemFolder **folder, gchar* path)
 {
 gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
                                        AddressBookFile **book, ItemFolder **folder, gchar* path)
 {

+       FolderPathMatch folder_path_match = { NULL, FALSE, 0, NULL };

        gboolean retVal = FALSE;
        addressbook_foldersel_cancelled = FALSE;
        gboolean retVal = FALSE;
        addressbook_foldersel_cancelled = FALSE;

-       FolderPathMatch folder_path_match = { NULL, FALSE, 0, NULL };

 
        if ( ! addressbook_foldersel_dlg.window )
                addressbook_foldersel_create();
 
        if ( ! addressbook_foldersel_dlg.window )
                addressbook_foldersel_create();