seahorse r2294 - in trunk: . libseahorse

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Jul 22 15:02:45 2008
New Revision: 2294
URL: http://svn.gnome.org/viewvc/seahorse?rev=2294&view=rev

Log:
	* libseahorse/seahorse-context.c:
	* libseahorse/seahorse-progress.c: Don't add a multi-operation
	to itself. Fixes bug #510992


Modified:
   trunk/ChangeLog
   trunk/libseahorse/seahorse-context.c
   trunk/libseahorse/seahorse-progress.c

Modified: trunk/libseahorse/seahorse-context.c
==============================================================================
--- trunk/libseahorse/seahorse-context.c	(original)
+++ trunk/libseahorse/seahorse-context.c	Tue Jul 22 15:02:45 2008
@@ -797,7 +797,7 @@
             g_free (uri);
         }
 
-        if (op != NULL) {
+        if (mop == NULL && op != NULL) {
             mop = seahorse_multi_operation_new ();
             seahorse_multi_operation_take (mop, op);
         }

Modified: trunk/libseahorse/seahorse-progress.c
==============================================================================
--- trunk/libseahorse/seahorse-progress.c	(original)
+++ trunk/libseahorse/seahorse-progress.c	Tue Jul 22 15:02:45 2008
@@ -146,6 +146,10 @@
     
     prev = SEAHORSE_OPERATION (g_object_get_data (G_OBJECT (swidget), "operation"));
     if (prev) {
+	    
+        /* If it's the same operation, just ignore */
+        if (prev == operation)
+            return;
         
         /* If the previous one was a multi operation, just piggy back this one in */
         if (SEAHORSE_IS_MULTI_OPERATION (prev)) {