[gcr] Fix build problems

[Stefan Walter <stefw src gnome org>]

commit 290b322a2bbaa81c3f00f9241228ed38672fb03f
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Dec 20 15:54:00 2011 +0100

    Fix build problems
    
     * Linker error with gcr-prompter
     * Fix warning about g_set_error
     * Fix documentation warnings about gck_attributes_set ...

 gck/gck-attributes.c         |    4 ----
 gcr/Makefile.am              |    1 +
 gcr/gcr-subject-public-key.c |    4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/gck/gck-attributes.c b/gck/gck-attributes.c
index 7f8dbbe..3a99f19 100644
--- a/gck/gck-attributes.c
+++ b/gck/gck-attributes.c
@@ -2933,8 +2933,6 @@ gck_attributes_add (GckAttributes *attrs,
  * #GckAttributes are now immutable. This method no longer does anything.
  *
  * Deprecated: 3.4: Use gck_builder_set() instead.
- *
- * Returns: (transfer none): returns %NULL
  **/
 void
 gck_attributes_set (GckAttributes *attrs,
@@ -3113,8 +3111,6 @@ gck_attributes_add_date (GckAttributes *attrs,
  * #GckAttributes are now immutable. This method no longer does anything.
  *
  * Deprecated: 3.4: Use gck_builder_set_date() instead.
- *
- * Returns: (transfer none): returns %NULL
  */
 void
 gck_attributes_set_date (GckAttributes *attrs,
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index 9589e1e..ddcbf29 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -347,6 +347,7 @@ gcr_prompter_CFLAGS = \
 
 gcr_prompter_LDADD = \
 	$(builddir)/libgcr-$(GCR_MAJOR).la \
+	$(builddir)/libgcr-base-$(GCR_MAJOR).la \
 	$(GTK_LIBS)
 
 # ------------------------------------------------------------------
diff --git a/gcr/gcr-subject-public-key.c b/gcr/gcr-subject-public-key.c
index 20a8afe..b1e3a1a 100644
--- a/gcr/gcr-subject-public-key.c
+++ b/gcr/gcr-subject-public-key.c
@@ -199,8 +199,8 @@ lookup_public_key (GckObject *object,
 	if (id == NULL || gck_attribute_is_invalid (id)) {
 		gck_attributes_unref (attrs);
 		_gcr_debug ("couldn't load private key id");
-		g_set_error (lerror, GCK_ERROR, CKR_ATTRIBUTE_TYPE_INVALID,
-		             gck_message_from_rv (CKR_ATTRIBUTE_TYPE_INVALID));
+		g_set_error_literal (lerror, GCK_ERROR, CKR_ATTRIBUTE_TYPE_INVALID,
+		                     gck_message_from_rv (CKR_ATTRIBUTE_TYPE_INVALID));
 		return NULL;
 	}