gnome-keyring r1188 - in trunk: . daemon/pk daemon/pkix gp11

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Jul 20 22:12:28 2008
New Revision: 1188
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1188&view=rev

Log:
	* daemon/pk/gkr-pk-root-storage.c:
	* daemon/pkix/gkr-pkix-parser.c: Build fixes


Modified:
   trunk/ChangeLog
   trunk/daemon/pk/gkr-pk-root-storage.c
   trunk/daemon/pkix/gkr-pkix-parser.c
   trunk/gp11/   (props changed)

Modified: trunk/daemon/pk/gkr-pk-root-storage.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-root-storage.c	(original)
+++ trunk/daemon/pk/gkr-pk-root-storage.c	Sun Jul 20 22:12:28 2008
@@ -75,7 +75,7 @@
 static GkrPkObject*
 prepare_object (GkrPkRootStorage *storage, GQuark location, gkrconstid digest)
 {
-	GkrPkObjectManager *manager;
+	GkrPkManager *manager;
 	GkrPkObject *object;
 	
 	manager = gkr_pk_manager_for_token ();

Modified: trunk/daemon/pkix/gkr-pkix-parser.c
==============================================================================
--- trunk/daemon/pkix/gkr-pkix-parser.c	(original)
+++ trunk/daemon/pkix/gkr-pkix-parser.c	Sun Jul 20 22:12:28 2008
@@ -349,7 +349,6 @@
 			g_signal_accumulator_true_handled, NULL, gkr_pkix_marshal_BOOLEAN__UINT_POINTER_UINT_POINTER, 
 			G_TYPE_BOOLEAN, 4, G_TYPE_UINT, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_POINTER);
 
-	/* Due to our use of secure memory, we use a pointer as the signal return type */
 	signals[ASK_PASSWORD] = g_signal_new ("ask-password", GKR_TYPE_PKIX_PARSER, 
 			G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GkrPkixParserClass, ask_password),
 			g_signal_accumulator_true_handled, NULL, gkr_pkix_marshal_BOOLEAN__UINT_POINTER_UINT_STRING_POINTER_POINTER,