gnome-keyring r1423 - trunk/daemon/pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Jan  4 21:38:10 2009
New Revision: 1423
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1423&view=rev

Log:
	* daemon/pkcs11/gkr-pkcs11-dispatch.c: (moved from gkr-pkcs11-daemon.c)
	* daemon/pkcs11/gkr-pkcs11-dispatch.h: (moved from gkr-pkcs11-daemon.h)
	* daemon/pkcs11/gkr-pkcs11-dispatch-session.c: (moved from gkr-pkcs11-daemon-session.c)
	* daemon/pkcs11/Makefile.am: Move old PKCS#11 code out of the way (but still functiontal)


Added:
   trunk/daemon/pkcs11/gkr-pkcs11-dispatch-session.c   (contents, props changed)
      - copied, changed from r1416, /trunk/daemon/pkcs11/gkr-pkcs11-daemon-session.c
   trunk/daemon/pkcs11/gkr-pkcs11-dispatch.c   (contents, props changed)
      - copied, changed from r1409, /trunk/daemon/pkcs11/gkr-pkcs11-daemon.c
   trunk/daemon/pkcs11/gkr-pkcs11-dispatch.h   (contents, props changed)
      - copied, changed from r1409, /trunk/daemon/pkcs11/gkr-pkcs11-daemon.h
Modified:
   trunk/daemon/pkcs11/Makefile.am

Modified: trunk/daemon/pkcs11/Makefile.am
==============================================================================
--- trunk/daemon/pkcs11/Makefile.am	(original)
+++ trunk/daemon/pkcs11/Makefile.am	Sun Jan  4 21:38:10 2009
@@ -8,8 +8,8 @@
 	$(GLIB_CFLAGS)
 
 DAEMON_SRCS = \
-	gkr-pkcs11-daemon.c gkr-pkcs11-daemon.h \
-	gkr-pkcs11-daemon-session.c \
+	gkr-pkcs11-dispatch.c gkr-pkcs11-daemon.h \
+	gkr-pkcs11-dispatch-session.c \
 	gkr-pkcs11-dsa.c gkr-pkcs11-dsa.h \
 	$(top_srcdir)/pkcs11/gkr-pkcs11-message.c \
 	gkr-pkcs11-rsa.c gkr-pkcs11-rsa.h

Copied: trunk/daemon/pkcs11/gkr-pkcs11-dispatch-session.c (from r1416, /trunk/daemon/pkcs11/gkr-pkcs11-daemon-session.c)
==============================================================================
--- /trunk/daemon/pkcs11/gkr-pkcs11-daemon-session.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-dispatch-session.c	Sun Jan  4 21:38:10 2009
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* gkr-pkcs11-daemon-session.c - PKCS#11 session in daemon
+/* gkr-pkcs11-dispatch-session.c - PKCS#11 session in daemon
 
    Copyright (C) 2007, Stefan Walter
 
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include "gkr-pkcs11-daemon.h"
+#include "gkr-pkcs11-dispatch.h"
 #include "gkr-pkcs11-dsa.h"
 #include "gkr-pkcs11-rsa.h"
 
@@ -1569,7 +1569,7 @@
 }
 
 gpointer
-gkr_pkcs11_daemon_session_thread (gpointer user_data)
+gkr_pkcs11_dispatch_session_thread (gpointer user_data)
 {
 	SessionInfo *sinfo;
 	GkrPkcs11Message *req, *resp;

Copied: trunk/daemon/pkcs11/gkr-pkcs11-dispatch.c (from r1409, /trunk/daemon/pkcs11/gkr-pkcs11-daemon.c)
==============================================================================
--- /trunk/daemon/pkcs11/gkr-pkcs11-daemon.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-dispatch.c	Sun Jan  4 21:38:10 2009
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* gkr-pkcs11-daemon.c - main connection/thread handling
+/* gkr-pkcs11-dispatch.c - main connection/thread handling
 
    Copyright (C) 2007, Nate Nielsen
 
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include "gkr-pkcs11-daemon.h"
+#include "gkr-pkcs11-dispatch.h"
 
 #include "common/gkr-async.h"
 #include "common/gkr-cleanup.h"
@@ -61,7 +61,7 @@
 }
 
 /* -----------------------------------------------------------------------------
- * PKCS#11 DAEMON 
+ * PKCS#11 DISPATCH 
  */
 
 /* The socket path on which we're listening */
@@ -119,7 +119,7 @@
 	}
 	
 	/* And create a new thread */
-	worker = gkr_async_worker_start (gkr_pkcs11_daemon_session_thread, 
+	worker = gkr_async_worker_start (gkr_pkcs11_dispatch_session_thread, 
 	                                 completed_connection, GINT_TO_POINTER (new_fd));
 	if (!worker) {
 		g_warning ("couldn't create new connection session thread");
@@ -133,7 +133,7 @@
 }
 
 static void 
-pkcs11_daemon_cleanup (gpointer unused)
+pkcs11_dispatch_cleanup (gpointer unused)
 {
 	if (pkcs11_socket_channel)
 		g_io_channel_unref (pkcs11_socket_channel);
@@ -161,7 +161,7 @@
 }
 
 gboolean
-gkr_pkcs11_daemon_setup (void)
+gkr_pkcs11_dispatch_setup (void)
 {
 	struct sockaddr_un addr;
 	const gchar *tmp_dir;
@@ -176,7 +176,7 @@
 	g_assert (pkcs11_socket_fd == -1);
 	g_assert (!pkcs11_socket_channel);
 	
-	gkr_cleanup_register (pkcs11_daemon_cleanup, NULL);
+	gkr_cleanup_register (pkcs11_dispatch_cleanup, NULL);
 	
 	tmp_dir = gkr_daemon_util_get_master_directory ();
 	g_return_val_if_fail (tmp_dir, FALSE);

Copied: trunk/daemon/pkcs11/gkr-pkcs11-dispatch.h (from r1409, /trunk/daemon/pkcs11/gkr-pkcs11-daemon.h)
==============================================================================
--- /trunk/daemon/pkcs11/gkr-pkcs11-daemon.h	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-dispatch.h	Sun Jan  4 21:38:10 2009
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* gkr-pkcs11-daemon.h - entry points for daemon PKCS#11 functionality
+/* gkr-pkcs11-dispatch.h - entry points for daemon PKCS#11 functionality
 
    Copyright (C) 2007, Nate Nielsen
 
@@ -21,19 +21,19 @@
    Author: Nate Nielsen <nielsen memberwebs com>
 */
 
-#ifndef __GKR_PKCS11_DAEMON_H__
-#define __GKR_PKCS11_DAEMON_H__
+#ifndef __GKR_PKCS11_DISPATCH_H__
+#define __GKR_PKCS11_DISPATCH_H__
 
 /* -----------------------------------------------------------------------------
  * GENERAL FUNCTIONS 
  */
  
-gboolean        gkr_pkcs11_daemon_setup               (void);
+gboolean        gkr_pkcs11_dispatch_setup               (void);
 
 /* -----------------------------------------------------------------------------
- * Used by gkr-pkcs11-daemon.c and gkr-pkcs11-daemon-session.c 
+ * Used by gkr-pkcs11-dispatch.c and gkr-pkcs11-dispatch-session.c 
  */
 
-gpointer        gkr_pkcs11_daemon_session_thread      (gpointer user_data);
+gpointer        gkr_pkcs11_dispatch_session_thread      (gpointer user_data);
 
-#endif /* __GKR_PKCS11_DAEMON_H__ */
+#endif /* __GKR_PKCS11_DISPATCH_H__ */