diff options
| author | John Sullivan <sullivan@src.gnome.org> | 2001-03-09 22:29:17 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2001-03-09 22:29:17 +0000 |
| commit | ed656a7bd8dc2c57273b49f90fec0d50f84d8d6a (patch) | |
| tree | 69348c7fd5cd5e88db1c221eaabd8409d568fd1a | |
| parent | eebc2ccebaa53dde67eccc61ced668aee23e6b6d (diff) | |
| download | nautilus-ed656a7bd8dc2c57273b49f90fec0d50f84d8d6a.tar.gz | |
Merge from HEAD:
reviewed by: Rebecca Schulman <rebecka@eazel.com>
reviewed by: Darin Adler <darin@eazel.com>
Fixed bug 7615 (searching for " " crashes)
* src/nautilus-simple-search-bar.c:
(nautilus_simple_search_criteria_to_search_uri):
Change code that counts characters in search URI
to use the same math as the code that appends
to string.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | src/nautilus-simple-search-bar.c | 2 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,18 @@ +2001-03-09 John Sullivan <sullivan@eazel.com> + + Merge from HEAD: + + reviewed by: Rebecca Schulman <rebecka@eazel.com> + reviewed by: Darin Adler <darin@eazel.com> + + Fixed bug 7615 (searching for " " crashes) + + * src/nautilus-simple-search-bar.c: + (nautilus_simple_search_criteria_to_search_uri): + Change code that counts characters in search URI + to use the same math as the code that appends + to string. + 2001-03-09 Ramiro Estrugo <ramiro@eazel.com> Merge from HEAD: diff --git a/src/nautilus-simple-search-bar.c b/src/nautilus-simple-search-bar.c index 0ee64a313..eef7d95fe 100644 --- a/src/nautilus-simple-search-bar.c +++ b/src/nautilus-simple-search-bar.c @@ -228,7 +228,7 @@ nautilus_simple_search_criteria_to_search_uri (const char *search_criteria) length = strlen ("[file:///]"); /* Count total length */ for (i = 0; words[i] != NULL; i++) { - length += strlen (words[i]) + strlen (NAUTILUS_SEARCH_URI_TEXT_NAME) + strlen (" contains & "); + length += strlen (NAUTILUS_SEARCH_URI_TEXT_NAME) + strlen (" contains ") + strlen (words[i]) + strlen (" & "); } fragment = g_new0 (char, length + 1); /* FIXME bugzilla.eazel.com 2513: this should eventually be: sprintf (fragment, "[file%%3A%%2F%%2F%%2F]"); */ |