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

Final steps.

Browse Source 
svn path=/trunk/; revision=157
This commit is contained in:
Arturo Espinosa
1998-04-18 04:40:59 +00:00
parent d4f4dc26fc
commit 6329a627a9
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -771,8 +771,7 @@ ical_object_to_vobject (iCalObject *ical)
store_list (o, VCExpDateProp, ical->exdate, ','); store_list (o, VCExpDateProp, ical->exdate, ',');
/* description/comment */ /* description/comment */
if (ical->comment) addPropValue (o, VCDescriptionProp, ical->comment ? ical->comment : "No Comment");
addPropValue (o, VCDescriptionProp, ical->comment);
/* summary */ /* summary */
if (ical->summary) if (ical->summary)

3
calendar/calobj.c
View File

@ -771,8 +771,7 @@ ical_object_to_vobject (iCalObject *ical)
store_list (o, VCExpDateProp, ical->exdate, ','); store_list (o, VCExpDateProp, ical->exdate, ',');
/* description/comment */ /* description/comment */
if (ical->comment) addPropValue (o, VCDescriptionProp, ical->comment ? ical->comment : "No Comment");
addPropValue (o, VCDescriptionProp, ical->comment);
/* summary */ /* summary */
if (ical->summary) if (ical->summary)

12
calendar/gui/main.c
View File

@ -309,6 +309,13 @@ setup_menu (GtkWidget *gcal)
gnome_app_create_toolbar_with_data (GNOME_APP (gcal), gnome_toolbar, gcal); gnome_app_create_toolbar_with_data (GNOME_APP (gcal), gnome_toolbar, gcal);
} }
static gint
calendar_close_event (GtkWidget *widget, GdkEvent *event, GnomeCalendar *gcal)
{
close_cmd (widget, gcal);
return TRUE;
}
static void static void
new_calendar (char *full_name, char *calendar_file) new_calendar (char *full_name, char *calendar_file)
{ {
@ -324,7 +331,12 @@ new_calendar (char *full_name, char *calendar_file)
if (calendar_file && g_file_exists (calendar_file)) { if (calendar_file && g_file_exists (calendar_file)) {
printf ("Trying to load %s\n", calendar_file); printf ("Trying to load %s\n", calendar_file);
gnome_calendar_load (GNOME_CALENDAR (toplevel), calendar_file); gnome_calendar_load (GNOME_CALENDAR (toplevel), calendar_file);
} else {
GNOME_CALENDAR (toplevel)->cal->filename = g_strdup (calendar_file);
} }
gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event",
GTK_SIGNAL_FUNC(calendar_close_event), toplevel);
active_calendars++; active_calendars++;
all_calendars = g_list_prepend (all_calendars, toplevel); all_calendars = g_list_prepend (all_calendars, toplevel);
gtk_widget_show (toplevel); gtk_widget_show (toplevel);

12
calendar/main.c
View File

@ -309,6 +309,13 @@ setup_menu (GtkWidget *gcal)
gnome_app_create_toolbar_with_data (GNOME_APP (gcal), gnome_toolbar, gcal); gnome_app_create_toolbar_with_data (GNOME_APP (gcal), gnome_toolbar, gcal);
} }
static gint
calendar_close_event (GtkWidget *widget, GdkEvent *event, GnomeCalendar *gcal)
{
close_cmd (widget, gcal);
return TRUE;
}
static void static void
new_calendar (char *full_name, char *calendar_file) new_calendar (char *full_name, char *calendar_file)
{ {
@ -324,7 +331,12 @@ new_calendar (char *full_name, char *calendar_file)
if (calendar_file && g_file_exists (calendar_file)) { if (calendar_file && g_file_exists (calendar_file)) {
printf ("Trying to load %s\n", calendar_file); printf ("Trying to load %s\n", calendar_file);
gnome_calendar_load (GNOME_CALENDAR (toplevel), calendar_file); gnome_calendar_load (GNOME_CALENDAR (toplevel), calendar_file);
} else {
GNOME_CALENDAR (toplevel)->cal->filename = g_strdup (calendar_file);
} }
gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event",
GTK_SIGNAL_FUNC(calendar_close_event), toplevel);
active_calendars++; active_calendars++;
all_calendars = g_list_prepend (all_calendars, toplevel); all_calendars = g_list_prepend (all_calendars, toplevel);
gtk_widget_show (toplevel); gtk_widget_show (toplevel);

3
calendar/pcs/calobj.c
View File

@ -771,8 +771,7 @@ ical_object_to_vobject (iCalObject *ical)
store_list (o, VCExpDateProp, ical->exdate, ','); store_list (o, VCExpDateProp, ical->exdate, ',');
/* description/comment */ /* description/comment */
if (ical->comment) addPropValue (o, VCDescriptionProp, ical->comment ? ical->comment : "No Comment");
addPropValue (o, VCDescriptionProp, ical->comment);
/* summary */ /* summary */
if (ical->summary) if (ical->summary)