aboutsummaryrefslogtreecommitdiffstats
path: root/shell/main.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-07-03 01:06:08 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-07-03 01:06:08 +0800
commit7657ec4a52ccbe53d039a70f74ec687d9fa662a7 (patch)
treeb5a759a9af265756eab9a762c718a2e6d60014b6 /shell/main.c
parentb37c291e33769b6019e512c212fdea50d4a2529f (diff)
downloadgsoc2013-evolution-7657ec4a52ccbe53d039a70f74ec687d9fa662a7.tar.gz
gsoc2013-evolution-7657ec4a52ccbe53d039a70f74ec687d9fa662a7.tar.zst
gsoc2013-evolution-7657ec4a52ccbe53d039a70f74ec687d9fa662a7.zip
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
Diffstat (limited to 'shell/main.c')
-rw-r--r--shell/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/shell/main.c b/shell/main.c
index c8e802b985..b4b1870a1f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -151,6 +151,7 @@ idle_cb (void *data)
e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Cannot access the Evolution shell."));
CORBA_exception_free (&ev);
+ gtk_main_quit ();
return FALSE;
}