aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorDevashish Sharma <dsharma@src.gnome.org>2006-07-27 20:08:44 +0800
committerDevashish Sharma <dsharma@src.gnome.org>2006-07-27 20:08:44 +0800
commit1a524f005e53d0edc533e4e032712b5f75730606 (patch)
tree67cdca4b215932e7f4fe88c56a6c1301d61c6762 /addressbook
parentfb5c6d99892507a5ebb6140ec6d880d402dd06c6 (diff)
downloadgsoc2013-evolution-1a524f005e53d0edc533e4e032712b5f75730606.tar.gz
gsoc2013-evolution-1a524f005e53d0edc533e4e032712b5f75730606.tar.zst
gsoc2013-evolution-1a524f005e53d0edc533e4e032712b5f75730606.zip
Assign proper search item ids in addressbook search.
svn path=/trunk/; revision=32427
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 49f30f4720..66df83b9eb 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1524,9 +1524,9 @@ search_activated (ESearchBar *esb, EABView *v)
/* Merge view and sexp */
subid = e_search_bar_get_viewitem_id (esb);
- if (subid != G_MAXINT) {
+ if (subid) {
master_list = get_master_list ();
- category_name = g_list_nth_data (master_list, subid);
+ category_name = g_list_nth_data (master_list, subid-1);
view_sexp = g_strdup_printf ("(is \"category_list\" \"%s\")", category_name);
search_query = g_strconcat ("(and ", view_sexp, search_query, ")", NULL);
g_free (view_sexp);
@@ -1562,7 +1562,6 @@ query_changed (ESearchBar *esb, EABView *view)
search_type = e_search_bar_get_item_id(esb);
if (search_type == E_FILTERBAR_ADVANCED_ID) {
g_object_get (esb, "query", &query, NULL);
- printf ("e-addresbook-view.c : query_changed : query = %s\n",query);
g_object_set (view, "query", query, NULL);
g_free (query);
}
@@ -1599,12 +1598,12 @@ make_suboptions (EABView *view)
N = g_list_length (master_list);
subitems = g_new (ESearchBarItem, N+2);
- subitems[0].id = G_MAXINT;
+ subitems[0].id = 0;
subitems[0].text = g_strdup (_("Any Category"));
for (i=0; i<N; ++i) {
const char *category = g_list_nth_data (master_list, i);
- subitems[i+1].id = i;
+ subitems[i+1].id = i+1;
subitems[i+1].text = g_strdup (category);
}