diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/dialogs/meeting-page.c | 5 | ||||
| -rw-r--r-- | calendar/gui/itip-utils.c | 18 |
3 files changed, 19 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index ae5e563440..b7775328b2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2003-04-17 JP Rosevear <jpr@ximian.com> + + Fixes #41459 + + * gui/dialogs/meeting-page.c: comment out delegation stuff + 2003-04-17 Rodrigo Moya <rodrigo@ximian.com> Fixes #34498 diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index e786945f5f..e07724e34d 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -598,6 +598,7 @@ init_widgets (MeetingPage *mpage) G_CALLBACK (invite_cb), mpage); } +#if 0 static void popup_delegate_cb (GtkWidget *widget, gpointer data) { @@ -656,6 +657,7 @@ popup_delegate_cb (GtkWidget *widget, gpointer data) g_free (address); g_object_unref((edd)); } +#endif static void popup_delete_cb (GtkWidget *widget, gpointer data) @@ -705,10 +707,11 @@ enum { }; static EPopupMenu context_menu[] = { +#if 0 E_POPUP_ITEM (N_("_Delegate To..."), G_CALLBACK (popup_delegate_cb), CAN_DELEGATE), E_POPUP_SEPARATOR, - +#endif E_POPUP_ITEM (N_("_Delete"), G_CALLBACK (popup_delete_cb), CAN_DELETE), E_POPUP_TERMINATOR diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 0360a3ca85..3e1759b02c 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -839,14 +839,6 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp, CORBA_exception_init (&ev); - /* Obtain an object reference for the Composer. */ - composer_server = bonobo_activation_activate_from_id (GNOME_EVOLUTION_COMPOSER_OAFIID, 0, NULL, &ev); - if (BONOBO_EX (&ev)) { - g_warning ("Could not activate composer: %s", bonobo_exception_get_text (&ev)); - CORBA_exception_free (&ev); - return FALSE; - } - /* Give the server a chance to manipulate the comp */ if (method != CAL_COMPONENT_METHOD_PUBLISH) { if (!comp_server_send (method, send_comp, client, zones, &users)) @@ -867,7 +859,7 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp, goto cleanup; } } - + cc_list = GNOME_Evolution_Composer_RecipientList__alloc (); cc_list->_maximum = cc_list->_length = 0; bcc_list = GNOME_Evolution_Composer_RecipientList__alloc (); @@ -879,6 +871,14 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp, /* From address */ from = comp_from (method, comp); + /* Obtain an object reference for the Composer. */ + composer_server = bonobo_activation_activate_from_id (GNOME_EVOLUTION_COMPOSER_OAFIID, 0, NULL, &ev); + if (BONOBO_EX (&ev)) { + g_warning ("Could not activate composer: %s", bonobo_exception_get_text (&ev)); + CORBA_exception_free (&ev); + return FALSE; + } + /* Set recipients, subject */ GNOME_Evolution_Composer_setHeaders (composer_server, from, to_list, cc_list, bcc_list, subject, &ev); if (BONOBO_EX (&ev)) { |