[gnome-keyring] gcr: Use correct icon in the PKCS#11 importer

[Stefan Walter <stefw src gnome org>]

commit 7da76e0b2887b03d51d456c5d622770e0ce8bbfc
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Sep 27 15:53:35 2011 +0200

    gcr: Use correct icon in the PKCS#11 importer

 gcr/Makefile.am           |    2 +-
 gcr/gcr-icons.h           |    2 ++
 gcr/gcr-pkcs11-importer.c |   15 +++++++--------
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index cdef989..2b981a2 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -104,6 +104,7 @@ libgcr_base_ GCR_MAJOR@_la_SOURCES = \
 	gcr-gnupg-process.c gcr-gnupg-process.h \
 	gcr-gnupg-records.c gcr-gnupg-records.h \
 	gcr-gnupg-util.c gcr-gnupg-util.h \
+	gcr-icons.c gcr-icons.h \
 	gcr-importer.c gcr-importer.h \
 	gcr-internal.h \
 	gcr-library.c gcr-library.h \
@@ -140,7 +141,6 @@ libgcr_ GCR_MAJOR@_la_SOURCES = \
 	gcr-fingerprint.c gcr-fingerprint.h \
 	gcr-gnupg-renderer.c gcr-gnupg-renderer.h \
 	gcr-gnupg-records.c gcr-gnupg-records.h \
-	gcr-icons.c gcr-icons.h \
 	gcr-import-button.c gcr-import-button.h \
 	gcr-import-dialog.c gcr-import-dialog.h \
 	gcr-key-renderer.c gcr-key-renderer.h \
diff --git a/gcr/gcr-icons.h b/gcr/gcr-icons.h
index f0e8b69..4e603b0 100644
--- a/gcr/gcr-icons.h
+++ b/gcr/gcr-icons.h
@@ -25,6 +25,8 @@
 
 #include "gcr-internal.h"
 
+#include <gck/gck.h>
+
 G_BEGIN_DECLS
 
 #define GCR_ICON_CERTIFICATE    "application-certificate"
diff --git a/gcr/gcr-pkcs11-importer.c b/gcr/gcr-pkcs11-importer.c
index f2932ba..f3757ad 100644
--- a/gcr/gcr-pkcs11-importer.c
+++ b/gcr/gcr-pkcs11-importer.c
@@ -327,16 +327,15 @@ calculate_label (GcrPkcs11Importer *self)
 }
 
 static GIcon *
-calculate_icon (GcrPkcs11Importer *self)
+calculate_icon (GcrPkcs11Importer *self,
+                GckTokenInfo *token_info)
 {
-	GckTokenInfo *info;
+	GckTokenInfo *info = NULL;
 	GIcon *result;
 
-	info = gck_slot_get_token_info (self->pv->slot);
-	if (g_strcmp0 (info->manufacturer_id, "Gnome Keyring") == 0)
-		result = g_themed_icon_new ("user-home");
-	else
-		result = g_themed_icon_new ("media-flash");
+	if (token_info == NULL)
+		info = token_info = gck_slot_get_token_info (self->pv->slot);
+	result = gcr_icon_for_token_info (token_info);
 	gck_token_info_free (info);
 
 	return result;
@@ -355,7 +354,7 @@ _gcr_pkcs11_importer_get_property (GObject *obj,
 		g_value_take_string (value, calculate_label (self));
 		break;
 	case PROP_ICON:
-		g_value_take_object (value, calculate_icon (self));
+		g_value_take_object (value, calculate_icon (self, NULL));
 		break;
 	case PROP_SLOT:
 		g_value_set_object (value, _gcr_pkcs11_importer_get_slot (self));