[gnome-keyring/dbus-api: 40/40] Merge branch 'master' into dbus-api

[Stefan Walter <stefw src gnome org>]

commit d31e4f0b4bfb79e0fd95767ff6fe165020b03aa0
Merge: d9d9544... 0275804...
Author: Stef Walter <stef memberwebs com>
Date:   Thu Jul 23 20:02:16 2009 +0000

    Merge branch 'master' into dbus-api
    
    Conflicts:
    	pkcs11/gck/gck-module.c
    	pkcs11/pkcs11g.h

 daemon/gkr-daemon-dbus.c            |    1 +
 daemon/gkr-daemon-ops.c             |    4 +-
 pkcs11/gck/gck-module.c             |  406 ++++++++++--------
 pkcs11/gck/gck-session.c            |   29 ++-
 pkcs11/gck/gck-session.h            |    7 +-
 pkcs11/pkcs11g.h                    |    5 +-
 pkcs11/pkcs11i.h                    |   57 +--
 pkcs11/plex-layer/gck-plex-layer.c  |   14 +-
 pkcs11/rpc-layer/gck-rpc-dispatch.c |   71 ++--
 pkcs11/ssh-store/gck-ssh-module.c   |    2 +
 po/es.po                            |  475 ++++++++++-----------
 po/et.po                            |  135 +++---
 po/sv.po                            |  804 +++++++++++++----------------------
 po/th.po                            |  465 ++++++++++-----------
 14 files changed, 1132 insertions(+), 1343 deletions(-)
---
diff --cc pkcs11/gck/gck-session.h
index 3e73780,08d8fba..eff78b1
--- a/pkcs11/gck/gck-session.h
+++ b/pkcs11/gck/gck-session.h
@@@ -58,13 -58,8 +58,10 @@@ typedef gboolean         (*GckAuthentic
  
  GType                    gck_session_get_type                           (void);
  
- GckSession*              gck_session_new                                (GckModule *module, 
-                                                                          GckManager *manager,
-                                                                          CK_SLOT_ID slot_id,
-                                                                          CK_FLAGS flags);
+ GckSession*              gck_session_for_session_object                 (GckObject *obj);
  
 +GckSession*              gck_session_for_session_object                 (GckObject *obj);
 +
  CK_SESSION_HANDLE        gck_session_get_handle                         (GckSession *self);
  
  CK_SLOT_ID               gck_session_get_slot_id                        (GckSession *self);