| 1 |
pacho 10/04/26 13:48:58 |
| 2 |
|
| 3 |
Added: seahorse-plugins-2.28.1-gpgme_check_version.patch |
| 4 |
Log: |
| 5 |
Apply ubuntu patch to finally solve bug #281729 |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-crypt/seahorse-plugins/files/seahorse-plugins-2.28.1-gpgme_check_version.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/seahorse-plugins/files/seahorse-plugins-2.28.1-gpgme_check_version.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/seahorse-plugins/files/seahorse-plugins-2.28.1-gpgme_check_version.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: seahorse-plugins-2.28.1-gpgme_check_version.patch |
| 15 |
=================================================================== |
| 16 |
# Description: use gpgme_check_version () since gpgme_new () requires it now |
| 17 |
# Bug Gentoo: http://bugs.gentoo.org/show_bug.cgi?id=281729 |
| 18 |
# Bug-Ubuntu: https://bugs.launchpad.net/bugs/514950 |
| 19 |
# Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607423 |
| 20 |
Index: seahorse-plugins-2.30.0/plugins/nautilus/seahorse-tool.c |
| 21 |
=================================================================== |
| 22 |
--- seahorse-plugins-2.30.0.orig/plugins/nautilus/seahorse-tool.c 2010-02-13 15:31:34.000000000 +0100 |
| 23 |
+++ seahorse-plugins-2.30.0/plugins/nautilus/seahorse-tool.c 2010-04-08 02:46:54.000000000 +0200 |
| 24 |
@@ -170,6 +170,9 @@ |
| 25 |
recips = cryptui_prompt_recipients (keyset, _("Choose Recipients"), &signer); |
| 26 |
|
| 27 |
if (recips) { |
| 28 |
+ gpgme_check_version (NULL); |
| 29 |
+ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); |
| 30 |
+ g_return_val_if_fail (GPG_IS_OK (gerr), NULL); |
| 31 |
|
| 32 |
gerr = gpgme_new (&ctx); |
| 33 |
g_return_val_if_fail (GPG_IS_OK (gerr), NULL); |
| 34 |
@@ -328,6 +331,10 @@ |
| 35 |
id = cryptui_keyset_key_raw_keyid (keyset, signer); |
| 36 |
g_free (signer); |
| 37 |
|
| 38 |
+ gpgme_check_version (NULL); |
| 39 |
+ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); |
| 40 |
+ g_return_val_if_fail (GPG_IS_OK (gerr), NULL); |
| 41 |
+ |
| 42 |
gerr = gpgme_new (&ctx); |
| 43 |
g_return_val_if_fail (GPG_IS_OK (gerr), NULL); |
| 44 |
|
| 45 |
Index: seahorse-plugins-2.30.0/agent/seahorse-agent-cache.c |
| 46 |
=================================================================== |
| 47 |
--- seahorse-plugins-2.30.0.orig/agent/seahorse-agent-cache.c 2010-01-25 03:06:50.000000000 +0100 |
| 48 |
+++ seahorse-plugins-2.30.0/agent/seahorse-agent-cache.c 2010-04-08 02:46:54.000000000 +0200 |
| 49 |
@@ -237,6 +237,7 @@ |
| 50 |
g_cache = |
| 51 |
g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item); |
| 52 |
|
| 53 |
+ gpgme_check_version (NULL); |
| 54 |
err = gpgme_engine_check_version (proto); |
| 55 |
g_return_if_fail (GPG_IS_OK (err)); |
| 56 |
|
| 57 |
Index: seahorse-plugins-2.30.0/libseahorse/seahorse-pgp-operation.c |
| 58 |
=================================================================== |
| 59 |
--- seahorse-plugins-2.30.0.orig/libseahorse/seahorse-pgp-operation.c 2010-01-25 03:06:50.000000000 +0100 |
| 60 |
+++ seahorse-plugins-2.30.0/libseahorse/seahorse-pgp-operation.c 2010-04-08 02:46:54.000000000 +0200 |
| 61 |
@@ -323,6 +323,7 @@ |
| 62 |
gpgme_error_t err; |
| 63 |
gpgme_ctx_t ctx; |
| 64 |
|
| 65 |
+ gpgme_check_version (NULL); |
| 66 |
err = gpgme_engine_check_version (proto); |
| 67 |
g_return_if_fail (GPG_IS_OK (err)); |
Archives