From 8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 8 May 2000 16:58:27 +0000 Subject: CalBackendClass now is just an interface for calendar backends; this is an 2000-05-08 Federico Mena Quintero * pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just an interface for calendar backends; this is an abstract class. Put in the vtable for the backend methods. * pcs/cal-backend.c (cal_backend_new): Removed function, since CalBackend is not just an abstract class. Removed implementation-specific functions and made public functions call the virtual methods instead. * pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC implementation; this implements a backend for iCalendar and vCalendar files. Moved the implementation-specific stuff from cal-backend.[ch] to here. * pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to here. Added a CAL_UNKNOWN value for when the backend is not loaded yet. (cal_backend_imc_init): Initialize priv->format as CAL_UNKNOWN. (save_to_vcal): Use the same VCProdIdProp value as in cal-util/calobj.c. Use "1.0" as the VCVersionProp as per the vCalendar spec. (ensure_uid): Return nothing, since the result value need not be used anymore. (add_object): Since we mark the calendar as dirty anyways, we do not need to check the result value of ensure_uid() anymore. (remove_object): Asssert that we know how to handle the object's type. We do this in add_object() anyways. * pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch]. * gui/gnome-cal.c: Replaced debugging printf()s with g_message() so that we can see the line number where they occur. * gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the switch. * cal-client/cal-listener.h (CalListenerLoadStatus): Removed enumeration; it is stupid to translate all values for the CalClient when it is going to translate them again. (CalListenerClass::cal_loaded): This signal now passes the LoadStatus directly from the CORBA side. * cal-client/cal-listener.c (Listener_cal_loaded): Do not translate the status value. * cal-client/cal-client.h (CalClientLoadStatus): Added the CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code. * cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA version of the LoadStatus result code. * pcs/cal-factory.c (CalFactoryPrivate): New methods field for the hash table from method strings to the GtkTypes for backend class types. (cal_factory_init): Create the priv->methods hash table. (cal_factory_destroy): Free the priv->methods hash table. (cal_factory_register_method): New function to register a backend class for a particular URI method. (launch_backend_for_uri): New function to launch a backend for a particular URI's method. (load_backend): Use launch_backend_for_uri(). Move the error notification code from load_fn() to here. (create_backend): Use launch_backend_for_uri(). Move the error notification code form create_fn() to here; it is #ifdefed out since currently cal_backend_create() does not have any error reporting capabilities. * idl/evolution-calendar.idl (Listener::LoadStatus): Added a PROTOCOL_NOT_SUPPORTED error code. * pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed functions, since they were supposed to be internal only. (CalFactory_load): Call queue_load_create_job() directly. (CalFactory_create): Likewise. svn path=/trunk/; revision=2921 --- calendar/cal-client/cal-client.c | 12 ++++++++---- calendar/cal-client/cal-client.h | 3 ++- calendar/cal-client/cal-listener.c | 21 +-------------------- calendar/cal-client/cal-listener.h | 9 +-------- 4 files changed, 12 insertions(+), 33 deletions(-) (limited to 'calendar/cal-client') diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index bffa12ac65..c7f5302d14 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -281,7 +281,7 @@ cal_client_destroy (GtkObject *object) /* Handle the cal_loaded signal from the listener */ static void cal_loaded_cb (CalListener *listener, - CalListenerLoadStatus status, + Evolution_Calendar_Listener_LoadStatus status, Evolution_Calendar_Cal cal, gpointer data) { @@ -299,7 +299,7 @@ cal_loaded_cb (CalListener *listener, client_status = CAL_CLIENT_LOAD_ERROR; switch (status) { - case CAL_LISTENER_LOAD_SUCCESS: + case Evolution_Calendar_Listener_SUCCESS: CORBA_exception_init (&ev); cal_copy = CORBA_Object_duplicate (cal, &ev); if (ev._major != CORBA_NO_EXCEPTION) { @@ -315,14 +315,18 @@ cal_loaded_cb (CalListener *listener, client_status = CAL_CLIENT_LOAD_SUCCESS; goto out; - case CAL_LISTENER_LOAD_ERROR: + case Evolution_Calendar_Listener_ERROR: client_status = CAL_CLIENT_LOAD_ERROR; goto error; - case CAL_LISTENER_LOAD_IN_USE: + case Evolution_Calendar_Listener_IN_USE: client_status = CAL_CLIENT_LOAD_IN_USE; goto error; + case Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED: + client_status = CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED; + goto error; + default: g_assert_not_reached (); } diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h index e03008ca67..e4731980e0 100644 --- a/calendar/cal-client/cal-client.h +++ b/calendar/cal-client/cal-client.h @@ -43,7 +43,8 @@ typedef struct _CalClientClass CalClientClass; typedef enum { CAL_CLIENT_LOAD_SUCCESS, CAL_CLIENT_LOAD_ERROR, - CAL_CLIENT_LOAD_IN_USE + CAL_CLIENT_LOAD_IN_USE, + CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED } CalClientLoadStatus; struct _CalClient { diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c index 2c875c4c38..884d64e8f9 100644 --- a/calendar/cal-client/cal-listener.c +++ b/calendar/cal-client/cal-listener.c @@ -219,7 +219,6 @@ Listener_cal_loaded (PortableServer_Servant servant, CalListenerPrivate *priv; CORBA_Environment aev; Evolution_Calendar_Cal cal_copy; - CalListenerLoadStatus load_status; listener = CAL_LISTENER (bonobo_object_from_servant (servant)); priv = listener->priv; @@ -241,26 +240,8 @@ Listener_cal_loaded (PortableServer_Servant servant, priv->cal = cal_copy; - switch (status) { - case Evolution_Calendar_Listener_SUCCESS: - load_status = CAL_LISTENER_LOAD_SUCCESS; - break; - - case Evolution_Calendar_Listener_ERROR: - load_status = CAL_LISTENER_LOAD_ERROR; - break; - - case Evolution_Calendar_Listener_IN_USE: - load_status = CAL_LISTENER_LOAD_IN_USE; - break; - - default: - load_status = CAL_LISTENER_LOAD_ERROR; /* keep gcc happy */ - g_assert_not_reached (); - } - gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[CAL_LOADED], - load_status, cal); + status, cal); } /* Listener::obj_updated method */ diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h index 23590e6ff8..171da0d5c3 100644 --- a/calendar/cal-client/cal-listener.h +++ b/calendar/cal-client/cal-listener.h @@ -40,13 +40,6 @@ BEGIN_GNOME_DECLS typedef struct _CalListener CalListener; typedef struct _CalListenerClass CalListenerClass; -/* Load status for the cal_loaded signal. We need better error reporting. */ -typedef enum { - CAL_LISTENER_LOAD_SUCCESS, - CAL_LISTENER_LOAD_ERROR, - CAL_LISTENER_LOAD_IN_USE -} CalListenerLoadStatus; - struct _CalListener { BonoboObject object; @@ -60,7 +53,7 @@ struct _CalListenerClass { /* Notification signals */ void (* cal_loaded) (CalListener *listener, - CalListenerLoadStatus status, + Evolution_Calendar_Listener_LoadStatus status, Evolution_Calendar_Cal cal); void (* obj_updated) (CalListener *listener, const Evolution_Calendar_CalObjUID uid); void (* obj_removed) (CalListener *listener, const Evolution_Calendar_CalObjUID uid); -- cgit v1.2.3