commit ade50dce2dc18c27d81e0dc5de35748dd308ae81
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-25

    Release version 3.5.3
    
     * And fix some tests

 Makefile.am                                     |    3 +++
 NEWS                                            |    7 +++++++
 configure.ac                                    |    4 ++--
 pkcs11/gnome2-store/tests/test-gnome2-storage.c |    3 +--
 4 files changed, 13 insertions(+), 4 deletions(-)

commit fb145b5e7913f645fbd9bc112c78ba8bfd37774a
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date:   2012-06-21

    Assamese translation reviewed

 po/as.po |  297 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 149 insertions(+), 148 deletions(-)

commit 7cbb87873a10b2adc97bcbf1e3eb4962adf6f8fc
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-19

    gnome2-store: Test the gnome2-store with the gcr importer

 pkcs11/gkm/gkm-module.c                         |    3 -
 pkcs11/gkm/gkm-module.h                         |    3 +
 pkcs11/gnome2-store/tests/Makefile.am           |    6 +-
 pkcs11/gnome2-store/tests/files/personal.p12    |  Bin 0 -> 3396 bytes
 pkcs11/gnome2-store/tests/test-gnome2-storage.c |    1 +
 pkcs11/gnome2-store/tests/test-import.c         |  200 +++++++++++++++++++++++
 6 files changed, 209 insertions(+), 4 deletions(-)

commit 45e76a5fdd139e05308817e75936d8a7dc5e0d84
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-19

    gkm: Add debug tracing for CKA_ATTRIBUTE_TYPE_INVALID
    
    To make it a bit easier to diagnose problems.

 pkcs11/gkm/gkm-assertion.c               |    6 +++++-
 pkcs11/gkm/gkm-debug.c                   |    1 +
 pkcs11/gkm/gkm-debug.h                   |    1 +
 pkcs11/gkm/gkm-dh-private-key.c          |    3 +++
 pkcs11/gkm/gkm-dh-public-key.c           |    3 +++
 pkcs11/gkm/gkm-memory-store.c            |   11 +++++++++--
 pkcs11/gkm/gkm-object.c                  |    4 ++++
 pkcs11/gkm/gkm-private-xsa-key.c         |    3 +++
 pkcs11/gkm/gkm-public-xsa-key.c          |    4 ++++
 pkcs11/gkm/gkm-secret-key.c              |    6 ++++++
 pkcs11/gkm/gkm-sexp-key.c                |    4 ++++
 pkcs11/gkm/gkm-store.c                   |   25 ++++++++++++++++++++-----
 pkcs11/gnome2-store/gkm-gnome2-storage.c |    6 +++++-
 pkcs11/ssh-store/gkm-ssh-private-key.c   |    7 ++++++-
 pkcs11/xdg-store/gkm-xdg-trust.c         |   22 ++++++++++++++++++----
 15 files changed, 92 insertions(+), 14 deletions(-)

commit 75df449520f2ca8acd38af51b0520a70b0c3b754
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-19

    gkm: Add gkm_log_xxx() functions for stringizing
    
    Move gkm_util_rv_xxx() to gkm_log_rv() and add gkm_log_attr_type()

 pkcs11/gkm/Makefile.am              |    1 +
 pkcs11/gkm/gkm-debug.h              |    2 +
 pkcs11/gkm/gkm-log.c                |  291 +++++++++++++++++++++++++++++++++++
 pkcs11/gkm/gkm-log.h                |   33 ++++
 pkcs11/gkm/gkm-test.c               |   10 +-
 pkcs11/gkm/gkm-trust.c              |    4 +-
 pkcs11/gkm/gkm-util.c               |  120 ---------------
 pkcs11/gkm/gkm-util.h               |    4 -
 pkcs11/wrap-layer/gkm-wrap-login.c  |   11 +-
 pkcs11/wrap-layer/gkm-wrap-prompt.c |   17 +-
 10 files changed, 349 insertions(+), 144 deletions(-)

commit 6f97ecf2773281fa2b4d38301f27d27bf6e26d0c
Merge: 425394b c53bb44
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-19

    Merge branch 'gnome-3-4'

commit c53bb448d90e290d6b208090a285d1f4070b5ce9
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-19

    gnome2-store: Ignore attributes that gcr-viewer sets
    
    We don't yet support all the attributes correctly, but try
    to not error out in gnome2-store for the ones that gcr-viewer
    sets.

 pkcs11/gkm/gkm-certificate.c                 |    6 ++++--
 pkcs11/gnome2-store/gkm-gnome2-private-key.c |    5 +++++
 pkcs11/gnome2-store/gkm-gnome2-storage.c     |    9 +++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

commit 425394b296ecb3fe67e917ce2c048e45b6fb80ab
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-19

    gkm: Fix GKM_DEBUG environment variable for G_MESSAGES_DEBUG
    
    G_MESSAGES_DEBUG is a new environment variable that glib expects
    without which no debug messages are displayed. Since we also have
    GKM_DEBUG we reconcile the two environment variables

 pkcs11/gkm/Makefile.am |    1 +
 pkcs11/gkm/gkm-debug.c |   65 ++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 56 insertions(+), 10 deletions(-)

commit ef59eb3a8e4fa732d3dc8a40b07cb75c638d85e5
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-19

    ssh-store: Don't include built p11-tests.conf file

 pkcs11/ssh-store/tests/p11-tests.conf |    3 ---
 1 file changed, 3 deletions(-)

commit a48dbad7c177e8243b6988ca34d01422f20d3104
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-19

    xdg-store: Remove references to libtasn1.h
    
    No longer necessary, and creates a false build dependency
    on the libtasn1 headers

 pkcs11/xdg-store/gkm-xdg-trust.c         |    2 --
 pkcs11/xdg-store/tests/dump-trust-file.c |    1 -
 pkcs11/xdg-store/tests/frob-trust-file.c |    1 -
 3 files changed, 4 deletions(-)

commit 48ea8d67edcbf9d2bf3b825a334c175df2bf22b1
Author: Stef Walter <stefw@gnome.org>
Date:   2012-06-04

    daemon: Return correct introspect data for secret service

 daemon/dbus/gkd-secret-service.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5dccbe88eb94eea9934e2b7c83e818bd21be4fd2
Author: Raul Gutierrez Segales <rgs@itevenworks.net>
Date:   2012-05-13

    Use the right introspection string for Secret.Service iface
    
    We were passing the wrong data parameter to gkd_dbus_introspect_handle
    and displaying the wrong interface information in d-feet.

 daemon/dbus/gkd-secret-service.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 113a95948a072616e0caef1298997fb5bbb40282
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   2012-05-02

    Updated Slovenian translation

 po/sl.po |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit 5281df9fceb0c0eaecaf85cde9ca26adb55c92e3
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:   2012-05-02

    Updated Greek translation

 po/el.po |  383 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 233 insertions(+), 150 deletions(-)

commit b6bb4b9ca987fefa153fb73a7816316cf5bc122a
Author: Justin Lecher <jlec@gentoo.org>
Date:   2012-04-30

    Typo GMODULE -> GLIB in AC_SUBST
    
    It seems that during the code duplication the actual substition call
    wasn't changed to GMODULE.
    
    Signed-off-by: Justin Lecher <jlec@gentoo.org>

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 24b830e00c015bdeeab74491b4b0e4b66eddd97d
Author: Justin Lecher <jlec@gentoo.org>
Date:   2012-04-30

    Typo GMODULE -> GLIB in AC_SUBST
    
    It seems that during the code duplication the actual substition call
    wasn't changed to GMODULE.
    
    Signed-off-by: Justin Lecher <jlec@gentoo.org>

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 1bbdac506bf39814374e3c8f964faebfe5058920
Author: Stef Walter <stefw@gnome.org>
Date:   2012-04-30

    Change password dbus method is actually on internal interface
    
     * But leave the one on the secret service interface since
       that's what libgnome-keyring erroneously uses.

 daemon/dbus/gkd-secret-service.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit addc10ba520fe44f03c309687ca9d106eeb9d662
Author: Stef Walter <stefw@gnome.org>
Date:   2012-04-16

    Bump version number

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3dbb05de1942561c142a9333cde07abc9d94da0b
Merge: 223e914 7dc9217
Author: Stef Walter <stefw@gnome.org>
Date:   2012-04-16

    Merge branch 'gnome-3-4'