[seahorse/refactor: 17/37] gcr: Use functions in gcr to get PKCS#11 icons



commit fb6e3df6aca4335113cce6096e52848d76b9f727
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Oct 6 14:47:21 2011 +0200

    gcr: Use functions in gcr to get PKCS#11 icons

 pkcs11/seahorse-pkcs11-token.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/pkcs11/seahorse-pkcs11-token.c b/pkcs11/seahorse-pkcs11-token.c
index 157c1cf..bb31ec4 100644
--- a/pkcs11/seahorse-pkcs11-token.c
+++ b/pkcs11/seahorse-pkcs11-token.c
@@ -113,9 +113,13 @@ seahorse_pkcs11_token_get_property (GObject *object,
 			g_value_set_string (value, token->manufacturer_id);
 		gck_token_info_free (token);
 		break;
-		break;
 	case PROP_ICON:
-		g_value_take_object (value, g_themed_icon_new (GTK_STOCK_DIALOG_QUESTION));
+		token = gck_slot_get_token_info (self->pv->slot);
+		if (token == NULL)
+			g_value_take_object (value, g_themed_icon_new (GTK_STOCK_DIALOG_QUESTION));
+		else
+			g_value_take_object (value, gcr_icon_for_token (token));
+		gck_token_info_free (token);
 		break;
 	case PROP_SLOT:
 		g_value_set_object (value, self->pv->slot);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]