callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fixes -mig

Browse Source 
svn path=/trunk/; revision=169
This commit is contained in:
Arturo Espinosa
1998-04-20 19:53:21 +00:00
parent 26e5915000
commit 3acbe7a46f
8 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/ChangeLog
View File

@ -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

3
calendar/cal-util/calobj.c
View File

@ -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);

3
calendar/calobj.c
View File

@ -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);

1
calendar/eventedit.c
View File

@ -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));
}

1
calendar/gui/eventedit.c
View File

@ -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));
}

4
calendar/gui/main.c
View File

@ -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 },
};

4
calendar/main.c
View File

@ -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 },
};

3
calendar/pcs/calobj.c
View File

@ -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);