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

[Stefan Walter <stefw src gnome org>]

commit 85ccdcfe3ca4b6b01e446b76760e2e038fd30b2f
Merge: a1b0215... 0fa6f05...
Author: Stef Walter <stef memberwebs com>
Date:   Sun Aug 30 14:13:45 2009 +0000

    Merge branch 'master' into dbus-api

 configure.in                                 |    3 +-
 daemon/gkr-daemon.c                          |  163 +++-
 daemon/gkr-daemon.h                          |    2 +-
 daemon/pkcs11/gkr-pkcs11-daemon.c            |   43 +-
 daemon/pkcs11/gkr-pkcs11-daemon.h            |    4 +-
 daemon/util/gkr-location.c                   |    6 +-
 egg/Makefile.am                              |    1 -
 egg/egg-unix-signal.c                        |  230 -----
 egg/egg-unix-signal.h                        |   34 -
 egg/tests/Makefile.am                        |    1 -
 egg/tests/unit-test-signal.c                 |  114 ---
 pkcs11/rpc-layer/gck-rpc-daemon-standalone.c |    6 +-
 pkcs11/rpc-layer/gck-rpc-dispatch.c          |   68 ++-
 pkcs11/rpc-layer/gck-rpc-layer.h             |   11 +-
 pkcs11/ssh-agent/gck-ssh-agent-private.h     |    2 +-
 pkcs11/ssh-agent/gck-ssh-agent-standalone.c  |   16 +-
 pkcs11/ssh-agent/gck-ssh-agent.c             |  165 ++--
 pkcs11/ssh-agent/gck-ssh-agent.h             |    6 +-
 po/POTFILES.in                               |    4 +-
 po/bn_IN.po                                  |  252 +++---
 po/eu.po                                     |  426 +++++-----
 po/fr.po                                     |  521 +++++-------
 po/ga.po                                     |   35 +-
 po/gu.po                                     |  221 ++----
 po/ko.po                                     |  521 ++++++------
 po/pl.po                                     |  513 +++++------
 po/sr.po                                     | 1226 +++++++++++++++++++++++---
 po/sr latin po                               | 1226 +++++++++++++++++++++++---
 po/tr.po                                     |  220 +++---
 29 files changed, 3773 insertions(+), 2267 deletions(-)
---
diff --cc daemon/gkr-daemon.c
index 25fa6e0,c63081e..e05d09d
--- a/daemon/gkr-daemon.c
+++ b/daemon/gkr-daemon.c
@@@ -630,19 -699,27 +701,28 @@@ gkr_daemon_startup_steps (void
  			return FALSE;
  	}
  #endif
- 	
+ 
  	if (check_run_component ("pkcs11")) {
- 		if (!gkr_pkcs11_daemon_setup_pkcs11 ())
+ 		if (!gkr_pkcs11_daemon_startup_pkcs11 ())
  			return FALSE;
  	}
- 	
- 	gkd_dbus_setup ();
- 	
+ 
 +	initialization_completed = TRUE;
  	return TRUE;
  }
  
- gboolean
+ static gboolean
+ gkr_daemon_initialize_steps (void)
+ {
+ 	/* Initialize new style PKCS#11 components */
+ 	if (!gkr_pkcs11_daemon_initialize ())
+ 		return FALSE;
+ 
 -	gkr_daemon_dbus_initialize ();
++	gkd_dbus_setup ();
+ 	return TRUE;
+ }
+ 
+ void
  gkr_daemon_complete_initialization (void)
  {
  	/*
diff --cc daemon/pkcs11/gkr-pkcs11-daemon.c
index b7f0e25,4f36d5e..e05d76d
--- a/daemon/pkcs11/gkr-pkcs11-daemon.c
+++ b/daemon/pkcs11/gkr-pkcs11-daemon.c
@@@ -75,10 -76,10 +77,11 @@@ gboolea
  gkr_pkcs11_daemon_initialize (void)
  {
  	CK_FUNCTION_LIST_PTR plex_layer;
 -	CK_FUNCTION_LIST_PTR roots_store; 
 +	CK_FUNCTION_LIST_PTR roots_store;
 +	CK_FUNCTION_LIST_PTR secret_store;
  	CK_FUNCTION_LIST_PTR ssh_store;
  	CK_FUNCTION_LIST_PTR user_store;
+ 	gboolean ret;
  	CK_RV rv;
  
  	/* Now initialize them all */
diff --cc daemon/pkcs11/gkr-pkcs11-daemon.h
index 4790734,d41bc78..52659e8
--- a/daemon/pkcs11/gkr-pkcs11-daemon.h
+++ b/daemon/pkcs11/gkr-pkcs11-daemon.h
@@@ -24,14 -24,10 +24,14 @@@
  
  #include <glib.h>
  
 +#include "pkcs11/pkcs11.h"
 +
  gboolean      gkr_pkcs11_daemon_initialize       (void);
  
- gboolean      gkr_pkcs11_daemon_setup_pkcs11     (void);
+ gboolean      gkr_pkcs11_daemon_startup_pkcs11   (void);
  
- gboolean      gkr_pkcs11_daemon_setup_ssh        (void);
+ gboolean      gkr_pkcs11_daemon_startup_ssh      (void);
  
 +CK_FUNCTION_LIST_PTR   gkr_pkcs11_daemon_get_functions    (void);
 +
  #endif /* GKRPKCS11DAEMON_H_ */