aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/itip-utils.c17
2 files changed, 18 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 935ffee51f..ad958f220c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-05 JP Rosevear <jpr@ximian.com>
+
+ * gui/itip-utils.c (itip_send_comp): don't try to send via the
+ server if we are publishing; don't bail out on a 0 length to list
+ if we are publishing
+
2002-09-05 Anna Marie Dirks <anna@ximian.com>
* gui/GNOME_Evolution_Calendar.oaf.in: Changed the description of
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index e388634e93..b75be1b484 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -809,9 +809,11 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp,
composer_server = BONOBO_OBJREF (bonobo_server);
/* Give the server a chance to manipulate the comp */
- if (!comp_server_send (method, send_comp, client, zones, &users))
- goto cleanup;
-
+ if (method != CAL_COMPONENT_METHOD_PUBLISH) {
+ if (!comp_server_send (method, send_comp, client, zones, &users))
+ goto cleanup;
+ }
+
/* Tidy up the comp */
comp = comp_compliant (method, send_comp);
if (comp == NULL)
@@ -819,8 +821,13 @@ itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp,
/* Recipients */
to_list = comp_to_list (method, comp, users);
- if (to_list == NULL || to_list->_length == 0)
- goto cleanup;
+ if (method != CAL_COMPONENT_METHOD_PUBLISH) {
+ if (to_list == NULL || to_list->_length == 0) {
+ /* We sent them all via the server */
+ retval = TRUE;
+ goto cleanup;
+ }
+ }
cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
cc_list->_maximum = cc_list->_length = 0;