return fill_component success

2001-10-12  JP Rosevear  <jpr@ximian.com>

	* gui/dialogs/alarm-page.c: return fill_component success

	* gui/dialogs/task-page.c: ditto

	* gui/dialogs/task-details-page.c: ditto

	* gui/dialogs/schedule-page.c: ditto

	* gui/dialogs/recurrence-page.c: ditto

	* gui/dialogs/event-page.c: ditto

	* gui/dialogs/meeting-page.c: use e_notice instead of
	duplicate_error
	(meeting_page_get_cancel_comp): duh, deleted_attendees is an array
	now
	(meeting_page_fill_component): spew gui errors if there is no
	organizer or no attendees, return success

	* gui/dialogs/event-editor.c (event_editor_send_comp): always call
	parent method and don't send the cancellation comp if the method
	is publish
	(refresh_meeting_cmd): use the orginal comp to refresh
	(forward_cmd): prompt the user for the version they want to send
	(current, original)

	* gui/dialogs/task-editor.c (forward_cmd): as above
	(refresh_task_cmd): ditto

	* gui/dialogs/comp-editor-page.c
	(comp_editor_page_fill_component): return boolean of whether the
	component could be filled or not

	* gui/dialogs/comp-editor-page.h: update proto

	* gui/dialogs/comp-editor.c (prompt_to_save_changes): take a param
	on whether to try and send or not
	(comp_editor_get_current_comp): only fill component if its changed
	(comp_editor_save_comp): prompt user as well

	* gui/dialogs/comp-editor.h: change proto

	* gui/itip-utils.c: replace error_dialog with e_notice
	(comp_content_type): specify charset

svn path=/trunk/; revision=13635

1 files changed, 8 insertions, 15 deletions

diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 9180fbc400..356690855a 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -32,9 +32,8 @@
 #include <bonobo-conf/bonobo-config-database.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
 #include <gtk/gtkwidget.h>
+#include <gal/widgets/e-gui-utils.h>
 #include <gal/util/e-util.h>
 #include <e-util/e-unicode-i18n.h>
 #include <ical.h>
@@ -69,15 +68,6 @@ static icalproperty_method itip_methods_enum[] = {
     ICAL_METHOD_DECLINECOUNTER,
 };
 
-static void
-error_dialog (gchar *str) 
-{
-	GtkWidget *dlg;
-	
-	dlg = gnome_error_dialog (str);
-	gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-}
-
 static Bonobo_ConfigDatabase db = NULL;
 
 static ItipAddress *
@@ -250,7 +240,8 @@ comp_to_list (CalComponentItipMethod method, CalComponent *comp)
 		cal_component_get_attendee_list (comp, &attendees);
 		len = g_slist_length (attendees);
 		if (len <= 0) {
-			error_dialog (_("Atleast one attendee is necessary"));
+			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
+				  _("Atleast one attendee is necessary"));
 			cal_component_free_attendee_list (attendees);
 			return NULL;
 		}
@@ -280,7 +271,8 @@ comp_to_list (CalComponentItipMethod method, CalComponent *comp)
 	case CAL_COMPONENT_METHOD_DECLINECOUNTER:
 		cal_component_get_organizer (comp, &organizer);
 		if (organizer.value == NULL) {
-			error_dialog (_("An organizer must be set."));
+			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
+				  _("An organizer must be set."));
 			return NULL;
 		}
 		
@@ -336,7 +328,7 @@ comp_content_type (CalComponentItipMethod method)
 {
 	char tmp[256];	
 
-	sprintf (tmp, "text/calendar;METHOD=%s", itip_methods[method]);
+	sprintf (tmp, "text/calendar; charset=utf-8; METHOD=%s", itip_methods[method]);
 	return CORBA_string_dup (tmp);
 
 }
@@ -575,7 +567,8 @@ comp_minimal (CalComponent *comp, gboolean attendee)
 		cal_component_set_attendee_list (clone, attendees);
 
 		if (!comp_limit_attendees (clone)) {
-			error_dialog ("You are not an attendee!");
+			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
+				  _("You must be an attendee of the event."));
 			goto error;
 		}
 	}