seahorse r2646 - in trunk: . ssh

[sadam svn gnome org]

Author: sadam
Date: Thu Dec 11 19:00:07 2008
New Revision: 2646
URL: http://svn.gnome.org/viewvc/seahorse?rev=2646&view=rev

Log:
2008-12-11  Adam Schreiber  <sadam clemson edu>

    * ssh/seahorse-ssh-operation.c: Patch from Jeff Cai.  Fixes bug 
#558491.


Modified:
   trunk/ChangeLog
   trunk/ssh/seahorse-ssh-operation.c

Modified: trunk/ssh/seahorse-ssh-operation.c
==============================================================================
--- trunk/ssh/seahorse-ssh-operation.c	(original)
+++ trunk/ssh/seahorse-ssh-operation.c	Thu Dec 11 19:00:07 2008
@@ -129,6 +129,11 @@
     SeahorseSSHOperationPrivate *pv = SEAHORSE_SSH_OPERATION_GET_PRIVATE (sop);
     
     DEBUG_OPERATION (("SSHOP: SSH process done\n"));
+
+    /* Close off the askpass io channel etc... */
+    if(pv->stag_askpass)
+        g_source_remove (pv->stag_askpass);
+    pv->stag_askpass = 0;
     
     if (seahorse_operation_is_running (SEAHORSE_OPERATION (sop))) {
 
@@ -167,10 +172,6 @@
     pv->pid = 0;
     pv->wpid = 0;
     
-    /* Close off the askpass io channel etc... */
-    if(pv->stag_askpass)
-        g_source_remove (pv->stag_askpass);
-    pv->stag_askpass = 0;
     
     if(pv->io_askpass)
         g_io_channel_unref (pv->io_askpass);