r24585 - in /desktop/unstable/seahorse-plugins/debian: changelog patches/10_gpgme_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Jun 25 17:10:29 2010
New Revision: 24585

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24585
Log:
10_gpgme_crash.patch: stolen upstream. Fix a crash caused by a 
change in gpgme. Closes: #581030, #587092.

Added:
    desktop/unstable/seahorse-plugins/debian/patches/10_gpgme_crash.patch
Modified:
    desktop/unstable/seahorse-plugins/debian/changelog
    desktop/unstable/seahorse-plugins/debian/patches/series

Modified: desktop/unstable/seahorse-plugins/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse-plugins/debian/changelog?rev=24585&op=diff
==============================================================================
--- desktop/unstable/seahorse-plugins/debian/changelog [utf-8] (original)
+++ desktop/unstable/seahorse-plugins/debian/changelog [utf-8] Fri Jun 25 17:10:29 2010
@@ -1,3 +1,10 @@
+seahorse-plugins (2.30.1-3) unstable; urgency=low
+
+  * 10_gpgme_crash.patch: stolen upstream. Fix a crash caused by a 
+    change in gpgme. Closes: #581030, #587092.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 25 Jun 2010 19:10:12 +0200
+
 seahorse-plugins (2.30.1-2) unstable; urgency=low
 
   * Switch to 3.0 source format.

Added: desktop/unstable/seahorse-plugins/debian/patches/10_gpgme_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse-plugins/debian/patches/10_gpgme_crash.patch?rev=24585&op=file
==============================================================================
--- desktop/unstable/seahorse-plugins/debian/patches/10_gpgme_crash.patch (added)
+++ desktop/unstable/seahorse-plugins/debian/patches/10_gpgme_crash.patch [utf-8] Fri Jun 25 17:10:29 2010
@@ -1,0 +1,69 @@
+From e99fc5839deb86868fa4fdfbfc2fcadef2a83755 Mon Sep 17 00:00:00 2001
+From: Adam Schreiber <sadam at gnome.org>
+Date: Sun, 20 Jun 2010 21:12:54 +0000
+Subject: Fix build with -DGSEAL
+
+---
+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/libseahorse/seahorse-widget.c b/libseahorse/seahorse-widget.c
+index b15d53e..3fb9e5a 100644
+--- a/libseahorse/seahorse-widget.c
++++ b/libseahorse/seahorse-widget.c
+@@ -200,7 +200,6 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam
+         gtk_builder_connect_signals (swidget->gtkbuilder, swidget);
+         
+         w = GTK_WIDGET (seahorse_widget_get_widget (swidget, swidget->name));
+-		GTK_WIDGET_SET_FLAGS (GTK_WINDOW (w), GTK_TOPLEVEL);
+         /*TODO: glade_xml_ensure_accel (swidget->gtkbuilder);*/
+         
+         gtk_window_set_icon_name (GTK_WINDOW (w), "seahorse");
+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);
+         
+--
+cgit v0.8.3.1

Modified: desktop/unstable/seahorse-plugins/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse-plugins/debian/patches/series?rev=24585&op=diff
==============================================================================
--- desktop/unstable/seahorse-plugins/debian/patches/series [utf-8] (original)
+++ desktop/unstable/seahorse-plugins/debian/patches/series [utf-8] Fri Jun 25 17:10:29 2010
@@ -1,1 +1,2 @@
 01_nomenu.patch
+10_gpgme_crash.patch