gcr: Make spinner on GcrImportButton actually spin

diff --git a/gcr/gcr-import-button.c b/gcr/gcr-import-button.c
index f517d9e..b25f20c 100644 (file)
--- a/gcr/gcr-import-button.c
+++ b/gcr/gcr-import-button.c
@@ -102,6 +102,7 @@ update_import_button (GcrImportButton *self)
        /* Initializing, set a spinner */
        if (self->pv->queued && !self->pv->ready) {
                gtk_widget_show (self->pv->spinner);
+               gtk_spinner_start (GTK_SPINNER (self->pv->spinner));
                gtk_widget_hide (self->pv->arrow);
                gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
                gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Initializing..."));
@@ -109,12 +110,14 @@ update_import_button (GcrImportButton *self)
        /* Importing, set a spinner */
        } else if (self->pv->importing) {
                gtk_widget_show (self->pv->spinner);
+               gtk_spinner_start (GTK_SPINNER (self->pv->spinner));
                gtk_widget_hide (self->pv->arrow);
                gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
                gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Import is in progress..."));
 
        } else if (self->pv->imported) {
                gtk_widget_hide (self->pv->spinner);
+               gtk_spinner_stop (GTK_SPINNER (self->pv->spinner));
                gtk_widget_hide (self->pv->arrow);
                gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
                message = g_strdup_printf (_("Imported to: %s"), self->pv->imported);
@@ -125,6 +128,7 @@ update_import_button (GcrImportButton *self)
        } else if (self->pv->importers) {
 
                gtk_widget_hide (self->pv->spinner);
+               gtk_spinner_stop (GTK_SPINNER (self->pv->spinner));
                gtk_widget_set_sensitive (GTK_WIDGET (self), TRUE);
 
                /* More than one importer */
@@ -145,6 +149,7 @@ update_import_button (GcrImportButton *self)
        /* No importers, none compatible */
        } else if (self->pv->created) {
                gtk_widget_hide (self->pv->spinner);
+               gtk_spinner_stop (GTK_SPINNER (self->pv->spinner));
                gtk_widget_hide (self->pv->arrow);
 
                gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
@@ -153,6 +158,7 @@ update_import_button (GcrImportButton *self)
        /* No importers yet added */
        } else {
                gtk_widget_hide (self->pv->spinner);
+               gtk_spinner_stop (GTK_SPINNER (self->pv->spinner));
                gtk_widget_hide (self->pv->arrow);
 
                gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);

diff --git a/gcr/gcr-pkcs11-importer.c b/gcr/gcr-pkcs11-importer.c
index fbe537c..5cc60b6 100644 (file)
--- a/gcr/gcr-pkcs11-importer.c
+++ b/gcr/gcr-pkcs11-importer.c
@@ -720,6 +720,7 @@ list_all_slots (void)
 
 static const char *token_blacklist[] = {
        "pkcs11:manufacturer=Gnome%20Keyring;serial=1:SECRET:MAIN",
+       "pkcs11:manufacturer=Gnome%20Keyring;serial=1:USER:DEFAULT",
        NULL
 };