[gnome-settings-daemon] [smartcard] Don't try to use smartcard drivers that didn't load

[Michael Terry <mterry src gnome org>]

commit fdfd97cd737257532c8797e2a551a10f5c74cf05
Author: Michael Terry <michael terry canonical com>
Date:   Tue Jul 31 11:54:51 2012 -0400

    [smartcard] Don't try to use smartcard drivers that didn't load
    
    https://bugzilla.gnome.org/show_bug.cgi?id=668950

 plugins/smartcard/gsd-smartcard-manager.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/smartcard/gsd-smartcard-manager.c b/plugins/smartcard/gsd-smartcard-manager.c
index 9c91f82..03c8f79 100644
--- a/plugins/smartcard/gsd-smartcard-manager.c
+++ b/plugins/smartcard/gsd-smartcard-manager.c
@@ -737,8 +737,8 @@ load_driver (GsdSmartcardManager  *manager,
                 g_free (module_spec);
                 module_spec = NULL;
 
-                if (!SECMOD_HasRemovableSlots (module) ||
-                    !module->loaded) {
+                if (SECMOD_HasRemovableSlots (module) &&
+                    module->loaded) {
                         modules = g_list_prepend (modules, module);
                 } else {
                         g_debug ("fallback module found but not %s",
@@ -773,8 +773,8 @@ load_driver (GsdSmartcardManager  *manager,
                         g_free (module_spec);
                         module_spec = NULL;
 
-                        if (!SECMOD_HasRemovableSlots (module) ||
-                            !module->loaded) {
+                        if (SECMOD_HasRemovableSlots (module) &&
+                            module->loaded) {
                                 modules = g_list_prepend (modules, module);
                         } else {
                                 g_debug ("fallback module found but not loaded");