gnome-keyring r1452 - in trunk: . pkcs11/gck pkcs11/ssh-agent

[nnielsen svn gnome org]

Author: nnielsen
Date: Fri Jan  9 16:17:37 2009
New Revision: 1452
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1452&view=rev

Log:
Build fixes

Modified:
   trunk/ChangeLog
   trunk/pkcs11/gck/gck-file-store.c
   trunk/pkcs11/ssh-agent/Makefile.am

Modified: trunk/pkcs11/gck/gck-file-store.c
==============================================================================
--- trunk/pkcs11/gck/gck-file-store.c	(original)
+++ trunk/pkcs11/gck/gck-file-store.c	Fri Jan  9 16:17:37 2009
@@ -135,8 +135,8 @@
 			if (errno == EAGAIN && errno == EINTR)
 				continue;
 			if (res < 0 || len != all)
-				g_warning ("couldn't read %lu bytes from store file: %s", all, 
-				           g_strerror (errno));
+				g_warning ("couldn't read %u bytes from store file: %s", 
+				           (guint)all, g_strerror (errno));
 			return FALSE;
 		} else  {
 			len -= res;
@@ -160,8 +160,8 @@
 		if (res <= 0) {
 			if (errno == EAGAIN && errno == EINTR)
 				continue;
-			g_warning ("couldn't write %lu bytes to store file: %s", all, 
-			           res < 0 ? g_strerror (errno) : "");
+			g_warning ("couldn't write %u bytes to store file: %s", 
+			           (guint)all, res < 0 ? g_strerror (errno) : "");
 			return FALSE;
 		} else  {
 			len -= res;

Modified: trunk/pkcs11/ssh-agent/Makefile.am
==============================================================================
--- trunk/pkcs11/ssh-agent/Makefile.am	(original)
+++ trunk/pkcs11/ssh-agent/Makefile.am	Fri Jan  9 16:17:37 2009
@@ -32,6 +32,7 @@
 	libgck-ssh-agent.la \
 	$(top_builddir)/gp11/libgp11.la \
 	$(top_builddir)/common/libgkr-common-buffer.la \
+	$(top_builddir)/common/libgkr-common-secure.la \
     	$(GOBJECT_LIBS) \
     	$(GTHREAD_LIBS) \
     	$(LIBGCRYPT_LIBS) \