Fix whitespace in quicksearch bar

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8c332badbce374ec8b569ce4258e3722ea2d1a2b..73bf3feb15aa24fd21aa67f8b6ece5fe33fe6f73 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-02-28 [keith]     0.9.9claws36
+
+       * src/common/utils.c
+               Fix treatment of whitespace in quicksearch bar (leading
+               spaces and >1 space between commands and parameters).
+

 2004-02-27 [alfons]    0.9.9claws35
 
        * src/compose.[ch]
 2004-02-27 [alfons]    0.9.9claws35
 
        * src/compose.[ch]

diff --git a/configure.ac b/configure.ac
index df56e63f50fa7a708719cf0c87c44917d8384be2..58382375c140450a745526b8f125db250b50253c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=35
+EXTRA_VERSION=36

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/common/utils.c b/src/common/utils.c
index fbf4b149697067d9cc85a1ce76f3dee4b3913ecf..ecd067c1eab3ca20c6b2678939c677816490d1ad 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3523,11 +3523,12 @@ gchar *expand_search_string(const gchar *search_string)
                return copy_str;
 
        matcherstr = g_string_sized_new(16);
                return copy_str;
 
        matcherstr = g_string_sized_new(16);

-       cmd_start = cmd_end = copy_str;
-       while (cmd_end && *cmd_end) {
+       cmd_start = copy_str;
+       while (cmd_start && *cmd_start) {

                /* skip all white spaces */
                /* skip all white spaces */

-               while (*cmd_end && isspace((guchar)*cmd_end))
-                       cmd_end++;
+               while (*cmd_start && isspace((guchar)*cmd_start))
+                       cmd_start++;
+        cmd_end = cmd_start;

 
                /* extract a command */
                while (*cmd_end && !isspace((guchar)*cmd_end))
 
                /* extract a command */
                while (*cmd_end && !isspace((guchar)*cmd_end))


@@ -3573,7 +3574,8 @@ gchar *expand_search_string(const gchar *search_string)
                                        break;
 
                                /* extract a parameter, allow quotes */
                                        break;
 
                                /* extract a parameter, allow quotes */

-                               cmd_end++;
+                while (*cmd_end && isspace((guchar)*cmd_end))
+                             cmd_end++;

                                cmd_start = cmd_end;
                                if (*cmd_start == '"') {
                                        term_char = '"';
                                cmd_start = cmd_end;
                                if (*cmd_start == '"') {
                                        term_char = '"';


@@ -3586,9 +3588,6 @@ gchar *expand_search_string(const gchar *search_string)
                                while ((*cmd_end) && (*cmd_end != term_char))
                                        cmd_end++;
 
                                while ((*cmd_end) && (*cmd_end != term_char))
                                        cmd_end++;
 

-                               if (*cmd_end && (*cmd_end != term_char))
-                                       break;
-

                                if (*cmd_end == '"')
                                        cmd_end++;
 
                                if (*cmd_end == '"')
                                        cmd_end++;
 


@@ -3620,10 +3619,9 @@ gchar *expand_search_string(const gchar *search_string)
                        }
                }
 
                        }
                }
 

-               if (*cmd_end) {
+               if (*cmd_end)

                        cmd_end++;
                        cmd_end++;

-                       cmd_start = cmd_end;
-               }
+               cmd_start = cmd_end;

        }
 
        g_free(copy_str);
        }
 
        g_free(copy_str);