From d8e30fdcb380d2a715a915c8278a024c07c12815 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 19 Apr 2000 16:55:59 +0000 Subject: calls gnome_calendar_open instead of checking on disk and calling load or * gui/calendar-commands.c (calendar_set_uri): calls gnome_calendar_open instead of checking on disk and calling load or create. * gui/gnome-cal.c (gnome_calendar_open): collapsed gnome_calendar_load and gnome_calendar_create into this function. added new type GnomeCalendarOpenMode which has the value CALENDAR_OPEN or CALENDAR_OPEN_OR_CREATE. svn path=/trunk/; revision=2506 --- calendar/gui/calendar-commands.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'calendar/gui/calendar-commands.c') diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 850b5d95d9..a052b8ebf7 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -617,17 +617,14 @@ void calendar_set_uri (GnomeCalendar *gcal, char *calendar_file) { gboolean success; - printf ("calendar_set_uri: calendar_file is '%s'\n", - calendar_file ? calendar_file : "NULL"); + g_return_if_fail (gcal); + g_return_if_fail (calendar_file); - if (calendar_file && g_file_exists (calendar_file)) { - printf ("loading calendar\n"); - success = gnome_calendar_load (gcal, calendar_file); - } - else { - printf ("creating calendar\n"); - success = gnome_calendar_create (gcal, calendar_file); - } + printf ("calendar_set_uri: calendar_file is '%s'\n", calendar_file); + + success = gnome_calendar_open (gcal, + calendar_file, + CALENDAR_OPEN_OR_CREATE); printf (" load or create returned %d\n", success); } -- cgit v1.2.3