[gnome-keyring: 11/11] Merge branch 'gnome-3-0'

[Stefan Walter <stefw src gnome org>]

commit b6928fd48a08f380fae02d0d2ea39a361c697825
Merge: 8674d10 17ad20f
Author: Stef Walter <stefw collabora co uk>
Date:   Thu May 26 18:04:45 2011 +0200

    Merge branch 'gnome-3-0'
    
    Conflicts:
    	NEWS
    	configure.ac
    	docs/reference/gcr/Makefile.am
    	docs/reference/gcr/gcr-visual-index.xml
    	docs/reference/gcr/gcr-widgets.c
    	docs/reference/gcr/images/key-widget.png
    	gcr/Makefile.am

 NEWS                                 |    8 ++
 configure.ac                         |    4 +-
 daemon/dbus/gkd-secret-unlock.c      |   72 +++++++++++++++---
 egg/egg-unix-credentials.c           |    4 +
 gcr/Makefile.am                      |   15 +++-
 gcr/gcr-certificate-details-widget.h |    1 +
 gcr/gcr-library.c                    |    9 ++
 gcr/gcr-types.h                      |    8 ++
 gcr/libgcr.symbols                   |  139 ++++++++++++++++++++++++++++++++++
 9 files changed, 245 insertions(+), 15 deletions(-)
---
diff --cc NEWS
index 96bddbb,e5a6de2..909eaea
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,10 +1,22 @@@
 +Changes in version 3.1.1 are:
 + * Add 'Export Certificate' option to right click of certificate widget.
 + * Use file system linux capabilities for memory locking.
 + * Set correct daemon SELinux context when started from PAM module.
 + * Fix assertions in parser.
 + * Add GcrCollection interface to represent collections of objects.
 + * Add GcrGnupgCollection to libgcr.
 + * Implement functionality in renderers to populate GtkTreeModel
 + * Add a GcrSelector widget.
 + * Cleanup unregistering from session.
 + * Translations and translation fixes.
++
+ Changes in version 3.0.3 are:
+  * Build fixes on OpenBSD.
+  * Don't prompt multiple times for simultaneous unlocking of keyrings.
+ 
+ Changes in version 3.0.2 are:
+  * Add documentation images for gcr widgets.
+  * Translation fixes.
   * Build fixes.
  
  Changes in version 3.0.1 are:
diff --cc gcr/Makefile.am
index 8ccc601,368ab0a..7b67206
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -72,14 -65,11 +72,16 @@@ lib_LTLIBRARIES = libgcr GCR_VERSION_SU
  
  libgcr GCR_VERSION_SUFFIX@_la_SOURCES = \
  	gcr-certificate.c gcr-certificate.h \
+ 	gcr-certificate-basics-widget.h gcr-certificate-basics-widget.c \
  	gcr-certificate-chain.c gcr-certificate-chain.h \
+ 	gcr-certificate-details-widget.h gcr-certificate-details-widget.c \
  	gcr-certificate-renderer.c gcr-certificate-renderer.h \
 +	gcr-certificate-exporter.c gcr-certificate-exporter.h \
  	gcr-certificate-widget.c gcr-certificate-widget.h \
 +	gcr-collection.c gcr-collection.h \
 +	gcr-collection-model.c gcr-collection-model.h \
 +	gcr-combo-selector.c gcr-combo-selector.h \
 +	gcr-comparable.c gcr-comparable.h \
  	gcr-debug.c gcr-debug.h \
  	gcr-display-scrolled.c gcr-display-scrolled.h \
  	gcr-display-view.c gcr-display-view.h \
@@@ -147,6 -130,12 +149,13 @@@ pkgconfig_DATA = gcr-$(GCR_MAJOR).p
  gcr-$(GCR_MAJOR).pc: gcr.pc
  	cp gcr.pc gcr-$(GCR_MAJOR).pc
  
++
+ # ----------------------------------------------------------------
+ 
+ libgcr.symbols: .libs/libgcr GCR_VERSION_SUFFIX@.so
+ 	nm -D .libs/libgcr GCR_VERSION_SUFFIX@.so | grep -F ' T ' | \
+ 		cut -d ' ' -f 3 | sort > $@
+ 
  EXTRA_DIST = \
  	gcr.pc.in \
  	gcr-marshal.list \