r11865 - in /desktop/unstable/seahorse/debian: changelog patches/00list patches/4_gpg-agent.dpatch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sun Jul  8 17:16:03 2007
New Revision: 11865

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11865
Log:
* debian/gconf-defaults: disable the notification area icon by
* debian/patches/4_gpg-agent.dpatch:
  + Prevent seahorse from crashing when gpg-agent is running. Patch
    taken from upstream. This makes it possible to have both installed
    and still everything working. (Closes: #407800, #420415, #415842)

Added:
    desktop/unstable/seahorse/debian/patches/4_gpg-agent.dpatch
Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/patches/00list

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=11865&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Sun Jul  8 17:16:03 2007
@@ -5,10 +5,16 @@
     + Drop accidentially added patch from the diff.
 
   [ Josselin Mouette ]
-  * debian/gconf-defaults: disable the notification area icon by 
+  * debian/gconf-defaults: disable the notification area icon by
     default as it doesn't notify of anything. See bugzilla#432891.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 17 Jun 2007 00:14:23 +0200
+  [ Sebastian Dröge ]
+  * debian/patches/4_gpg-agent.dpatch:
+    + Prevent seahorse from crashing when gpg-agent is running. Patch
+      taken from upstream. This makes it possible to have both installed
+      and still everything working. (Closes: #407800, #420415, #415842)
+
+ -- Sebastian Dröge <slomo at debian.org>  Sun, 08 Jul 2007 19:13:28 +0200
 
 seahorse (1.0.1-5) unstable; urgency=low
 

Modified: desktop/unstable/seahorse/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/00list?rev=11865&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/00list (original)
+++ desktop/unstable/seahorse/debian/patches/00list Sun Jul  8 17:16:03 2007
@@ -1,6 +1,7 @@
 1_seahorse-agent-manpage.dpatch
 2_mlock.dpatch
 3_setuid.dpatch
+4_gpg-agent.dpatch
 8_force_ssh.dpatch
 9_fix_ephy_crash.dpatch
 10_relibtoolize.dpatch

Added: desktop/unstable/seahorse/debian/patches/4_gpg-agent.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/4_gpg-agent.dpatch?rev=11865&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/4_gpg-agent.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/4_gpg-agent.dpatch Sun Jul  8 17:16:03 2007
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+Index: agent/seahorse-agent-ssh.c
+===================================================================
+--- seahorse/agent/seahorse-agent-ssh.c	(revision 1810)
++++ seahorse/agent/seahorse-agent-ssh.c	(working copy)
+@@ -714,6 +714,8 @@ seahorse_agent_ssh_init ()
+ 
+     g_assert (!ssh_agent_initialized);
+     
++    seahorse_agent_cache_init ();
++    
+     if (listen (ssh_agent_socket, 5) < 0) {
+         g_warning ("couldn't listen on SSH proxy socket: %s: %s", ssh_agent_sockname, g_strerror (errno));
+         return FALSE;
+Index: agent/seahorse-agent-cache.c
+===================================================================
+--- seahorse/agent/seahorse-agent-cache.c	(revision 1810)
++++ seahorse/agent/seahorse-agent-cache.c	(working copy)
+@@ -239,18 +239,17 @@ seahorse_agent_cache_init ()
+     gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP;
+     gpgme_error_t err;
+  
+-    g_assert (g_cache == NULL);
+-    g_assert (g_memory == NULL);
+-
+-    g_cache =
+-        g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item);
+-    g_memory = g_mem_chunk_create (SeahorseAgentPassReq, 128, G_ALLOC_AND_FREE);
+-
+-    err = gpgme_engine_check_version (proto);
+-    g_return_if_fail (GPG_IS_OK (err));
+-   
+-    /* Listen for changes on the AUTH key */
+-    g_notify_id = seahorse_gconf_notify (SETTING_AUTH, gconf_notify, NULL);
++    if ((g_cache == NULL) && (g_memory == NULL)) {
++        g_cache =
++            g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item);
++        g_memory = g_mem_chunk_create (SeahorseAgentPassReq, 128, G_ALLOC_AND_FREE);
++
++        err = gpgme_engine_check_version (proto);
++        g_return_if_fail (GPG_IS_OK (err));
++       
++        /* Listen for changes on the AUTH key */
++        g_notify_id = seahorse_gconf_notify (SETTING_AUTH, gconf_notify, NULL);
++    }
+ }
+ 
+ /* Uninitialize and free up cache memory */
+