[gnome-keyring: 2/2] Merge branch 'split-selector'

[Stefan Walter <stefw src gnome org>]

commit 2468d94afdd30afa9713abd8d35a36046aababe7
Merge: 1705a85 7b5e4e3
Author: Stef Walter <stefw collabora co uk>
Date:   Tue May 24 09:30:58 2011 +0200

    Merge branch 'split-selector'
    
    Conflicts:
    	gcr/Makefile.am
    	gcr/gcr-collection-model.c
    	gcr/gcr-tree-selector.c

 .gitignore                                         |    2 +
 docs/reference/gcr/Makefile.am                     |   10 +-
 docs/reference/gcr/gcr-docs.sgml                   |    4 +-
 docs/reference/gcr/gcr-sections.txt                |   60 +++--
 docs/reference/gcr/gcr-visual-index.xml            |    6 +
 docs/reference/gcr/gcr-widgets.c                   |   99 ++++++-
 docs/reference/gcr/images/combo-selector.png       |  Bin 0 -> 7855 bytes
 docs/reference/gcr/images/key-widget.png           |  Bin 8634 -> 8311 bytes
 docs/reference/gcr/images/tree-selector.png        |  Bin 0 -> 11930 bytes
 gcr/Makefile.am                                    |    6 +-
 gcr/gcr-certificate.c                              |    2 +-
 gcr/gcr-collection-model.c                         |   72 +++++-
 gcr/gcr-collection-model.h                         |    9 +-
 gcr/gcr-column.c                                   |    4 +-
 gcr/gcr-combo-selector.c                           |  272 +++++++++++++++++++
 gcr/gcr-combo-selector.h                           |   69 +++++
 gcr/gcr-selector.h                                 |   69 -----
 gcr/{gcr-selector.c => gcr-tree-selector.c}        |  276 ++++++-------------
 gcr/gcr-tree-selector.h                            |   70 +++++
 gcr/gcr.h                                          |    3 +-
 gcr/tests/Makefile.am                              |    5 +-
 .../{frob-selector.c => frob-combo-selector.c}     |   15 +-
 gcr/tests/frob-gnupg-selector.c                    |   14 +-
 .../{frob-selector.c => frob-tree-selector.c}      |   24 ++-
 24 files changed, 771 insertions(+), 320 deletions(-)
---
diff --cc gcr/Makefile.am
index d2e7206,183f0a2..fd30628
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -77,6 -78,8 +78,7 @@@ libgcr GCR_VERSION_SUFFIX@_la_SOURCES 
  	gcr-certificate-widget.c gcr-certificate-widget.h \
  	gcr-collection.c gcr-collection.h \
  	gcr-collection-model.c gcr-collection-model.h \
 -	gcr-colons.c gcr-colons.h \
+ 	gcr-combo-selector.c gcr-combo-selector.h \
  	gcr-debug.c gcr-debug.h \
  	gcr-display-scrolled.c gcr-display-scrolled.h \
  	gcr-comparable.c gcr-comparable.h \
@@@ -92,11 -95,10 +94,11 @@@
  	gcr-library.c gcr-library.h \
  	gcr-parser.c gcr-parser.h \
  	gcr-pkcs11-certificate.c gcr-pkcs11-certificate.h \
 +	gcr-record.c gcr-record.h \
  	gcr-renderer.c gcr-renderer.h \
- 	gcr-selector.c gcr-selector.h \
  	gcr-simple-certificate.c gcr-simple-certificate.h \
  	gcr-simple-collection.c gcr-simple-collection.h \
+ 	gcr-tree-selector.c gcr-tree-selector.h \
  	gcr-trust.c gcr-trust.h \
  	gcr-types.h \
  	gcr-unlock-options.h \
diff --cc gcr/gcr-collection-model.c
index c7d8886,d18611c..1192a37
--- a/gcr/gcr-collection-model.c
+++ b/gcr/gcr-collection-model.c
@@@ -93,6 -93,18 +93,12 @@@ G_DEFINE_TYPE_WITH_CODE (GcrCollectionM
  
  #define UNUSED_VALUE GINT_TO_POINTER (1)
  
+ static GHashTable*
+ selected_hash_table_new (void)
+ {
+ 	return g_hash_table_new (g_direct_hash, g_direct_equal);
+ }
+ 
 -static gboolean
 -column_id_is_valid_and_real (GcrCollectionModel *self, gint column_id)
 -{
 -	return (column_id >= 0 && column_id < self->pv->n_columns);
 -}
 -
  static gint
  on_sequence_compare (gconstpointer a, gconstpointer b, gpointer user_data)
  {