[gnome-keyring: 15/15] Merge branch 'ui-widgets'

[Stefan Walter <stefw src gnome org>]

commit 8236c4c064e667ee641ed3376820b198493e3878
Merge: 03f0af6 dc0799a
Author: Stef Walter <stef memberwebs com>
Date:   Tue Oct 5 22:05:22 2010 +0000

    Merge branch 'ui-widgets'

 docs/reference/gcr/gcr.types                       |    2 -
 gck/gck-attributes.c                               |   41 ++
 gck/gck.h                                          |    6 +
 gcr/Makefile.am                                    |   41 +-
 gcr/gcr-certificate-basics-widget.c                |  306 --------
 gcr/gcr-certificate-basics-widget.h                |   62 --
 gcr/gcr-certificate-basics-widget.ui               |  504 -------------
 gcr/gcr-certificate-details-widget.c               |  549 --------------
 gcr/gcr-certificate-details-widget.h               |   62 --
 gcr/gcr-certificate-renderer.c                     |  540 ++++++++++++++
 gcr/gcr-certificate-renderer.h                     |   67 ++
 gcr/gcr-certificate-widget.c                       |  200 ++++++
 gcr/gcr-certificate-widget.h                       |   67 ++
 gcr/gcr-display-view.c                             |  747 ++++++++++++++++++++
 gcr/gcr-display-view.h                             |   94 +++
 gcr/gcr-icons.c                                    |   85 +++
 gcr/gcr-icons.h                                    |   36 +
 gcr/gcr-importer.c                                 |  421 ++++--------
 gcr/gcr-importer.h                                 |   18 +-
 gcr/gcr-key-renderer.c                             |  342 +++++++++
 gcr/gcr-key-renderer.h                             |   62 ++
 gcr/gcr-key-widget.c                               |  174 +++++
 gcr/gcr-key-widget.h                               |   61 ++
 gcr/gcr-marshal.list                               |    1 +
 gcr/gcr-parser.c                                   |  302 ++++++++
 gcr/gcr-parser.h                                   |   16 +
 gcr/gcr-renderer.c                                 |  169 +++++
 gcr/gcr-renderer.h                                 |   73 ++
 gcr/gcr-simple-certificate.c                       |   71 +-
 gcr/gcr-simple-certificate.h                       |    3 +
 gcr/gcr-viewer.c                                   |   99 +++
 gcr/gcr-viewer.h                                   |   73 ++
 gcr/gcr.h                                          |    3 +-
 gcr/template/gcr-zzz.c                             |   59 ++
 gcr/template/gcr-zzz.h                             |   45 ++
 gcr/tests/.gitignore                               |    2 +
 gcr/tests/Makefile.am                              |   30 +-
 .../{ui-test-details.c => ui-test-certificate.c}   |   65 +-
 gcr/tests/{ui-test-details.c => ui-test-key.c}     |   64 +-
 gp11/gp11-attributes.c                             |   39 +
 gp11/gp11.h                                        |    7 +-
 po/POTFILES.in                                     |    4 +-
 po/sl.po                                           |    1 -
 tool/gkr-tool-import.c                             |   10 +-
 44 files changed, 3727 insertions(+), 1896 deletions(-)
---
diff --cc gcr/Makefile.am
index d056415,4ff99c9..3e40939
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@@ -60,14 -69,13 +69,14 @@@ libgcr GCR_VERSION_SUFFIX@_la_SOURCES 
  
  libgcr GCR_VERSION_SUFFIX@_la_CFLAGS = \
  	-DPKCS11_MODULE_PATH=\""$(libdir)/gnome-keyring/gnome-keyring-pkcs11.so"\" \
 +	-DGCK_API_SUBJECT_TO_CHANGE \
  	-DGCR_API_SUBJECT_TO_CHANGE \
  	-DUIDIR=\""$(uidir)"\"
-     
+ 
  libgcr GCR_VERSION_SUFFIX@_la_LDFLAGS = \
-     	-version-info $(GCR_LT_RELEASE) \
+ 	-version-info $(GCR_LT_RELEASE) \
  	-no-undefined -export-symbols-regex 'gcr_*'
-     
+ 
  libgcr GCR_VERSION_SUFFIX@_la_LIBADD = \
  	$(top_builddir)/egg/libegg.la \
  	$(top_builddir)/egg/libegg-entry-buffer.la \