aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/cal-client/cal-client.c
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/cal-client/cal-client.c
parentc538747217542d22af4bcf01d5dae8ec7301da58 (diff)
downloadgsoc2013-evolution-6c95c6da0e9d40216e05109b5f4acb92c5ab5256.tar.gz
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/cal-client/cal-client.c')
-rw-r--r--calendar/cal-client/cal-client.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 5fe10efcbc..1f76b5e210 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -48,7 +48,7 @@ struct _CalClientPrivate {
char *uri;
/* Email address associated with this calendar, or NULL */
- char *email_address;
+ char *cal_address;
char *alarm_email_address;
/* Scheduling info */
@@ -312,7 +312,7 @@ cal_client_init (CalClient *client, CalClientClass *klass)
priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED;
priv->uri = NULL;
- priv->email_address = NULL;
+ priv->cal_address = NULL;
priv->alarm_email_address = NULL;
priv->capabilities = FALSE;
priv->factories = NULL;
@@ -449,13 +449,13 @@ cal_client_finalize (GObject *object)
priv->uri = NULL;
}
- if (priv->email_address) {
- g_free (priv->email_address);
- priv->email_address = NULL;
+ if (priv->cal_address) {
+ g_free (priv->cal_address);
+ priv->cal_address = NULL;
}
if (priv->alarm_email_address) {
- g_free (priv->email_address);
- priv->email_address = NULL;
+ g_free (priv->alarm_email_address);
+ priv->alarm_email_address = NULL;
}
if (priv->capabilities) {
g_free (priv->capabilities);
@@ -1156,17 +1156,17 @@ cal_client_is_read_only (CalClient *client)
}
/**
- * cal_client_get_email_address:
+ * cal_client_get_cal_address:
* @client: A calendar client.
*
- * Queries the email address associated with a calendar client.
+ * Queries the calendar address associated with a calendar client.
*
- * Return value: The email address associated with the calendar that
+ * Return value: The calendar address associated with the calendar that
* is loaded or being loaded, or %NULL if the client has not started a
* load request yet or the calendar has no associated email address.
**/
const char *
-cal_client_get_email_address (CalClient *client)
+cal_client_get_cal_address (CalClient *client)
{
CalClientPrivate *priv;
@@ -1176,20 +1176,20 @@ cal_client_get_email_address (CalClient *client)
priv = client->priv;
g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, NULL);
- if (priv->email_address == NULL) {
+ if (priv->cal_address == NULL) {
CORBA_Environment ev;
- CORBA_char *email_address;
+ CORBA_char *cal_address;
CORBA_exception_init (&ev);
- email_address = GNOME_Evolution_Calendar_Cal_getEmailAddress (priv->cal, &ev);
+ cal_address = GNOME_Evolution_Calendar_Cal_getCalAddress (priv->cal, &ev);
if (!BONOBO_EX (&ev)) {
- priv->email_address = g_strdup (email_address);
- CORBA_free (email_address);
+ priv->cal_address = g_strdup (cal_address);
+ CORBA_free (cal_address);
}
CORBA_exception_free (&ev);
}
- return priv->email_address;
+ return priv->cal_address;
}
const char *