call cal_client_get_cal_address instead of cal_client_get_email_address

2003-03-04  JP Rosevear  <jpr@ximian.com>

       * gui/itip-utils.c (itip_organizer_is_user): call
       cal_client_get_cal_address instead of cal_client_get_email_address

       * gui/dialogs/meeting-page.c (meeting_page_construct): ditto

       * pcs/cal.c (impl_Cal_get_cal_address): implement updated method
       name
       (cal_class_init): set method implementation

       * pcs/cal-backend.c (cal_backend_class_init): init get_cal_address
       virtual function
       (cal_backend_get_cal_address): call proper function

       * pcs/cal-backend.h: update proto, rename get_email_address
       virtual function to get_cal_address virtual function

       * pcs/cal-backend-file.c (cal_backend_file_class_init): match
       get_cal_address call
       (cal_backend_file_get_cal_address): rename from
       cal_backend_file_get_email_address

       * cal-client/cal-client.c: rename email_address private member to
       cal_address
       (cal_client_init): init cal_address
       (cal_client_destroy): free cal_address and properly free
       alarm_email_address
       (cal_client_get_cal_address): rename from
       cal_client_get_email_address and call proper corba function

svn path=/trunk/; revision=20151

1 files changed, 8 insertions, 8 deletions

diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 8171af4922..9040534940 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -80,26 +80,26 @@ impl_Cal_isReadOnly (PortableServer_Servant servant,
 		       
 /* Cal::getEmailAddress method */
 static CORBA_char *
-impl_Cal_getEmailAddress (PortableServer_Servant servant,
+impl_Cal_getCalAddress (PortableServer_Servant servant,
 			  CORBA_Environment *ev)
 {
 	Cal *cal;
 	CalPrivate *priv;
-	const char *str_email_address;
-	CORBA_char *str_email_address_copy;
+	const char *str_cal_address;
+	CORBA_char *str_cal_address_copy;
 
 	cal = CAL (bonobo_object_from_servant (servant));
 	priv = cal->priv;
 
-	str_email_address = cal_backend_get_email_address (priv->backend);
-	if (str_email_address == NULL) {
+	str_cal_address = cal_backend_get_cal_address (priv->backend);
+	if (str_cal_address == NULL) {
 		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);
 		return CORBA_OBJECT_NIL;
 	}
 
-	str_email_address_copy = CORBA_string_dup (str_email_address);
+	str_cal_address_copy = CORBA_string_dup (str_cal_address);
 
-	return str_email_address_copy;
+	return str_cal_address_copy;
 }
 		       
 /* Cal::get_alarm_email_address method */
@@ -815,7 +815,7 @@ cal_class_init (CalClass *klass)
 	/* Epv methods */
 	epv->_get_uri = impl_Cal_get_uri;
 	epv->isReadOnly = impl_Cal_isReadOnly;
-	epv->getEmailAddress = impl_Cal_getEmailAddress;
+	epv->getCalAddress = impl_Cal_getCalAddress;
  	epv->getAlarmEmailAddress = impl_Cal_getAlarmEmailAddress;
  	epv->getStaticCapabilities = impl_Cal_getStaticCapabilities;
 	epv->setMode = impl_Cal_setMode;