aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorArturo Espinosa <unammx@src.gnome.org>1998-04-21 03:53:21 +0800
committerArturo Espinosa <unammx@src.gnome.org>1998-04-21 03:53:21 +0800
commit3acbe7a46f8c3af807ed56b997e2995e45a2fafe (patch)
tree0e65ffe30cbe1cbe59fd3032fa49cfe428b1a016 /calendar
parent26e5915000652f4807e337a2b370ce0051972f04 (diff)
downloadgsoc2013-evolution-3acbe7a46f8c3af807ed56b997e2995e45a2fafe.tar
gsoc2013-evolution-3acbe7a46f8c3af807ed56b997e2995e45a2fafe.tar.gz
gsoc2013-evolution-3acbe7a46f8c3af807ed56b997e2995e45a2fafe.tar.bz2
gsoc2013-evolution-3acbe7a46f8c3af807ed56b997e2995e45a2fafe.tar.lz
gsoc2013-evolution-3acbe7a46f8c3af807ed56b997e2995e45a2fafe.tar.xz
gsoc2013-evolution-3acbe7a46f8c3af807ed56b997e2995e45a2fafe.tar.zst
gsoc2013-evolution-3acbe7a46f8c3af807ed56b997e2995e45a2fafe.zip
more fixes -mig
svn path=/trunk/; revision=169
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog3
-rw-r--r--calendar/cal-util/calobj.c3
-rw-r--r--calendar/calobj.c3
-rw-r--r--calendar/eventedit.c1
-rw-r--r--calendar/gui/eventedit.c1
-rw-r--r--calendar/gui/main.c4
-rw-r--r--calendar/main.c4
-rw-r--r--calendar/pcs/calobj.c3
8 files changed, 18 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e1c77f2554..b0943c052f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,8 @@
1998-04-20 Miguel de Icaza <miguel@nuclecu.unam.mx>
+ * calobj.c (duration_callback): Take exception dates into
+ account.
+
* gncal-full-day.c (new_appointment): Setup the event editor dates
to those of the currently displayed day.
(gncal_full_day_selection_range): Use sensible values in the case
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c
index f298c2caf3..b57f660a7b 100644
--- a/calendar/cal-util/calobj.c
+++ b/calendar/cal-util/calobj.c
@@ -1112,6 +1112,9 @@ duration_callback (iCalObject *ico, time_t start, time_t end, void *closure)
{
int *count = closure;
+ if (ico->exdate && is_date_in_list (ico->exdate, &start))
+ return;
+
(*count)++;
if (ico->recur->duration == *count) {
ico->recur->enddate = time_end_of_day (end);
diff --git a/calendar/calobj.c b/calendar/calobj.c
index f298c2caf3..b57f660a7b 100644
--- a/calendar/calobj.c
+++ b/calendar/calobj.c
@@ -1112,6 +1112,9 @@ duration_callback (iCalObject *ico, time_t start, time_t end, void *closure)
{
int *count = closure;
+ if (ico->exdate && is_date_in_list (ico->exdate, &start))
+ return;
+
(*count)++;
if (ico->recur->duration == *count) {
ico->recur->enddate = time_end_of_day (end);
diff --git a/calendar/eventedit.c b/calendar/eventedit.c
index de5da85fa6..94096841db 100644
--- a/calendar/eventedit.c
+++ b/calendar/eventedit.c
@@ -714,6 +714,7 @@ ee_ok (GtkWidget *widget, EventEditor *ee)
else
gnome_calendar_object_changed (ee->gnome_cal, ee->ical, CHANGE_ALL);
+ ee->ical->new = 0;
gtk_widget_destroy (GTK_WIDGET (ee));
}
diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c
index de5da85fa6..94096841db 100644
--- a/calendar/gui/eventedit.c
+++ b/calendar/gui/eventedit.c
@@ -714,6 +714,7 @@ ee_ok (GtkWidget *widget, EventEditor *ee)
else
gnome_calendar_object_changed (ee->gnome_cal, ee->ical, CHANGE_ALL);
+ ee->ical->new = 0;
gtk_widget_destroy (GTK_WIDGET (ee));
}
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 75ad4b1e70..92c68898e8 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -379,9 +379,9 @@ process_dates (void)
static struct argp_option argp_options [] = {
{ "events", 'e', NULL, 0, N_("Show events and quit"), 0 },
- { "from ", 'f', N_("FROM"), 0, N_("Specifies start date [for --events]"), 1 },
+ { "from", 'f', N_("DATE"), 0, N_("Specifies start date [for --events]"), 1 },
{ "file", 'F', N_("FILE"), 0, N_("File to load calendar from"), 1 },
- { "to", 't', N_("TO"), 0, N_("Specifies ending date [for --events]"), 1 },
+ { "to", 't', N_("DATE"), 0, N_("Specifies ending date [for --events]"), 1 },
{ NULL, 0, NULL, 0, NULL, 0 },
};
diff --git a/calendar/main.c b/calendar/main.c
index 75ad4b1e70..92c68898e8 100644
--- a/calendar/main.c
+++ b/calendar/main.c
@@ -379,9 +379,9 @@ process_dates (void)
static struct argp_option argp_options [] = {
{ "events", 'e', NULL, 0, N_("Show events and quit"), 0 },
- { "from ", 'f', N_("FROM"), 0, N_("Specifies start date [for --events]"), 1 },
+ { "from", 'f', N_("DATE"), 0, N_("Specifies start date [for --events]"), 1 },
{ "file", 'F', N_("FILE"), 0, N_("File to load calendar from"), 1 },
- { "to", 't', N_("TO"), 0, N_("Specifies ending date [for --events]"), 1 },
+ { "to", 't', N_("DATE"), 0, N_("Specifies ending date [for --events]"), 1 },
{ NULL, 0, NULL, 0, NULL, 0 },
};
diff --git a/calendar/pcs/calobj.c b/calendar/pcs/calobj.c
index f298c2caf3..b57f660a7b 100644
--- a/calendar/pcs/calobj.c
+++ b/calendar/pcs/calobj.c
@@ -1112,6 +1112,9 @@ duration_callback (iCalObject *ico, time_t start, time_t end, void *closure)
{
int *count = closure;
+ if (ico->exdate && is_date_in_list (ico->exdate, &start))
+ return;
+
(*count)++;
if (ico->recur->duration == *count) {
ico->recur->enddate = time_end_of_day (end);