From 7657ec4a52ccbe53d039a70f74ec687d9fa662a7 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 2 Jul 2001 17:06:08 +0000 Subject: Don't assert that there is a handler, so we don't crash if user clicks on * e-storage-set-view.c (popup_folder_menu): Don't assert that there is a handler, so we don't crash if user clicks on a folder whose type we cannot handle for some reason [such as an uninstalled component]. * evolution-test-component.c (activity_client_cancel_callback): New callback for the "cancel" signal on the EvolutionActivityClient object. (activity_client_show_details_callback): New callback for the "show_details" signal. (timeout_callback_1): Connect these two signal handlers. * e-activity-handler.c (task_widget_button_press_event_callback): Ahem, right-click is button 3, not button 2. (show_cancellation_popup): Actually pop up the menu. (get_corba_null_value): New helper function to create a CORBA_any null value. (report_task_event): New helper function to report events to the listener. (task_widget_cancel_callback): Use it. Report "Cancel" instead of "Cancelled". (task_widget_show_details_callback): New, callback for the "Show Details" right-click menu item. * evolution-activity-client.c: Updated to dispatch the "Cancel" and "ShowDetails" events as "cancel" and "show_details" signals. (class_init): Install the signals. (listener_callback): Updated to update the signals corresponding to the "ShowDetails" and "Cancel" events. * Evolution-Activity.idl: Changed the docs about the events sent to the Bonobo::Listener. We now only have "ShowDetails" and "Cancelled". * evolution-test-component.c (timeout_callback_1): Make the activity cancellable so we can test the right-click cancel menu too. * main.c (idle_cb): Actually exit if we cannot reach to the shell. svn path=/trunk/; revision=10684 --- shell/e-storage-set-view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shell/e-storage-set-view.c') diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index fc4872f9b1..c0f4aee7f7 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -716,7 +716,8 @@ popup_folder_menu (EStorageSetView *storage_set_view, handler = e_folder_type_registry_get_handler_for_type (folder_type_registry, e_folder_get_type_string (folder)); - g_assert (handler != NULL); + if (handler == NULL) + return; menu = gtk_menu_new (); bonobo_window_add_popup (bonobo_ui_container_get_win (priv->container), -- cgit v1.2.3