Commit e447872c authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Don't show timeout-based cancel when showing the "run or display" dialog.

2008-10-20  Alexander Larsson  <alexl@redhat.com>

        * 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)


svn path=/trunk/; revision=14743
parent ebcfabf0
2008-10-20 Alexander Larsson <alexl@redhat.com>
* 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)
2008-10-18 Cosimo Cecchi <cosimoc@gnome.org> 2008-10-18 Cosimo Cecchi <cosimoc@gnome.org>
* libnautilus-private/apps_nautilus_preferences.schemas.in: * libnautilus-private/apps_nautilus_preferences.schemas.in:
......
...@@ -955,6 +955,24 @@ activation_start_timed_cancel (ActivateParameters *parameters) ...@@ -955,6 +955,24 @@ activation_start_timed_cancel (ActivateParameters *parameters)
parameters->parent_window); parameters->parent_window);
} }
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 static void
activate_mount_op_active (GtkMountOperation *operation, activate_mount_op_active (GtkMountOperation *operation,
GParamSpec *pspec, GParamSpec *pspec,
...@@ -965,14 +983,9 @@ activate_mount_op_active (GtkMountOperation *operation, ...@@ -965,14 +983,9 @@ activate_mount_op_active (GtkMountOperation *operation,
g_object_get (operation, "is-showing", &is_active, NULL); g_object_get (operation, "is-showing", &is_active, NULL);
if (is_active) { if (is_active) {
if (parameters->timed_wait_active) { pause_activation_timed_cancel (parameters);
eel_timed_wait_stop (cancel_activate_callback, parameters);
parameters->timed_wait_active = FALSE;
}
} else { } else {
if (!parameters->timed_wait_active) { unpause_activation_timed_cancel (parameters);
activation_start_timed_cancel (parameters);
}
} }
} }
...@@ -1051,7 +1064,9 @@ activate_files (ActivateParameters *parameters) ...@@ -1051,7 +1064,9 @@ activate_files (ActivateParameters *parameters)
/* Special case for executable text files, since it might be /* Special case for executable text files, since it might be
* dangerous & unexpected to launch these. * dangerous & unexpected to launch these.
*/ */
pause_activation_timed_cancel (parameters);
action = get_executable_text_file_action (parameters->parent_window, file); action = get_executable_text_file_action (parameters->parent_window, file);
unpause_activation_timed_cancel (parameters);
} }
switch (action) { switch (action) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment