nautilus r14744 - in branches/gnome-2-24: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Mon Oct 20 09:44:28 2008
New Revision: 14744
URL: http://svn.gnome.org/viewvc/nautilus?rev=14744&view=rev

Log:
2008-10-20  Alexander Larsson  <alexl redhat com>

	Merged from trunk:

        * libnautilus-private/nautilus-mime-actions.c:
        (pause_activation_timed_cancel):
        (unpause_activation_timed_cancel):
        (activate_mount_op_active):
        (activate_files):
	Don't show timeout-based cancel when showing the "run or display"
	dialog. (#539954)




Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/libnautilus-private/nautilus-mime-actions.c

Modified: branches/gnome-2-24/libnautilus-private/nautilus-mime-actions.c
==============================================================================
--- branches/gnome-2-24/libnautilus-private/nautilus-mime-actions.c	(original)
+++ branches/gnome-2-24/libnautilus-private/nautilus-mime-actions.c	Mon Oct 20 09:44:28 2008
@@ -957,19 +957,31 @@
 }
 
 static void
+pause_activation_timed_cancel (ActivateParameters *parameters)
+{
+	if (parameters->timed_wait_active) {
+		eel_timed_wait_stop (cancel_activate_callback, parameters);
+		parameters->timed_wait_active = FALSE;
+	}
+}
+
+static void
+unpause_activation_timed_cancel (ActivateParameters *parameters)
+{
+	if (!parameters->timed_wait_active) {
+		activation_start_timed_cancel (parameters);
+	}
+}
+
+static void
 activate_mount_op_active (EelMountOperation *operation,
 			  gboolean is_active,
 			  ActivateParameters *parameters)
 {
 	if (is_active) {
-		if (parameters->timed_wait_active) {
-			eel_timed_wait_stop (cancel_activate_callback, parameters);
-			parameters->timed_wait_active = FALSE;
-		}
+		pause_activation_timed_cancel (parameters);
 	} else {
-		if (!parameters->timed_wait_active) {
-			activation_start_timed_cancel (parameters);
-		}
+		unpause_activation_timed_cancel (parameters);
 	}
 }
 
@@ -1048,7 +1060,9 @@
 			/* Special case for executable text files, since it might be
 			 * dangerous & unexpected to launch these.
 			 */
+			pause_activation_timed_cancel (parameters);
 			action = get_executable_text_file_action (parameters->parent_window, file);
+			unpause_activation_timed_cancel (parameters);
 		}
 
 		switch (action) {