File seahorse-plugins-2.30.1-gpgisok.patch of Package seahorse-plugins

Overview Repositories Revisions Requests Users Attributes Meta

File seahorse-plugins-2.30.1-gpgisok.patch of Package seahorse-plugins

From 7003cc4975fbea9907d7072b55a7057ecbc2dbd2 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Thu, 6 May 2010 23:06:10 +0200
Subject: [PATCH] =?UTF-8?q?Bug=20607423=20=E2=80=94=20Initialize=20gpgme=20correctly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use gpgme_engine_check_version() before gpgm_new() since the
current gpgme version requires to do those calls, the change
fixes the nautilus entries not working (lp: #514950)
---
 agent/seahorse-agent-cache.c         |    1 +
 libseahorse/seahorse-pgp-operation.c |    1 +
 plugins/nautilus/seahorse-tool.c     |    7 +++++++
 3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/agent/seahorse-agent-cache.c b/agent/seahorse-agent-cache.c
index a4371d8..5bf42a4 100644
--- a/agent/seahorse-agent-cache.c
+++ b/agent/seahorse-agent-cache.c
@@ -237,6 +237,7 @@ seahorse_agent_cache_init ()
         g_cache =
             g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item);
 
+        gpgme_check_version (NULL);
         err = gpgme_engine_check_version (proto);
         g_return_if_fail (GPG_IS_OK (err));
         
diff --git a/libseahorse/seahorse-pgp-operation.c b/libseahorse/seahorse-pgp-operation.c
index fd2a6f8..d842383 100644
--- a/libseahorse/seahorse-pgp-operation.c
+++ b/libseahorse/seahorse-pgp-operation.c
@@ -323,6 +323,7 @@ seahorse_pgp_operation_init (SeahorsePGPOperation *pop)
     gpgme_error_t err;
     gpgme_ctx_t ctx;
  
+    gpgme_check_version (NULL);
     err = gpgme_engine_check_version (proto);
     g_return_if_fail (GPG_IS_OK (err));
    
diff --git a/plugins/nautilus/seahorse-tool.c b/plugins/nautilus/seahorse-tool.c
index 87968ff..ea727d8 100644
--- a/plugins/nautilus/seahorse-tool.c
+++ b/plugins/nautilus/seahorse-tool.c
@@ -170,6 +170,9 @@ prompt_recipients (gpgme_key_t *signkey)
         recips = cryptui_prompt_recipients (keyset, _("Choose Recipients"), &signer);
         
         if (recips) {
+            gpgme_check_version (NULL);
+            gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
+            g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
             
             gerr = gpgme_new (&ctx);
             g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
@@ -328,6 +331,10 @@ prompt_signer ()
         id = cryptui_keyset_key_raw_keyid (keyset, signer);
         g_free (signer);
         
+        gpgme_check_version (NULL);
+        gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
+        g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
+
         gerr = gpgme_new (&ctx);
         g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
         
-- 
1.7.1

Places

File seahorse-plugins-2.30.1-gpgisok.patch of Package seahorse-plugins

Places