Merge lp:~desrt/indicator-appmenu/no-search-tokens into lp:indicator-appmenu/0.4

[Allison Lortie]

hud-service: check for search with no tokens before searching

The search algorithm assumes that there will be at least one search
token, so be sure not to submit any searches with zero tokens. This can
happen if the user searches for " ", for example.

[Ted Gould (ted)]

review: Approve

=== modified file 'src/hudquery.c'
--- src/hudquery.c	2012-03-30 13:32:40 +0000
+++ src/hudquery.c	2012-04-04 14:22:19 +0000
@@ -107,7 +107,7 @@
 
   g_ptr_array_set_size (query->results, 0);
 
-  if (query->search_string[0] != '\0')
+  if (hud_token_list_get_length (query->token_list) != 0)
     hud_source_search (query->source, query->results, query->token_list);
 
   g_ptr_array_foreach (query->results, hud_query_find_max_usage, &max_usage);

=== modified file 'src/hudtoken.c'
--- src/hudtoken.c	2012-04-03 00:29:19 +0000
+++ src/hudtoken.c	2012-04-04 14:22:19 +0000
@@ -392,3 +392,9 @@
 
   return d[needle->length - 1][haystack->length - 1];
 }
+
+guint
+hud_token_list_get_length (HudTokenList *list)
+{
+  return list->length;
+}

=== modified file 'src/hudtoken.h'
--- src/hudtoken.h	2012-03-31 03:54:13 +0000
+++ src/hudtoken.h	2012-04-04 14:22:19 +0000
@@ -32,6 +32,7 @@
 
 HudTokenList *          hud_token_list_new_from_string                  (const gchar      *string);
 HudTokenList *          hud_token_list_new_from_string_list             (HudStringList    *string_list);
+guint                   hud_token_list_get_length                       (HudTokenList     *list);
 void                    hud_token_list_free                             (HudTokenList     *list);
 guint                   hud_token_list_distance                         (HudTokenList     *haystack,
                                                                          HudTokenList     *needle,