[git] GPA - branch, master, updated. gpa-0.9.2-9-gecd21e4

by Werner Koch cvs at cvs.gnupg.org
Wed Aug 8 07:43:55 CEST 2012


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  ecd21e4d7b0bfc4fd035e0ebd5c86477a895d3c3 (commit)
       via  9bda7b1b80e23fd77393e9aa7857644f075b9621 (commit)
      from  25ed9419447071b8d1a3cde4f3b6691d013ebb2c (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 ecd21e4d7b0bfc4fd035e0ebd5c86477a895d3c3
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 8 06:12:56 2012 +0200

    Release 0.9.3

diff --git a/NEWS b/NEWS
index b878467..fb0d739 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Noteworthy changes in version 0.9.3 (2012-08-08)
+------------------------------------------------
+
+ * Allow searching in the keylist.
+
+ * Collected bug fixes.
+
+
 Noteworthy changes in version 0.9.2 (2012-05-02)
 ------------------------------------------------
 
diff --git a/README b/README
index 49165ee..1aec096 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
         ******************************************************
               Welcome to GPA, the GNU Privacy Assistant!
-                            Version 0.9.2
+                            Version 0.9
         ******************************************************
 
 GPA is a graphical frontend for the GNU Privacy Guard (GnuPG,
diff --git a/THANKS b/THANKS
index 171437b..3a6b838 100644
--- a/THANKS
+++ b/THANKS
@@ -1,35 +1,36 @@
-GPA was originally written by Markus Gerwinski. The included GPAPA library
-is due to Peter Gerwinski. Other people contributed by reporting problems,
-suggesting various improvements or submitting actual code. Here is a list
-of those people. Help us keep it complete and free of errors. See the
-file AUTHORS for the current maintainer.
+GPA was originally written by Markus Gerwinski.  Other people
+contributed by reporting problems, suggesting various improvements or
+submitting actual code.  Here is a list of those people.  Help us keep
+it complete and free of errors.  See the file AUTHORS for the current
+maintainer.
 
-Andreas Rönnquist       mailinglists at gusnan.se
-Beate Esser             begrafik at aol.com
-Benedikt Wildenhain     mail at benedikt-wildenhain.de
-Bernhard Herzog         bh at intevation.de
-Clive Lin               clive at CirX.ORG
-Jan-Oliver Wagner       jan at intevation.de
-Markus Gerwinski	markus at gnu.de
-Michael Mauch           michael.mauch at gmx.de
-Michael Roth		mroth at nessie.de
-Miguel Coca             mcoca at gnu.org
-Peter Gerwinski 	peter.gerwinski at g-n-u.de
-Peter Hanecak           hanecak at megaloman.sk
-Peter Neuhaus		pneuhaus at openit.de
-Richard Becker		becker at it-fabrik.de
-Shell Hung              shell at linux.org.hk
-Timo Schulz             ts at winpt.org
-Werner Koch		wk at gnupg.org
-Francis J. A. Pinteric  linuxdoctor at linux.ca
-Michael Anckaert	xantor at linux.be
-Steffen Michalek	steffen at michalek.de
-Mick Ohrberg            Mick.Ohrberg at umb.com
-TAKAHASHI Tamotsu       tamo at momonga-linux.org
-wwp                     chabredier.tristan at free.fr
+Andreas Rönnquist       gusnan at gusnan.se
+Beate Esser             begrafik at aol.com
+Benedikt Wildenhain     mail at benedikt-wildenhain.de
+Bernhard Herzog         bh at intevation.de
+Clive Lin               clive at CirX.ORG
+Jan-Oliver Wagner       jan at intevation.de
+Markus Gerwinski	markus at gnu.de
+Michael Mauch           michael.mauch at gmx.de
+Michael Roth		mroth at nessie.de
+Miguel Coca             mcoca at gnu.org
+Peter Gerwinski 	peter.gerwinski at g-n-u.de
+Peter Hanecak           hanecak at megaloman.sk
+Peter Neuhaus		pneuhaus at openit.de
+Richard Becker		becker at it-fabrik.de
+Shell Hung              shell at linux.org.hk
+Timo Schulz             ts at winpt.org
+Werner Koch		wk at gnupg.org
+Francis J. A. Pinteric  linuxdoctor at linux.ca
+Michael Anckaert	xantor at linux.be
+Steffen Michalek	steffen at michalek.de
+Mick Ohrberg            Mick.Ohrberg at umb.com
+TAKAHASHI Tamotsu       tamo at momonga-linux.org
+wwp                     chabredier.tristan at free.fr
 
 
-Thanks to Michael Roth for his PGG project which heavily influenced GPAPA.
+Thanks to Michael Roth for his PGG project which heavily influenced
+the formerly used GPAPA.
 
 The development of this software has partly been funded by the German
 Ministry for Economics and Technology under grant VIB3-68553.168-001/1999.
diff --git a/configure.ac b/configure.ac
index 778b1ee..8a72808 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh --force" right before creating a distribution.
-m4_define(my_version, [0.9.2])
+m4_define(my_version, [0.9.3])
 m4_define(my_issvn, no)
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \

commit 9bda7b1b80e23fd77393e9aa7857644f075b9621
Author: Andreas Rönnquist <gusnan at gusnan.se>
Date:   Tue Aug 7 21:53:29 2012 +0200

    Make keylist search search both key and name

diff --git a/src/keylist.c b/src/keylist.c
index c1107b2..51cf401 100644
--- a/src/keylist.c
+++ b/src/keylist.c
@@ -551,6 +551,33 @@ gpa_keylist_clear_columns (GpaKeyList *keylist)
 }
 
 
+gboolean
+search_keylist_function (GtkTreeModel *model, gint 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,
+                      GPA_KEYLIST_COLUMN_KEYID, &key_id,
+                      GPA_KEYLIST_COLUMN_USERID, &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
 setup_columns (GpaKeyList *keylist, gboolean detailed)
 {
@@ -648,7 +675,9 @@ setup_columns (GpaKeyList *keylist, gboolean detailed)
   gtk_tree_view_column_set_sort_column_id (column, GPA_KEYLIST_COLUMN_USERID);
   gtk_tree_view_column_set_sort_indicator (column, TRUE);
 
-  gtk_tree_view_set_search_column(GTK_TREE_VIEW(keylist),GPA_KEYLIST_COLUMN_USERID);
+  gtk_tree_view_set_enable_search (GTK_TREE_VIEW(keylist), TRUE);
+  gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW(keylist),
+                                       search_keylist_function, NULL, NULL);
 }
 
 

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

Summary of changes:
 NEWS          |    8 +++++++
 README        |    2 +-
 THANKS        |   59 +++++++++++++++++++++++++++++----------------------------
 configure.ac  |    2 +-
 src/keylist.c |   31 +++++++++++++++++++++++++++++-
 5 files changed, 70 insertions(+), 32 deletions(-)


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




More information about the Gnupg-commits mailing list