2004-10-19 [colin] 0.9.12cvs128.1

[claws.git] / src / plugins / pgpmime / passphrase.c

diff --git a/src/plugins/pgpmime/passphrase.c b/src/plugins/pgpmime/passphrase.c
index 24fdfa52c48facecea1365f30f0392a33f14fbc4..4fdeb2ade3649b5182f1db7b9d761982b8e38255 100644 (file)
--- a/src/plugins/pgpmime/passphrase.c
+++ b/src/plugins/pgpmime/passphrase.c
@@ -49,8 +49,6 @@
 #include "utils.h"
 #include "prefs_gpg.h"
 
-extern struct GPGConfig prefs_gpg;
-
 static int grab_all = 0;
 
 static gboolean pass_ack;
@@ -311,11 +309,11 @@ gpgmegtk_passphrase_cb (void *opaque, const char *desc, void **r_hd)
         /* FIXME: cleanup by looking at *r_hd */
         return NULL;
     }
-    if (prefs_gpg.store_passphrase && last_pass != NULL &&
+    if (prefs_gpg_get_config()->store_passphrase && last_pass != NULL &&
         strncmp(desc, "TRY_AGAIN", 9) != 0)
         return g_strdup(last_pass);
 
-    gpgmegtk_set_passphrase_grab (prefs_gpg.passphrase_grab);
+    gpgmegtk_set_passphrase_grab (prefs_gpg_get_config()->passphrase_grab);
     debug_print ("%% requesting passphrase for `%s': ", desc);
     pass = passphrase_mbox (desc);
     gpgmegtk_free_passphrase();
@@ -324,13 +322,13 @@ gpgmegtk_passphrase_cb (void *opaque, const char *desc, void **r_hd)
         gpgme_cancel (ctx);
     }
     else {
-        if (prefs_gpg.store_passphrase) {
+        if (prefs_gpg_get_config()->store_passphrase) {
             last_pass = g_strdup(pass);
             if (mlock(last_pass, strlen(last_pass)) == -1)
                 debug_print("%% locking passphrase failed");
 
-            if (prefs_gpg.store_passphrase_timeout > 0) {
-                gtk_timeout_add(prefs_gpg.store_passphrase_timeout*60*1000,
+            if (prefs_gpg_get_config()->store_passphrase_timeout > 0) {
+                gtk_timeout_add(prefs_gpg_get_config()->store_passphrase_timeout*60*1000,
                                 free_passphrase, NULL);
             }
         }