new proto

2001-09-26  JP Rosevear  <jpr@ximian.com>

	* pcs/cal.h: new proto

	* pcs/cal.c (impl_Cal_set_mode): implement set mode method
	(cal_class_init): set setMode function in epv
	(cal_notify_mode): notify listener of mode change

	* pcs/cal-factory.c (add_uri): deal with UriType renaming

	* pcs/cal-backend.h: add new virtual methods and protos

	* pcs/cal-backend.c (cal_backend_class_init): init new virtual
	methods to null
	(cal_backend_set_mode): sets mode
	(cal_backend_get_mode): gets mode

	* pcs/cal-backend-file.c (cal_backend_file_class_init): overide
	get_mode and set_mode methods
	(cal_backend_file_get_mode): return mode
	(notify_mode): have listeners notified of the set mode call
	(cal_backend_file_set_mode): set the mode by indicating not
	supported

	* cal-client/cal-listener.h: update proto

	* cal-client/cal-listener.c (impl_notifyCalSetMode): implement set
	mode callback
	(cal_listener_construct): take set mode callback
	(cal_listener_new): ditto

	* cal-client/cal-client.h: update protos, add signal proto

	* cal-client/cal-client.c (cal_client_class_init): add
	cal_set_mode signal
	(cal_set_mode_cb): handle set mode callback from listener
	(cal_client_open_calendar): pass additional param to cal_listener_new
	(cal_client_set_mode): wrapper to set the calendar mode

	* idl/evolution-calendar.idl: make UriType into CalMode, add
	SetModeStatus enum and notifyCalSetMode method to the listener

	* gui/calendar-offline-handler.c (create_connection_list): fetch
	the uri list ourselves
	(impl_prepareForOffline): reflect param change of
	create_connect_list
	(update_offline): ditto
	(backend_cal_set_mode): set mode call back
	(backend_cal_opened): cal opened call back, set mode to local
	(impl_goOffline): reflect UriType renaming

	* cal-util/cal-util.h: rename UriType to CalMode

svn path=/trunk/; revision=13142

1 files changed, 10 insertions, 10 deletions

diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c
index 458279b65f..b2b718f861 100644
--- a/calendar/pcs/cal-factory.c
+++ b/calendar/pcs/cal-factory.c
@@ -54,7 +54,7 @@ struct _CalFactoryPrivate {
 typedef struct 
 {
 	CalFactory *factory;	
-	GNOME_Evolution_Calendar_UriType type;	
+	GNOME_Evolution_Calendar_CalMode mode;	
 	GNOME_Evolution_Calendar_StringSeq *list;
 } CalFactoryUriData;
 
@@ -314,27 +314,27 @@ add_uri (gpointer key, gpointer value, gpointer data)
 	CalFactoryUriData *cfud = data;
 	CalFactory *factory = cfud->factory;	
 	GNOME_Evolution_Calendar_StringSeq *list = cfud->list;
-	GNOME_Evolution_Calendar_UriType type = cfud->type;
+	GNOME_Evolution_Calendar_CalMode mode = cfud->mode;
 	char *uri_string = key;
 	CalBackend *backend;	
 	GnomeVFSURI *uri;	
 
-	switch (type) {
-	case GNOME_Evolution_Calendar_URI_LOCAL:
+	switch (mode) {
+	case GNOME_Evolution_Calendar_MODE_LOCAL:
 		uri = gnome_vfs_uri_new_private (uri_string, TRUE, TRUE, TRUE);
 		backend = lookup_backend (factory, uri);
 		gnome_vfs_uri_unref (uri);
-		if (backend == NULL && cal_backend_is_remote (backend))
+		if (backend == NULL && cal_backend_get_mode (backend) == CAL_MODE_LOCAL)
 			return;
 		break;		
-	case GNOME_Evolution_Calendar_URI_REMOTE:
+	case GNOME_Evolution_Calendar_MODE_REMOTE:
 		uri = gnome_vfs_uri_new_private (uri_string, TRUE, TRUE, TRUE);
 		backend = lookup_backend (factory, uri);
 		gnome_vfs_uri_unref (uri);
-		if (backend == NULL && !cal_backend_is_remote (backend))			
+		if (backend == NULL && cal_backend_get_mode (backend) == CAL_MODE_REMOTE)
 			return;
 		break;		
-	case GNOME_Evolution_Calendar_URI_ANY:
+	case GNOME_Evolution_Calendar_MODE_ANY:
 		break;
 	}
 	
@@ -470,7 +470,7 @@ impl_CalFactory_open (PortableServer_Servant servant,
 
 static GNOME_Evolution_Calendar_StringSeq *
 impl_CalFactory_uriList (PortableServer_Servant servant,
-			 GNOME_Evolution_Calendar_UriType type,
+			 GNOME_Evolution_Calendar_CalMode mode,
 			 CORBA_Environment *ev)
 {
 	CalFactory *factory;
@@ -487,7 +487,7 @@ impl_CalFactory_uriList (PortableServer_Servant servant,
 	list->_buffer = CORBA_sequence_CORBA_string_allocbuf (list->_maximum);
 
 	cfud.factory = factory;	
-	cfud.type = type;	
+	cfud.mode = mode;	
 	cfud.list = list;
 	g_hash_table_foreach (priv->backends, add_uri, &cfud);