[git] GPA - branch, master, updated. gpa-0.9.3-2-g29fc35b

[by Andreas Rönnquist]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".

The branch, master has been updated
       via  29fc35bedb2aff64453e817903f8951ac8663a65 (commit)
      from  1d898c4c941afb4355416c61a26e81baedf1df17 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 29fc35bedb2aff64453e817903f8951ac8663a65
Author: Andreas Rönnquist <gusnan at gusnan.se>
Date:   Wed Oct 24 17:18:54 2012 +0200

    Make siglist search both key and name
    
    * siglist.c (search_siglist_function): New.
    (gpa_siglist_new): Enable searching via the new function.

diff --git a/src/siglist.c b/src/siglist.c
index 1a66387..5e6cf9b 100644
--- a/src/siglist.c
+++ b/src/siglist.c
@@ -41,6 +41,32 @@ typedef enum
   SIG_N_COLUMNS
 } SignatureListColumn;
 
+gboolean
+search_siglist_function (GtkTreeModel *model, int column,
+                         const gchar *key_to_search_for, GtkTreeIter *iter,
+                         gpointer search_data)
+{
+  gboolean result=TRUE;
+  gchar *key_id, *user_id;
+  gint search_len;
+
+  gtk_tree_model_get (model, iter,
+                     SIG_KEYID_COLUMN, &key_id,
+                     SIG_USERID_COLUMN, &user_id, -1);
+
+  search_len = strlen (key_to_search_for);
+
+  if (!g_ascii_strncasecmp (key_id, key_to_search_for, search_len))
+	result=FALSE;
+  if (!g_ascii_strncasecmp (user_id, key_to_search_for, search_len))
+	result=FALSE;
+
+  g_free (key_id);
+  g_free (user_id);
+
+  return result;
+}
+
 static void
 gpa_siglist_ui_mode_changed_cb (GpaOptions *options, GtkWidget *list);
 
@@ -61,6 +87,10 @@ gpa_siglist_new (void)
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
                                         SIG_USERID_COLUMN, GTK_SORT_ASCENDING);
 
+  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (list), TRUE);
+  gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (list),
+                                       search_siglist_function, NULL, NULL);
+
   g_signal_connect (G_OBJECT (gpa_options_get_instance ()),
 		    "changed_ui_mode",
                     G_CALLBACK (gpa_siglist_ui_mode_changed_cb), list);

-----------------------------------------------------------------------

Summary of changes:
 src/siglist.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Assistant
http://git.gnupg.org