aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/pcs
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2003-03-05 04:59:13 +0800
committerJP Rosevear <jpr@src.gnome.org>2003-03-05 04:59:13 +0800
commit6c95c6da0e9d40216e05109b5f4acb92c5ab5256 (patch)
tree2301a7478bce5fd53fd601ab8accdb51e3b58fca /calendar/pcs
parentc538747217542d22af4bcf01d5dae8ec7301da58 (diff)
downloadgsoc2013-evolution-6c95c6da0e9d40216e05109b5f4acb92c5ab5256.tar
gsoc2013-evolution-6c95c6da0e9d40216e05109b5f4acb92c5ab5256.tar.gz
gsoc2013-evolution-6c95c6da0e9d40216e05109b5f4acb92c5ab5256.tar.bz2
gsoc2013-evolution-6c95c6da0e9d40216e05109b5f4acb92c5ab5256.tar.lz
gsoc2013-evolution-6c95c6da0e9d40216e05109b5f4acb92c5ab5256.tar.xz
gsoc2013-evolution-6c95c6da0e9d40216e05109b5f4acb92c5ab5256.tar.zst
gsoc2013-evolution-6c95c6da0e9d40216e05109b5f4acb92c5ab5256.zip
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
Diffstat (limited to 'calendar/pcs')
-rw-r--r--calendar/pcs/cal-backend-file.c6
-rw-r--r--calendar/pcs/cal-backend.c14
-rw-r--r--calendar/pcs/cal-backend.h4
-rw-r--r--calendar/pcs/cal.c16
4 files changed, 20 insertions, 20 deletions
diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
index 7310df2e4f..91081d77f0 100644
--- a/calendar/pcs/cal-backend-file.c
+++ b/calendar/pcs/cal-backend-file.c
@@ -78,7 +78,7 @@ static void cal_backend_file_finalize (GObject *object);
static const char *cal_backend_file_get_uri (CalBackend *backend);
static gboolean cal_backend_file_is_read_only (CalBackend *backend);
-static const char *cal_backend_file_get_email_address (CalBackend *backend);
+static const char *cal_backend_file_get_cal_address (CalBackend *backend);
static const char *cal_backend_file_get_alarm_email_address (CalBackend *backend);
static const char *cal_backend_file_get_static_capabilities (CalBackend *backend);
static CalBackendOpenStatus cal_backend_file_open (CalBackend *backend,
@@ -178,7 +178,7 @@ cal_backend_file_class_init (CalBackendFileClass *class)
backend_class->get_uri = cal_backend_file_get_uri;
backend_class->is_read_only = cal_backend_file_is_read_only;
- backend_class->get_email_address = cal_backend_file_get_email_address;
+ backend_class->get_cal_address = cal_backend_file_get_cal_address;
backend_class->get_alarm_email_address = cal_backend_file_get_alarm_email_address;
backend_class->get_static_capabilities = cal_backend_file_get_static_capabilities;
backend_class->open = cal_backend_file_open;
@@ -432,7 +432,7 @@ cal_backend_file_is_read_only (CalBackend *backend)
/* Get_email_address handler for the file backend */
static const char *
-cal_backend_file_get_email_address (CalBackend *backend)
+cal_backend_file_get_cal_address (CalBackend *backend)
{
/* A file backend has no particular email address associated
* with it (although that would be a useful feature some day).
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
index 5e2074bad1..536501ce47 100644
--- a/calendar/pcs/cal-backend.c
+++ b/calendar/pcs/cal-backend.c
@@ -174,7 +174,7 @@ cal_backend_class_init (CalBackendClass *class)
class->obj_removed = NULL;
class->get_uri = NULL;
- class->get_email_address = NULL;
+ class->get_cal_address = NULL;
class->get_alarm_email_address = NULL;
class->get_static_capabilities = NULL;
class->open = NULL;
@@ -265,22 +265,22 @@ cal_backend_get_uri (CalBackend *backend)
}
/**
- * cal_backend_get_email_address:
+ * cal_backend_get_cal_address:
* @backend: A calendar backend.
*
- * Queries the email address associated with a calendar backend, which
+ * Queries the cal address associated with a calendar backend, which
* must already have an open calendar.
*
- * Return value: The email address associated with the calendar.
+ * Return value: The cal address associated with the calendar.
**/
const char *
-cal_backend_get_email_address (CalBackend *backend)
+cal_backend_get_cal_address (CalBackend *backend)
{
g_return_val_if_fail (backend != NULL, NULL);
g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
- g_assert (CLASS (backend)->get_email_address != NULL);
- return (* CLASS (backend)->get_email_address) (backend);
+ g_assert (CLASS (backend)->get_cal_address != NULL);
+ return (* CLASS (backend)->get_cal_address) (backend);
}
const char *
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
index ee11354252..ba73886bbd 100644
--- a/calendar/pcs/cal-backend.h
+++ b/calendar/pcs/cal-backend.h
@@ -95,7 +95,7 @@ struct _CalBackendClass {
/* Virtual methods */
const char *(* get_uri) (CalBackend *backend);
- const char *(* get_email_address) (CalBackend *backend);
+ const char *(* get_cal_address) (CalBackend *backend);
const char *(* get_alarm_email_address) (CalBackend *backend);
const char *(* get_static_capabilities) (CalBackend *backend);
@@ -155,7 +155,7 @@ GType cal_backend_get_type (void);
const char *cal_backend_get_uri (CalBackend *backend);
-const char *cal_backend_get_email_address (CalBackend *backend);
+const char *cal_backend_get_cal_address (CalBackend *backend);
const char *cal_backend_get_alarm_email_address (CalBackend *backend);
const char *cal_backend_get_static_capabilities (CalBackend *backend);
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;