[gnome-keyring: 4/5] Merge branch 'list-selector'

[Stefan Walter <stefw src gnome org>]

commit d739f96614965c76cab67d1f5d25f25b1f4764ef
Merge: f2bfa48 73f773b
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Jul 18 09:58:53 2011 +0200

    Merge branch 'list-selector'

 docs/reference/gcr/Makefile.am              |    7 +-
 docs/reference/gcr/gcr-docs.sgml            |    1 +
 docs/reference/gcr/gcr-sections.txt         |   20 +
 docs/reference/gcr/gcr-visual-index.xml     |    3 +
 docs/reference/gcr/gcr-widgets.c            |   39 ++
 docs/reference/gcr/images/list-selector.png |  Bin 0 -> 10123 bytes
 gcr/Makefile.am                             |    3 +
 gcr/gcr-gnupg-key.c                         |    1 +
 gcr/gcr-list-selector-private.h             |   40 ++
 gcr/gcr-list-selector.c                     |  458 +++++++++++++++++++
 gcr/gcr-list-selector.h                     |   73 +++
 gcr/gcr-live-search.c                       |  651 +++++++++++++++++++++++++++
 gcr/gcr-live-search.h                       |   85 ++++
 gcr/gcr-marshal.list                        |    1 +
 gcr/gcr.h                                   |    1 +
 gcr/tests/frob-gnupg-selector.c             |   18 +-
 16 files changed, 1395 insertions(+), 6 deletions(-)
---
diff --cc gcr/gcr-gnupg-key.c
index 265a39d,613ddc9..a382c64
--- a/gcr/gcr-gnupg-key.c
+++ b/gcr/gcr-gnupg-key.c
@@@ -63,9 -63,6 +63,10 @@@ parse_user_id (const gchar *uid, gchar 
  	int in_email = 0;
  	int in_comment = 0;
  
 +	*name = NULL;
 +	*email = NULL;
 +	*comment = NULL;
++
  	x = tail = src = g_strdup (uid);
  
  	while (*src) {