aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog12
-rw-r--r--calendar/cal-util/cal-component.c6
-rw-r--r--calendar/cal-util/cal-component.h4
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c3
-rw-r--r--calendar/gui/itip-utils.c6
5 files changed, 22 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 61f163101b..f7e86ff042 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2002-05-14 JP Rosevear <jpr@ximian.com>
+
+ * cal-util/cal-component.h: make the range datetime member a
+ struct not a pointer
+
+ * cal-util/cal-component.c (cal_component_get_recurid): take a
+ pointer to a range
+ (cal_component_set_recurid): ditto
+
+ * gui/itip-utils.c (comp_minimal): get/set the recurrence id
+ properly
+
2002-05-09 Ettore Perazzoli <ettore@ximian.com>
* gui/e-itip-control.c (get_servers): use
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
index 513c98673e..a618e0ef4b 100644
--- a/calendar/cal-util/cal-component.c
+++ b/calendar/cal-util/cal-component.c
@@ -3179,7 +3179,7 @@ cal_component_set_priority (CalComponent *comp, int *priority)
* Queries the recurrence id property of a calendar component object
**/
void
-cal_component_get_recurid (CalComponent *comp, CalComponentRange **recur_id)
+cal_component_get_recurid (CalComponent *comp, CalComponentRange *recur_id)
{
CalComponentPrivate *priv;
@@ -3192,7 +3192,7 @@ cal_component_get_recurid (CalComponent *comp, CalComponentRange **recur_id)
get_datetime (&priv->recur_id.recur_time,
icalproperty_get_recurrenceid,
- (*recur_id)->datetime);
+ &recur_id->datetime);
}
/**
@@ -3216,7 +3216,7 @@ cal_component_set_recurid (CalComponent *comp, CalComponentRange *recur_id)
set_datetime (comp, &priv->recur_id.recur_time,
icalproperty_new_recurrenceid,
icalproperty_set_recurrenceid,
- recur_id->datetime);
+ &recur_id->datetime);
}
/**
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
index ad2dac7e48..4961c504e4 100644
--- a/calendar/cal-util/cal-component.h
+++ b/calendar/cal-util/cal-component.h
@@ -132,7 +132,7 @@ typedef enum {
typedef struct {
CalComponentRangeType type;
- CalComponentDateTime *datetime;
+ CalComponentDateTime datetime;
} CalComponentRange;
/* Text properties */
@@ -281,7 +281,7 @@ void cal_component_set_percent (CalComponent *comp, int *percent);
void cal_component_get_priority (CalComponent *comp, int **priority);
void cal_component_set_priority (CalComponent *comp, int *priority);
-void cal_component_get_recurid (CalComponent *comp, CalComponentRange **recur_id);
+void cal_component_get_recurid (CalComponent *comp, CalComponentRange *recur_id);
void cal_component_set_recurid (CalComponent *comp, CalComponentRange *recur_id);
void cal_component_get_rdate_list (CalComponent *comp, GSList **period_list);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 2e61fc0bd5..639738c3bc 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -318,7 +318,8 @@ config_control_destroy_callback (GtkObject *object,
dialog_data = (DialogData *) data;
- /* (Nothing to free in the struct.) */
+ gtk_object_unref (GTK_OBJECT (dialog_data->xml));
+
g_free (dialog_data);
}
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index ee0d78b0b6..7e9efdbb57 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -601,7 +601,7 @@ comp_minimal (CalComponent *comp, gboolean attendee)
const char *uid;
GSList *comments;
struct icaltimetype itt;
- CalComponentRange *recur_id;
+ CalComponentRange recur_id;
clone = cal_component_new ();
cal_component_set_new_vtype (clone, cal_component_get_vtype (comp));
@@ -644,8 +644,8 @@ comp_minimal (CalComponent *comp, gboolean attendee)
cal_component_free_text_list (comments);
cal_component_get_recurid (comp, &recur_id);
- if (recur_id->datetime->value != NULL)
- cal_component_set_recurid (clone, recur_id);
+ if (recur_id.datetime.value != NULL)
+ cal_component_set_recurid (clone, &recur_id);
icomp = cal_component_get_icalcomponent (comp);
icomp_clone = cal_component_get_icalcomponent (clone);