wrap searches

diff --git a/ChangeLog b/ChangeLog
index 954d284879e05e1a22a925469d63505c565c1673..c352eab97fc86206cad76696436ee62b975cc407 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 0.5.3
  - removed a lefover debug message
  - fixed mutt import filter nickname cutoff
+ - wrap searches
 
 0.5.2
  - five custom fields added

diff --git a/abook.c b/abook.c
index fe37f71469d861e444d1e3de3595af0daa99957e..debd3f61fc74ca6de7bc3b2cf0e56aa2844c40fb 100644 (file)
--- a/abook.c
+++ b/abook.c
@@ -748,12 +748,12 @@ add_email_add_item(int quiet, char *name, char *email)
                                "you may want to use --add-email-quiet\n");
                        exit(1);
                }
-               printf("Add ``%s <%s>'' to %s ? (y/n)\n",
-                               name,
-                               email,
-                               datafile
-               );
+
                do {
+                       printf("Add ``%s <%s>'' to %s ? (y/n)\n",
+                                       name,
+                                       email,
+                                       datafile);
                        c = fgetc(in);
                        if(c == 'n' || c == 'N') {
                                fclose(in);

diff --git a/configure b/configure
index 6844deb472146aa60032d74e9fbadf1f3539d597..a32a6e2aeb3f5dcee7c509df854e95a55e6f1c1e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1605,7 +1605,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=abook
- VERSION=0.5.2pre
+ VERSION=0.5.2
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.in b/configure.in
index ecc32f0507b59b974d98a840cd8b3dd05675634e..1d6f598f81329cc8c10e3eb190d675ae99e0728d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.2pre)
+AM_INIT_AUTOMAKE(abook, 0.5.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

diff --git a/ui.c b/ui.c
index 3d7e01a8f7469ae640e014509808b1802a371167..aa49d48d5e23b6f92d002a91dc7ee267315dd09e 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -489,10 +489,12 @@ ui_clear_database()
 void
 ui_find(int next)
 {
-       int item;
+       int item = -1;
        static char findstr[MAX_FIELD_LEN];
        int search_fields[] = {NAME, EMAIL, NICK, -1};
 
+       clear_statusline();
+
        if(next) {
                if( !*findstr )
                        return;
@@ -504,12 +506,15 @@ ui_find(int next)
                refresh_screen();
        }
 
-       if( (item = find_item(findstr, curitem + !!next,
-                                       search_fields )) >= 0 ) {
+       if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0)
+               if((item = find_item(findstr, 0, search_fields)) >= 0)
+                       statusline_addstr(
+                               "Search hit bottom, continuing at top");
+
+       if(item >= 0) {
                curitem = item;
                refresh_list();
        }
-
 }