Constify for new libical API. (set_text_list): Likewise.

2000-12-12  Federico Mena Quintero  <federico@helixcode.com>

	* cal-util/cal-component.c (get_text_list): Constify for new
	libical API.
	(set_text_list): Likewise.

	* cal-util/cal-recur.c (cal_recur_get_rule_end_date): Likewise.
	(cal_recur_set_rule_end_date): Likewise.

	* gui/e-itip-control.c (find_attendee): Likewise.
	(pstream_load): Likewise.

	* gui/gnome-cal.c (released_event_object_cb): Removed unused function.

	* gui/dialogs/task-editor.c (status_string_map): Removed unused
	variable.

svn path=/trunk/; revision=6943

6 files changed, 25 insertions, 39 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 30bd2bbd5c..992ae523b5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,20 @@
+2000-12-12  Federico Mena Quintero  <federico@helixcode.com>
+
+	* cal-util/cal-component.c (get_text_list): Constify for new
+	libical API.
+	(set_text_list): Likewise.
+
+	* cal-util/cal-recur.c (cal_recur_get_rule_end_date): Likewise.
+	(cal_recur_set_rule_end_date): Likewise.
+
+	* gui/e-itip-control.c (find_attendee): Likewise.
+	(pstream_load): Likewise.
+
+	* gui/gnome-cal.c (released_event_object_cb): Removed unused function.
+
+	* gui/dialogs/task-editor.c (status_string_map): Removed unused
+	variable.
+
 2000-12-11  Federico Mena Quintero  <federico@helixcode.com>
 
 	* cal-util/Makefile.am (test_recur_LDADD): Link to the libical
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
index cc920c19c6..823afaa663 100644
--- a/calendar/cal-util/cal-component.c
+++ b/calendar/cal-util/cal-component.c
@@ -1422,7 +1422,7 @@ cal_component_set_classification (CalComponent *comp, CalComponentClassification
 /* Gets a text list value */
 static void
 get_text_list (GSList *text_list,
-	       char *(* get_prop_func) (icalproperty *prop),
+	       const char *(* get_prop_func) (icalproperty *prop),
 	       GSList **tl)
 {
 	GSList *l;
@@ -1456,7 +1456,7 @@ get_text_list (GSList *text_list,
 /* Sets a text list value */
 static void
 set_text_list (CalComponent *comp,
-	       icalproperty *(* new_prop_func) (char *value),
+	       icalproperty *(* new_prop_func) (const char *value),
 	       GSList **text_list,
 	       GSList *tl)
 {
diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
index 043afddb3b..5746bfc5f2 100644
--- a/calendar/cal-util/cal-recur.c
+++ b/calendar/cal-util/cal-recur.c
@@ -3693,7 +3693,7 @@ static time_t
 cal_recur_get_rule_end_date	(icalproperty	*prop)
 {
 	icalparameter *param;
-	char *xname, *xvalue;
+	const char *xname, *xvalue;
 	icalvalue *value;
 	struct icaltimetype icaltime;
 
@@ -3727,7 +3727,7 @@ cal_recur_set_rule_end_date	(icalproperty	*prop,
 	icalparameter *param;
 	icalvalue *value;
 	struct icaltimetype icaltime;
-	char *end_date_string, *xname;
+	const char *end_date_string, *xname;
 
 	icaltime = icaltime_from_timet (end_date, FALSE, FALSE);
 	value = icalvalue_new_datetime (icaltime);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 6114ffa529..60a9bdd60a 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -98,15 +98,6 @@ static const int status_map[] = {
 	-1
 };
 
-static const char* status_string_map[] = {
-	"NEEDS-ACTION",
-	"IN-PROCESS",
-	"COMPLETED",
-	"CANCELLED",
-	NULL
-};
-
-
 typedef enum {
 	PRIORITY_HIGH,
 	PRIORITY_NORMAL,
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index ced1431292..8e1ee0df22 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -63,7 +63,7 @@ static icalproperty *
 find_attendee (icalcomponent *comp, char *address)
 {
 	icalproperty *prop;
-	char *attendee, *text;
+	const char *attendee, *text;
 	icalvalue *value;
 	
 	for (prop = icalcomponent_get_first_property (comp, ICAL_ATTENDEE_PROPERTY);
@@ -685,8 +685,9 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
 	 all the things I'll show in my control. */
 	{
 		icalproperty *prop;
-		gchar *new_text;
-		gchar *organizer, *description, *summary;
+		const char *description, *summary;
+		const char *new_text;
+		const char *organizer;
 		struct icaltimetype dtstart, dtend;
 		time_t tstart, tend;
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 3b16c46f70..bbc0e0e1b9 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1702,29 +1702,6 @@ gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
 }
 
 
-/* Callback used when an event editor finishes editing an object */
-static void
-released_event_object_cb (EventEditor *ee, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gboolean result;
-	gpointer orig_key;
-	char *orig_uid;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	result = g_hash_table_lookup_extended (priv->object_editor_hash, uid, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uid = orig_key;
-
-	g_hash_table_remove (priv->object_editor_hash, orig_uid);
-	g_free (orig_uid);
-}
-
-
 /* Callback used when an event editor dialog is closed */
 struct editor_closure
 {