aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-util
diff options
context:
space:
mode:
authorArturo Espinosa <unammx@src.gnome.org>1998-04-04 10:44:29 +0800
committerArturo Espinosa <unammx@src.gnome.org>1998-04-04 10:44:29 +0800
commitf4295ffe09c2994a93eff4d4c73505f2bc291a59 (patch)
treeea15367750bae25c44a3fa79d241f5fb43ebad54 /calendar/cal-util
parent1be7718e7d14edf3b4501de53fd600af1a53a156 (diff)
downloadgsoc2013-evolution-f4295ffe09c2994a93eff4d4c73505f2bc291a59.tar
gsoc2013-evolution-f4295ffe09c2994a93eff4d4c73505f2bc291a59.tar.gz
gsoc2013-evolution-f4295ffe09c2994a93eff4d4c73505f2bc291a59.tar.bz2
gsoc2013-evolution-f4295ffe09c2994a93eff4d4c73505f2bc291a59.tar.lz
gsoc2013-evolution-f4295ffe09c2994a93eff4d4c73505f2bc291a59.tar.xz
gsoc2013-evolution-f4295ffe09c2994a93eff4d4c73505f2bc291a59.tar.zst
gsoc2013-evolution-f4295ffe09c2994a93eff4d4c73505f2bc291a59.zip
Lots -mig
svn path=/trunk/; revision=103
Diffstat (limited to 'calendar/cal-util')
-rw-r--r--calendar/cal-util/calobj.c61
-rw-r--r--calendar/cal-util/calobj.h38
2 files changed, 83 insertions, 16 deletions
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c
index f405dbe265..004ba7636d 100644
--- a/calendar/cal-util/calobj.c
+++ b/calendar/cal-util/calobj.c
@@ -24,6 +24,27 @@ ical_object_new (void)
return ico;
}
+static void
+default_alarm (iCalObject *ical, CalendarAlarm *alarm, char *def_mail, enum AlarmType type)
+{
+ alarm->enabled = 0;
+ alarm->type = type;
+
+ if (type != ALARM_MAIL){
+ alarm->count = 15;
+ alarm->units = ALARM_MINUTES;
+ } else {
+ printf ("uno!\n");
+ alarm->count = 1;
+ alarm->units = ALARM_DAYS;
+ }
+
+ if (type == ALARM_MAIL)
+ alarm->data = g_strdup (def_mail);
+ else
+ alarm->data = g_strdup ("");
+}
+
iCalObject *
ical_new (char *comment, char *organizer, char *summary)
{
@@ -34,18 +55,43 @@ ical_new (char *comment, char *organizer, char *summary)
ico->comment = g_strdup (comment);
ico->organizer = g_strdup (organizer);
ico->summary = g_strdup (summary);
+ ico->class = g_strdup ("PUBLIC");
+ default_alarm (ico, &ico->dalarm, organizer, ALARM_DISPLAY);
+ default_alarm (ico, &ico->palarm, organizer, ALARM_PROGRAM);
+ default_alarm (ico, &ico->malarm, organizer, ALARM_MAIL);
+ default_alarm (ico, &ico->aalarm, organizer, ALARM_AUDIO);
+
return ico;
}
-#define free_if_defined(x) if (x){ g_free (x); x = 0; }
+static void
+list_free (GList *list)
+{
+ g_list_foreach (list, g_free, 0);
+ g_list_free (list);
+}
+#define free_if_defined(x) if (x){ g_free (x); x = 0; }
+#define lfree_if_defined(x) if (x){ list_free (x); x = 0; }
void
ical_object_destroy (iCalObject *ico)
{
- free_if_defined (ico->comment);
- free_if_defined (ico->organizer);
- free_if_defined (ico->summary);
+ /* Regular strings */
+ free_if_defined (ico->comment);
+ free_if_defined (ico->organizer);
+ free_if_defined (ico->summary);
+ free_if_defined (ico->uid);
+ free_if_defined (ico->status);
+ free_if_defined (ico->class);
+ free_if_defined (ico->url);
+
+ /* Lists */
+ lfree_if_defined (ico->exdate);
+ lfree_if_defined (ico->categories);
+ lfree_if_defined (ico->resources);
+ lfree_if_defined (ico->related);
+ lfree_if_defined (ico->attach);
g_free (ico);
}
@@ -83,6 +129,7 @@ ical_object_create_from_vobject (VObject *o, const char *object_name)
ical->type = ICAL_TODO;
else
return 0;
+
/* uid */
if (has (o, VCUniqueStringProp))
ical->uid = g_strdup (str_val (vo));
@@ -123,9 +170,9 @@ ical_object_create_from_vobject (VObject *o, const char *object_name)
if (has (o, VCExpDateProp))
ical->exdate = set_list (str_val (vo), ",");
- /* description */
+ /* description/comment */
if (has (o, VCDescriptionProp))
- ical->description = g_strdup (str_val (vo));
+ ical->comment = g_strdup (str_val (vo));
/* summary */
if (has (o, VCSummaryProp))
@@ -142,7 +189,7 @@ ical_object_create_from_vobject (VObject *o, const char *object_name)
if (has (o, VCClassProp))
ical->class = g_strdup (str_val (vo));
else
- ical->status = g_strdup ("PUBLIC");
+ ical->class = "PUBLIC";
/* categories */
if (has (o, VCCategoriesProp))
diff --git a/calendar/cal-util/calobj.h b/calendar/cal-util/calobj.h
index b16fe5f850..00dbd5c63e 100644
--- a/calendar/cal-util/calobj.h
+++ b/calendar/cal-util/calobj.h
@@ -12,11 +12,32 @@
BEGIN_GNOME_DECLS
+enum AlarmType {
+ ALARM_MAIL,
+ ALARM_PROGRAM,
+ ALARM_DISPLAY,
+ ALARM_AUDIO
+};
+
+enum AlarmUnit {
+ ALARM_MINUTES,
+ ALARM_HOURS,
+ ALARM_DAYS
+};
+
typedef struct {
- char *alarm_audio_file;
- char *alarm_script;
- char *alarm_email;
- char *alarm_text; /* Text to be displayed */
+ enum AlarmType type;
+ int enabled;
+ int count;
+ enum AlarmUnit units;
+ char *data;
+
+ /* Widgets */
+ void *w_count; /* A GtkEntry */
+ void *w_enabled; /* A GtkChecButton */
+ void *w_timesel; /* A GtkMenu */
+ void *w_entry; /* A GnomeEntryFile/GtkEntry for PROGRAM/MAIL */
+ void *w_label;
} CalendarAlarm;
/* Calendar object type */
@@ -65,7 +86,6 @@ typedef struct {
time_t completed;
time_t created;
GList *contact; /* type: one or more TEXT */
- char *description;
time_t dtstamp;
time_t dtstart;
time_t dtend;
@@ -90,10 +110,10 @@ typedef struct {
char *url;
time_t recurid;
- CalendarAlarm *dalarm;
- CalendarAlarm *aalarm;
- CalendarAlarm *palarm;
- CalendarAlarm *malarm;
+ CalendarAlarm dalarm;
+ CalendarAlarm aalarm;
+ CalendarAlarm palarm;
+ CalendarAlarm malarm;
} iCalObject;
iCalObject *ical_new (char *comment, char *organizer, char *summary);