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

1 files changed, 11 insertions, 2 deletions

diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 6437977d6b..75406e1c71 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -45,12 +45,21 @@ typedef struct {
 	GnomeAppClass parent_class;
 } GnomeCalendarClass;
 
+
+typedef enum {
+  CALENDAR_OPEN,
+  CALENDAR_OPEN_OR_CREATE
+} GnomeCalendarOpenMode;
+
 guint      gnome_calendar_get_type         	(void);
 GtkWidget *gnome_calendar_new			(char *title);
-int        gnome_calendar_load                  (GnomeCalendar *gcal,
-						 char *file);
+int        gnome_calendar_open                  (GnomeCalendar *gcal,
+						 char *file,
+						 GnomeCalendarOpenMode gcom);
+/*
 int	   gnome_calendar_create		(GnomeCalendar *gcal,
 						 char *file);
+*/
 void       gnome_calendar_add_object       	(GnomeCalendar *gcal,
 						 iCalObject *obj);
 void       gnome_calendar_remove_object    	(GnomeCalendar *gcal,