gnome-keyring r1523 - in trunk: . common daemon daemon/keyrings/tests daemon/pkcs11 daemon/ui egg

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Feb  8 00:21:18 2009
New Revision: 1523
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1523&view=rev

Log:
Move gkr-daemon-util code from common into daemon since that's where it's used.

Added:
   trunk/daemon/gkr-daemon-util.c
      - copied, changed from r1522, /trunk/common/gkr-daemon-util.c
   trunk/daemon/gkr-daemon-util.h
      - copied, changed from r1522, /trunk/common/gkr-daemon-util.h
   trunk/egg/egg-dbus.c
      - copied, changed from r1522, /trunk/common/gkr-dbus.c
   trunk/egg/egg-dbus.h
      - copied, changed from r1522, /trunk/common/gkr-dbus.h
Removed:
   trunk/common/gkr-daemon-util.c
   trunk/common/gkr-daemon-util.h
   trunk/common/gkr-dbus.c
   trunk/common/gkr-dbus.h
Modified:
   trunk/ChangeLog
   trunk/common/Makefile.am
   trunk/daemon/Makefile.am
   trunk/daemon/gkr-daemon-dbus.c
   trunk/daemon/gkr-daemon-io.c
   trunk/daemon/gkr-daemon-ops.c
   trunk/daemon/gkr-daemon.c
   trunk/daemon/keyrings/tests/Makefile.am
   trunk/daemon/pkcs11/gkr-pkcs11-daemon.c
   trunk/daemon/ui/gkr-ask-daemon.c

Modified: trunk/common/Makefile.am
==============================================================================
--- trunk/common/Makefile.am	(original)
+++ trunk/common/Makefile.am	Sun Feb  8 00:21:18 2009
@@ -21,7 +21,6 @@
 libgkr_common_la_SOURCES = \
 	gkr-async.c gkr-async.h \
 	gkr-cleanup.c gkr-cleanup.h \
-	gkr-daemon-util.c gkr-daemon-util.h \
 	gkr-dbus.c gkr-dbus.h \
 	gkr-location.c gkr-location.h \
 	gkr-location-watch.c gkr-location-watch.h \

Modified: trunk/daemon/Makefile.am
==============================================================================
--- trunk/daemon/Makefile.am	(original)
+++ trunk/daemon/Makefile.am	Sun Feb  8 00:21:18 2009
@@ -21,11 +21,11 @@
 	$(GLIB_CFLAGS)
 
 gnome_keyring_daemon_SOURCES = \
-	gkr-daemon.c \
-	gkr-daemon.h \
+	gkr-daemon.c gkr-daemon.h \
 	gkr-daemon-dbus.c \
 	gkr-daemon-io.c \
-	gkr-daemon-ops.c
+	gkr-daemon-ops.c \
+	gkr-daemon-util.c gkr-daemon-util.h 
 
 gnome_keyring_daemon_LDADD = \
 	$(top_builddir)/daemon/pkcs11/libgkr-pkcs11.la \

Modified: trunk/daemon/gkr-daemon-dbus.c
==============================================================================
--- trunk/daemon/gkr-daemon-dbus.c	(original)
+++ trunk/daemon/gkr-daemon-dbus.c	Sun Feb  8 00:21:18 2009
@@ -23,10 +23,10 @@
 #include "config.h"
 
 #include "gkr-daemon.h"
+#include "gkr-daemon-util.h"
 
 #include "common/gkr-cleanup.h"
 #include "common/gkr-dbus.h"
-#include "common/gkr-daemon-util.h"
 
 #include "library/gnome-keyring.h"
 #include "library/gnome-keyring-private.h"

Modified: trunk/daemon/gkr-daemon-io.c
==============================================================================
--- trunk/daemon/gkr-daemon-io.c	(original)
+++ trunk/daemon/gkr-daemon-io.c	Sun Feb  8 00:21:18 2009
@@ -33,11 +33,11 @@
 #include <sys/un.h>
 
 #include "gkr-daemon.h"
+#include "gkr-daemon-util.h"
 
 #include "common/gkr-async.h"
 #include "egg/egg-buffer.h"
 #include "common/gkr-cleanup.h"
-#include "common/gkr-daemon-util.h"
 #include "egg/egg-secure-memory.h"
 #include "egg/egg-unix-credentials.h"
 

Modified: trunk/daemon/gkr-daemon-ops.c
==============================================================================
--- trunk/daemon/gkr-daemon-ops.c	(original)
+++ trunk/daemon/gkr-daemon-ops.c	Sun Feb  8 00:21:18 2009
@@ -23,10 +23,11 @@
 #include "config.h"
 
 #include "gkr-daemon.h"
+#include "gkr-daemon-util.h"
 
-#include "egg/egg-buffer.h"
-#include "common/gkr-daemon-util.h"
 #include "common/gkr-location.h"
+
+#include "egg/egg-buffer.h"
 #include "egg/egg-secure-memory.h"
 
 #include "keyrings/gkr-keyring.h"

Copied: trunk/daemon/gkr-daemon-util.c (from r1522, /trunk/common/gkr-daemon-util.c)
==============================================================================
--- /trunk/common/gkr-daemon-util.c	(original)
+++ trunk/daemon/gkr-daemon-util.c	Sun Feb  8 00:21:18 2009
@@ -23,9 +23,10 @@
 
 #include "config.h"
 
-#include "gkr-async.h"
 #include "gkr-daemon-util.h"
-#include "gkr-cleanup.h"
+
+#include "common/gkr-async.h"
+#include "common/gkr-cleanup.h"
 
 #include <glib.h>
 

Copied: trunk/daemon/gkr-daemon-util.h (from r1522, /trunk/common/gkr-daemon-util.h)
==============================================================================
--- /trunk/common/gkr-daemon-util.h	(original)
+++ trunk/daemon/gkr-daemon-util.h	Sun Feb  8 00:21:18 2009
@@ -24,11 +24,11 @@
 #ifndef GKRMASTERDIRECTORY_H_
 #define GKRMASTERDIRECTORY_H_
 
-G_BEGIN_DECLS
-
 #include <glib.h>
 #include <glib-object.h>
 
+G_BEGIN_DECLS
+
 #include <sys/types.h>
 
 const gchar*    gkr_daemon_util_get_master_directory    (void);

Modified: trunk/daemon/gkr-daemon.c
==============================================================================
--- trunk/daemon/gkr-daemon.c	(original)
+++ trunk/daemon/gkr-daemon.c	Sun Feb  8 00:21:18 2009
@@ -23,10 +23,10 @@
 #include "config.h"
 
 #include "gkr-daemon.h"
+#include "gkr-daemon-util.h"
 
 #include "common/gkr-async.h"
 #include "common/gkr-cleanup.h"
-#include "common/gkr-daemon-util.h"
 #include "common/gkr-unix-signal.h"
 
 #include "egg/egg-libgcrypt.h"

Modified: trunk/daemon/keyrings/tests/Makefile.am
==============================================================================
--- trunk/daemon/keyrings/tests/Makefile.am	(original)
+++ trunk/daemon/keyrings/tests/Makefile.am	Sun Feb  8 00:21:18 2009
@@ -1,10 +1,14 @@
 
 UNIT_AUTO = \
 	unit-test-keyring-login.c \
-	unit-test-keyring-file.c
+	unit-test-keyring-file.c \
+	$(top_srcdir)/daemon/gkr-daemon-util.c \
+	$(top_srcdir)/daemon/gkr-daemon-util.h
 
 UNIT_PROMPT = \
-	unit-test-login-prompt.c 
+	unit-test-login-prompt.c \
+	$(top_srcdir)/daemon/gkr-daemon-util.c \
+	$(top_srcdir)/daemon/gkr-daemon-util.h
 
 UNIT_LIBS =  \
 	$(top_builddir)/daemon/keyrings/libgkr-keyrings.la \

Modified: trunk/daemon/pkcs11/gkr-pkcs11-daemon.c
==============================================================================
--- trunk/daemon/pkcs11/gkr-pkcs11-daemon.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-daemon.c	Sun Feb  8 00:21:18 2009
@@ -32,9 +32,10 @@
 #include "pkcs11/user-store/gck-user-store.h"
 
 #include "common/gkr-async.h"
-#include "common/gkr-daemon-util.h"
 #include "common/gkr-cleanup.h"
 
+#include "daemon/gkr-daemon-util.h"
+
 /*
  * ALL calls into PKCS#11 and anything starting with 'gck'
  * must be concurrent. That is must UNLOCK the demon lock, 

Modified: trunk/daemon/ui/gkr-ask-daemon.c
==============================================================================
--- trunk/daemon/ui/gkr-ask-daemon.c	(original)
+++ trunk/daemon/ui/gkr-ask-daemon.c	Sun Feb  8 00:21:18 2009
@@ -28,7 +28,8 @@
 
 #include "common/gkr-async.h"
 #include "common/gkr-cleanup.h"
-#include "common/gkr-daemon-util.h"
+
+#include "daemon/gkr-daemon-util.h"
 
 #include <glib.h>
 

Copied: trunk/egg/egg-dbus.c (from r1522, /trunk/common/gkr-dbus.c)
==============================================================================

Copied: trunk/egg/egg-dbus.h (from r1522, /trunk/common/gkr-dbus.h)
==============================================================================