aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-activity-handler.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 60e68f2961..497d6c1902 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2001-10-23 Ettore Perazzoli <ettore@ximian.com>
+ * e-activity-handler.c (show_cancellation_popup): #if 0'ed for
+ now, per #7427.
+
+2001-10-23 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-view.c (storage_set_removed_folder_callback): Explicitly
deactivate the control frame, and display the default URI before
destroying the dead one.
diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c
index 6b4846a712..611d318378 100644
--- a/shell/e-activity-handler.c
+++ b/shell/e-activity-handler.c
@@ -190,6 +190,7 @@ task_widget_show_details_callback (GtkWidget *widget,
report_task_event (activity_info, "ShowDetails");
}
+#if 0
static void
show_cancellation_popup (ActivityInfo *activity_info,
GtkWidget *task_widget,
@@ -213,6 +214,7 @@ show_cancellation_popup (ActivityInfo *activity_info,
activity_info->menu = NULL;
}
+#endif
static int
task_widget_button_press_event_callback (GtkWidget *widget,
@@ -229,7 +231,8 @@ task_widget_button_press_event_callback (GtkWidget *widget,
if (! activity_info->cancellable) {
return FALSE;
} else {
- show_cancellation_popup (activity_info, widget, button_event);
+ /* show_cancellation_popup (activity_info, widget, button_event); */
+ /* return TRUE; */
return TRUE;
}
}