← Back to branch summary

~ubuntu-branches/ubuntu/maverick/seahorse-plugins/maverick

« back to all changes in this revision

Viewing changes to debian/patches/06_gpgme_check_version.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-04-08 01:27:05 UTC
  • Revision ID: james.westby@ubuntu.com-20100408012705-iluos2glu4pnizle
Tags: 2.30.0-0ubuntu2
https://launchpad.net/bugs/514950
* debian/patches/06_gpgme_check_version.patch:
  - 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)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_gpgme_check_version.patch
 
1
# Description: use gpgme_check_version () since gpgme_new () requires it now
 
2
# Bug-Ubuntu: https://bugs.launchpad.net/bugs/514950
 
3
# Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607423
 
4
Index: seahorse-plugins-2.30.0/plugins/nautilus/seahorse-tool.c
 
5
===================================================================
 
6
--- seahorse-plugins-2.30.0.orig/plugins/nautilus/seahorse-tool.c       2010-02-13 15:31:34.000000000 +0100
 
7
+++ seahorse-plugins-2.30.0/plugins/nautilus/seahorse-tool.c    2010-04-08 02:46:54.000000000 +0200
 
8
@@ -170,6 +170,9 @@
 
9
         recips = cryptui_prompt_recipients (keyset, _("Choose Recipients"), &signer);
 
10
         
 
11
         if (recips) {
 
12
+            gpgme_check_version (NULL);
 
13
+            gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
 
14
+            g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
 
15
             
 
16
             gerr = gpgme_new (&ctx);
 
17
             g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
 
18
@@ -328,6 +331,10 @@
 
19
         id = cryptui_keyset_key_raw_keyid (keyset, signer);
 
20
         g_free (signer);
 
21
         
 
22
+        gpgme_check_version (NULL);
 
23
+        gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
 
24
+        g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
 
25
+
 
26
         gerr = gpgme_new (&ctx);
 
27
         g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
 
28
         
 
29
Index: seahorse-plugins-2.30.0/agent/seahorse-agent-cache.c
 
30
===================================================================
 
31
--- seahorse-plugins-2.30.0.orig/agent/seahorse-agent-cache.c   2010-01-25 03:06:50.000000000 +0100
 
32
+++ seahorse-plugins-2.30.0/agent/seahorse-agent-cache.c        2010-04-08 02:46:54.000000000 +0200
 
33
@@ -237,6 +237,7 @@
 
34
         g_cache =
 
35
             g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item);
 
36
 
 
37
+        gpgme_check_version (NULL);
 
38
         err = gpgme_engine_check_version (proto);
 
39
         g_return_if_fail (GPG_IS_OK (err));
 
40
         
 
41
Index: seahorse-plugins-2.30.0/libseahorse/seahorse-pgp-operation.c
 
42
===================================================================
 
43
--- seahorse-plugins-2.30.0.orig/libseahorse/seahorse-pgp-operation.c   2010-01-25 03:06:50.000000000 +0100
 
44
+++ seahorse-plugins-2.30.0/libseahorse/seahorse-pgp-operation.c        2010-04-08 02:46:54.000000000 +0200
 
45
@@ -323,6 +323,7 @@
 
46
     gpgme_error_t err;
 
47
     gpgme_ctx_t ctx;
 
48
  
 
49
+    gpgme_check_version (NULL);
 
50
     err = gpgme_engine_check_version (proto);
 
51
     g_return_if_fail (GPG_IS_OK (err));
 
52