seahorse r2671 - in trunk: . libseahorse pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Dec 16 03:37:55 2008
New Revision: 2671
URL: http://svn.gnome.org/viewvc/seahorse?rev=2671&view=rev

Log:
	* libseahorse/seahorse-progress.c: Disconnect properly from 
	monitoring progress on operations when op finishes.
	
	* pkcs11/seahorse-pkcs11-object.c: Access object slot correctly.


Modified:
   trunk/ChangeLog
   trunk/libseahorse/seahorse-progress.c
   trunk/pkcs11/seahorse-pkcs11-object.c

Modified: trunk/libseahorse/seahorse-progress.c
==============================================================================
--- trunk/libseahorse/seahorse-progress.c	(original)
+++ trunk/libseahorse/seahorse-progress.c	Tue Dec 16 03:37:55 2008
@@ -114,11 +114,12 @@
         if (err) {
             operation_progress (operation, err->message, 0.0, swidget);
             g_error_free (err);
-            return;
         }
+    } else {
+	    operation_progress (operation, "", 0.0, swidget);
     }
     
-    operation_progress (operation, "", 0.0, swidget);
+    g_signal_handlers_disconnect_by_func (swidget, disconnect_progress, operation);
     g_object_set_data (G_OBJECT (swidget), "operation", NULL);
 }
 
@@ -127,7 +128,6 @@
 {
     g_signal_handlers_disconnect_by_func (op, operation_progress, widget);
     g_signal_handlers_disconnect_by_func (op, operation_done, widget);
-    g_signal_handlers_disconnect_by_func (widget, disconnect_progress, op);
 }
 
 void 

Modified: trunk/pkcs11/seahorse-pkcs11-object.c
==============================================================================
--- trunk/pkcs11/seahorse-pkcs11-object.c	(original)
+++ trunk/pkcs11/seahorse-pkcs11-object.c	Tue Dec 16 03:37:55 2008
@@ -410,7 +410,7 @@
 	/* TODO: This whole ID thing needs rethinking */
 	
 	text = g_strdup_printf("%s:%lu/%lu", SEAHORSE_PKCS11_TYPE_STR, 
-                                         gp11_slot_get_handle (seahorse_pkcs11_source_get_slot (SEAHORSE_PKCS11_SOURCE (seahorse_object_get_source (SEAHORSE_OBJECT (object))))),
+                                         gp11_slot_get_handle (object->slot),
                                          gp11_object_get_handle (object));
 	
 	quark = g_quark_from_string (text);