callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't assert that there is a handler, so we don't crash if user clicks on

Browse Source 
* 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
This commit is contained in:
Ettore Perazzoli
2001-07-02 17:06:08 +00:00
parent b37c291e33
commit 7657ec4a52
8 changed files with 132 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
shell/evolution-test-component.c
View File

@ -55,10 +55,17 @@ static int progress = -1;
/* Callbacks. */
static void
activity_client_clicked_callback (EvolutionActivityClient *client,
void *data)
activity_client_cancel_callback (EvolutionActivityClient *client,
void *data)
{
g_warning ("Task bar button clicked!");
g_print ("User requested that the operation be cancelled.\n");
}
static void
activity_client_show_details_callback (EvolutionActivityClient *client,
void *data)
{
g_print ("User wants to see details.\n");
}
@ -112,15 +119,17 @@ timeout_callback_1 (void *data)
activity_client = evolution_activity_client_new (parent_shell, COMPONENT_ID,
animated_icon,
"Operation Foo started!",
FALSE,
TRUE,
&suggest_display);
if (activity_client == CORBA_OBJECT_NIL) {
g_warning ("Cannot create EvolutionActivityClient object");
return FALSE;
}
gtk_signal_connect (GTK_OBJECT (activity_client), "clicked",
GTK_SIGNAL_FUNC (activity_client_clicked_callback), NULL);
gtk_signal_connect (GTK_OBJECT (activity_client), "cancel",
GTK_SIGNAL_FUNC (activity_client_cancel_callback), NULL);
gtk_signal_connect (GTK_OBJECT (activity_client), "show_details",
GTK_SIGNAL_FUNC (activity_client_show_details_callback), NULL);
g_print ("Component becoming busy -- %s\n", COMPONENT_ID);
if (suggest_display)