aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer/ChangeLog37
-rw-r--r--composer/e-msg-composer-hdrs.c70
-rw-r--r--composer/e-msg-composer-hdrs.h16
-rw-r--r--composer/e-msg-composer.c120
-rw-r--r--composer/e-msg-composer.h14
-rw-r--r--composer/evolution-composer.c20
6 files changed, 172 insertions, 105 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 115157c368..95dc50a7b0 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,40 @@
+2004-04-09 Chris Toshok <toshok@ximian.com>
+
+ * e-msg-composer-hdrs.c (set_recipients_from_destv):
+ EABDestination -> EDestination.
+ (e_msg_composer_hdrs_to_message_internal): same.
+ (e_msg_composer_hdrs_set_to): same.
+ (e_msg_composer_hdrs_set_cc): same.
+ (e_msg_composer_hdrs_set_bcc): same.
+ (e_msg_composer_hdrs_get_to): same.
+ (e_msg_composer_hdrs_get_cc): same.
+ (e_msg_composer_hdrs_get_bcc): same.
+ (e_msg_composer_hdrs_get_recipients): same.
+
+ * e-msg-composer-hdrs.h: convert prototypes such that
+ EABDestination -> EDestination.
+
+ * e-msg-composer.h: convert prototypes such that EABDestination ->
+ EDestination.
+
+ * e-msg-composer.c (destination_list_to_vector_sized): new
+ function, ripped from EABDestination, as this code is the only
+ consumer.
+ (destination_list_to_vector): same.
+ (update_auto_recipients): EABDestination -> EDestination.
+ (e_msg_composer_new_with_message): same.
+ (add_recipients): same.
+ (handle_mailto): same.
+ (e_msg_composer_set_headers): same.
+ (e_msg_composer_get_recipients): same.
+ (e_msg_composer_get_to): same.
+ (e_msg_composer_get_cc): same.
+ (e_msg_composer_get_bcc): same.
+
+ * evolution-composer.c (corba_recipientlist_to_destv):
+ EABDestination -> EDestination.
+ (impl_Composer_set_headers): same.
+
2004-04-07 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (sig_select_item): Reversed the logic for
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 471f4acc7d..d9c444dc3b 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -902,9 +902,9 @@ e_msg_composer_hdrs_new (BonoboUIComponent *uic, int visible_mask, int visible_f
static void
set_recipients_from_destv (CamelMimeMessage *msg,
- EABDestination **to_destv,
- EABDestination **cc_destv,
- EABDestination **bcc_destv,
+ EDestination **to_destv,
+ EDestination **cc_destv,
+ EDestination **bcc_destv,
gboolean redirect)
{
CamelInternetAddress *to_addr;
@@ -921,12 +921,12 @@ set_recipients_from_destv (CamelMimeMessage *msg,
if (to_destv) {
for (i = 0; to_destv[i] != NULL; ++i) {
- text_addr = eab_destination_get_address (to_destv[i]);
+ text_addr = e_destination_get_address (to_destv[i]);
if (text_addr && *text_addr) {
target = to_addr;
- if (eab_destination_is_evolution_list (to_destv[i])
- && !eab_destination_list_show_addresses (to_destv[i])) {
+ if (e_destination_is_evolution_list (to_destv[i])
+ && !e_destination_list_show_addresses (to_destv[i])) {
target = bcc_addr;
seen_hidden_list = TRUE;
}
@@ -938,11 +938,11 @@ set_recipients_from_destv (CamelMimeMessage *msg,
if (cc_destv) {
for (i = 0; cc_destv[i] != NULL; ++i) {
- text_addr = eab_destination_get_address (cc_destv[i]);
+ text_addr = e_destination_get_address (cc_destv[i]);
if (text_addr && *text_addr) {
target = cc_addr;
- if (eab_destination_is_evolution_list (cc_destv[i])
- && !eab_destination_list_show_addresses (cc_destv[i])) {
+ if (e_destination_is_evolution_list (cc_destv[i])
+ && !e_destination_list_show_addresses (cc_destv[i])) {
target = bcc_addr;
seen_hidden_list = TRUE;
}
@@ -954,7 +954,7 @@ set_recipients_from_destv (CamelMimeMessage *msg,
if (bcc_destv) {
for (i = 0; bcc_destv[i] != NULL; ++i) {
- text_addr = eab_destination_get_address (bcc_destv[i]);
+ text_addr = e_destination_get_address (bcc_destv[i]);
if (text_addr && *text_addr) {
camel_address_decode (CAMEL_ADDRESS (bcc_addr), text_addr);
}
@@ -988,7 +988,7 @@ e_msg_composer_hdrs_to_message_internal (EMsgComposerHdrs *hdrs,
CamelMimeMessage *msg,
gboolean redirect)
{
- EABDestination **to_destv, **cc_destv, **bcc_destv;
+ EDestination **to_destv, **cc_destv, **bcc_destv;
CamelInternetAddress *addr;
const char *subject;
char *header;
@@ -1024,9 +1024,9 @@ e_msg_composer_hdrs_to_message_internal (EMsgComposerHdrs *hdrs,
set_recipients_from_destv (msg, to_destv, cc_destv, bcc_destv, redirect);
- eab_destination_freev (to_destv);
- eab_destination_freev (cc_destv);
- eab_destination_freev (bcc_destv);
+ e_destination_freev (to_destv);
+ e_destination_freev (cc_destv);
+ e_destination_freev (bcc_destv);
}
#if 0
@@ -1123,26 +1123,26 @@ e_msg_composer_hdrs_set_reply_to (EMsgComposerHdrs *hdrs,
void
e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,
- EABDestination **to_destv)
+ EDestination **to_destv)
{
char *str;
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
- str = eab_destination_exportv (to_destv);
+ str = e_destination_exportv (to_destv);
bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->to.entry), "destinations", TC_CORBA_string, str ? str : "", NULL);
g_free (str);
}
void
e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
- EABDestination **cc_destv)
+ EDestination **cc_destv)
{
char *str;
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
- str = eab_destination_exportv (cc_destv);
+ str = e_destination_exportv (cc_destv);
bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->cc.entry), "destinations", TC_CORBA_string, str ? str :"", NULL);
if (str && *str)
set_pair_visibility (hdrs, &hdrs->priv->cc, TRUE);
@@ -1151,13 +1151,13 @@ e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
void
e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
- EABDestination **bcc_destv)
+ EDestination **bcc_destv)
{
char *str;
g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
- str = eab_destination_exportv (bcc_destv);
+ str = e_destination_exportv (bcc_destv);
bonobo_widget_set_property (BONOBO_WIDGET (hdrs->priv->bcc.entry), "destinations", TC_CORBA_string, str ? str : "", NULL);
if (str && *str)
set_pair_visibility (hdrs, &hdrs->priv->bcc, TRUE);
@@ -1356,67 +1356,67 @@ e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs)
return addr;
}
-EABDestination **
+EDestination **
e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs)
{
char *str = NULL;
- EABDestination **destv = NULL;
+ EDestination **destv = NULL;
g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
bonobo_widget_get_property (BONOBO_WIDGET (hdrs->priv->to.entry), "destinations", TC_CORBA_string, &str, NULL);
if (str != NULL) {
- destv = eab_destination_importv (str);
+ destv = e_destination_importv (str);
g_free (str);
}
return destv;
}
-EABDestination **
+EDestination **
e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs)
{
char *str = NULL;
- EABDestination **destv = NULL;
+ EDestination **destv = NULL;
g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
bonobo_widget_get_property (BONOBO_WIDGET (hdrs->priv->cc.entry), "destinations", TC_CORBA_string, &str, NULL);
if (str != NULL) {
- destv = eab_destination_importv (str);
+ destv = e_destination_importv (str);
g_free (str);
}
return destv;
}
-EABDestination **
+EDestination **
e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs)
{
char *str = NULL;
- EABDestination **destv = NULL;
+ EDestination **destv = NULL;
g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
bonobo_widget_get_property (BONOBO_WIDGET (hdrs->priv->bcc.entry), "destinations", TC_CORBA_string, &str, NULL);
if (str != NULL) {
- destv = eab_destination_importv (str);
+ destv = e_destination_importv (str);
g_free (str);
}
return destv;
}
-EABDestination **
+EDestination **
e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs)
{
- EABDestination **to_destv;
- EABDestination **cc_destv;
- EABDestination **bcc_destv;
- EABDestination **recip_destv;
+ EDestination **to_destv;
+ EDestination **cc_destv;
+ EDestination **bcc_destv;
+ EDestination **recip_destv;
int i, j, n;
g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
@@ -1434,7 +1434,7 @@ e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs)
if (n == 0)
return NULL;
- recip_destv = g_new (EABDestination *, n + 1);
+ recip_destv = g_new (EDestination *, n + 1);
j = 0;
diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h
index c84b1417f5..cf3bd9a6c0 100644
--- a/composer/e-msg-composer-hdrs.h
+++ b/composer/e-msg-composer-hdrs.h
@@ -31,7 +31,7 @@
#include <e-util/e-account.h>
#include <camel/camel-mime-message.h>
-#include <addressbook/util/eab-destination.h>
+#include <addressbook/util/e-destination.h>
#ifdef __cplusplus
extern "C" {
@@ -108,11 +108,11 @@ void e_msg_composer_hdrs_set_from_account (EMsgComposerHdrs *hdrs,
void e_msg_composer_hdrs_set_reply_to (EMsgComposerHdrs *hdrs,
const char *reply_to);
void e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,
- EABDestination **to_destv);
+ EDestination **to_destv);
void e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,
- EABDestination **cc_destv);
+ EDestination **cc_destv);
void e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
- EABDestination **bcc_destv);
+ EDestination **bcc_destv);
void e_msg_composer_hdrs_set_post_to (EMsgComposerHdrs *hdrs,
const char *post_to);
void e_msg_composer_hdrs_set_post_to_list (EMsgComposerHdrs *hdrs,
@@ -126,10 +126,10 @@ void e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs,
CamelInternetAddress *e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs);
CamelInternetAddress *e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs);
-EABDestination **e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs);
-EABDestination **e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs);
-EABDestination **e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs);
-EABDestination **e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs);
+EDestination **e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs);
+EDestination **e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs);
+EDestination **e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs);
+EDestination **e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs);
const char *e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs);
/* list of gchar* uris; this data is to be freed by the caller */
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 59b23fe061..18d90cbf5e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -178,6 +178,36 @@ static void handle_multipart_signed (EMsgComposer *composer, CamelMultipart *mul
static void set_editor_signature (EMsgComposer *composer);
+static EDestination**
+destination_list_to_vector_sized (GList *list, int n)
+{
+ EDestination **destv;
+ int i = 0;
+
+ if (n == -1)
+ n = g_list_length (list);
+
+ if (n == 0)
+ return NULL;
+
+ destv = g_new (EDestination *, n + 1);
+ while (list != NULL && i < n) {
+ destv[i] = E_DESTINATION (list->data);
+ list->data = NULL;
+ i++;
+ list = g_list_next (list);
+ }
+ destv[i] = NULL;
+
+ return destv;
+}
+
+static EDestination**
+destination_list_to_vector (GList *list)
+{
+ return destination_list_to_vector_sized (list, -1);
+}
+
static GByteArray *
get_text (Bonobo_PersistStream persist, char *format)
{
@@ -2389,7 +2419,7 @@ enum {
static void
update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs)
{
- EABDestination *dest, **destv = NULL;
+ EDestination *dest, **destv = NULL;
CamelInternetAddress *iaddr;
GList *list, *tail, *node;
int i, n = 0;
@@ -2405,14 +2435,14 @@ update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs
if (!camel_internet_address_get (iaddr, i, &name, &addr))
continue;
- dest = eab_destination_new ();
- eab_destination_set_auto_recipient (dest, TRUE);
+ dest = e_destination_new ();
+ e_destination_set_auto_recipient (dest, TRUE);
if (name)
- eab_destination_set_name (dest, name);
+ e_destination_set_name (dest, name);
if (addr)
- eab_destination_set_email (dest, addr);
+ e_destination_set_email (dest, addr);
node = g_list_alloc ();
node->data = dest;
@@ -2447,9 +2477,9 @@ update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs
if (destv) {
for (i = 0; destv[i]; i++) {
- if (!eab_destination_is_auto_recipient (destv[i])) {
+ if (!e_destination_is_auto_recipient (destv[i])) {
node = g_list_alloc ();
- node->data = eab_destination_copy (destv[i]);
+ node->data = e_destination_copy (destv[i]);
node->next = NULL;
if (tail) {
@@ -2465,10 +2495,10 @@ update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs
}
}
- eab_destination_freev (destv);
+ e_destination_freev (destv);
}
- destv = eab_destination_list_to_vector_sized (list, n);
+ destv = destination_list_to_vector_sized (list, n);
g_list_free (list);
switch (mode) {
@@ -2482,7 +2512,7 @@ update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs
g_assert_not_reached ();
}
- eab_destination_freev (destv);
+ e_destination_freev (destv);
}
static void
@@ -3750,7 +3780,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
const CamelInternetAddress *to, *cc, *bcc;
GList *To = NULL, *Cc = NULL, *Bcc = NULL;
const char *format, *subject, *postto;
- EABDestination **Tov, **Ccv, **Bccv;
+ EDestination **Tov, **Ccv, **Bccv;
GHashTable *auto_cc, *auto_bcc;
CamelContentType *content_type;
struct _camel_header_raw *headers;
@@ -3827,13 +3857,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
const char *name, *addr;
if (camel_internet_address_get (to, i, &name, &addr)) {
- EABDestination *dest = eab_destination_new ();
- eab_destination_set_name (dest, name);
- eab_destination_set_email (dest, addr);
+ EDestination *dest = e_destination_new ();
+ e_destination_set_name (dest, name);
+ e_destination_set_email (dest, addr);
To = g_list_append (To, dest);
}
}
- Tov = eab_destination_list_to_vector (To);
+ Tov = destination_list_to_vector (To);
g_list_free (To);
len = CAMEL_ADDRESS (cc)->addresses->len;
@@ -3841,18 +3871,18 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
const char *name, *addr;
if (camel_internet_address_get (cc, i, &name, &addr)) {
- EABDestination *dest = eab_destination_new ();
- eab_destination_set_name (dest, name);
- eab_destination_set_email (dest, addr);
+ EDestination *dest = e_destination_new ();
+ e_destination_set_name (dest, name);
+ e_destination_set_email (dest, addr);
if (g_hash_table_lookup (auto_cc, addr))
- eab_destination_set_auto_recipient (dest, TRUE);
+ e_destination_set_auto_recipient (dest, TRUE);
Cc = g_list_append (Cc, dest);
}
}
- Ccv = eab_destination_list_to_vector (Cc);
+ Ccv = destination_list_to_vector (Cc);
g_hash_table_foreach (auto_cc, auto_recip_free, NULL);
g_hash_table_destroy (auto_cc);
g_list_free (Cc);
@@ -3862,18 +3892,18 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
const char *name, *addr;
if (camel_internet_address_get (bcc, i, &name, &addr)) {
- EABDestination *dest = eab_destination_new ();
- eab_destination_set_name (dest, name);
- eab_destination_set_email (dest, addr);
+ EDestination *dest = e_destination_new ();
+ e_destination_set_name (dest, name);
+ e_destination_set_email (dest, addr);
if (g_hash_table_lookup (auto_bcc, addr))
- eab_destination_set_auto_recipient (dest, TRUE);
+ e_destination_set_auto_recipient (dest, TRUE);
Bcc = g_list_append (Bcc, dest);
}
}
- Bccv = eab_destination_list_to_vector (Bcc);
+ Bccv = destination_list_to_vector (Bcc);
g_hash_table_foreach (auto_bcc, auto_recip_free, NULL);
g_hash_table_destroy (auto_bcc);
g_list_free (Bcc);
@@ -3889,9 +3919,9 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
g_free (account_name);
- eab_destination_freev (Tov);
- eab_destination_freev (Ccv);
- eab_destination_freev (Bccv);
+ e_destination_freev (Tov);
+ e_destination_freev (Ccv);
+ e_destination_freev (Bccv);
/* Restore the format editing preference */
format = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Format");
@@ -4031,9 +4061,9 @@ add_recipients (GList *list, const char *recips)
for (i = 0; i < num; i++) {
if (camel_internet_address_get (cia, i, &name, &addr)) {
- EABDestination *dest = eab_destination_new ();
- eab_destination_set_name (dest, name);
- eab_destination_set_email (dest, addr);
+ EDestination *dest = e_destination_new ();
+ e_destination_set_name (dest, name);
+ e_destination_set_email (dest, addr);
list = g_list_append (list, dest);
}
@@ -4047,7 +4077,7 @@ handle_mailto (EMsgComposer *composer, const char *mailto)
{
EMsgComposerHdrs *hdrs;
GList *to = NULL, *cc = NULL, *bcc = NULL;
- EABDestination **tov, **ccv, **bccv;
+ EDestination **tov, **ccv, **bccv;
char *subject = NULL, *body = NULL;
char *header, *content, *buf;
size_t nread, nwritten;
@@ -4152,9 +4182,9 @@ handle_mailto (EMsgComposer *composer, const char *mailto)
g_free (buf);
- tov = eab_destination_list_to_vector (to);
- ccv = eab_destination_list_to_vector (cc);
- bccv = eab_destination_list_to_vector (bcc);
+ tov = destination_list_to_vector (to);
+ ccv = destination_list_to_vector (cc);
+ bccv = destination_list_to_vector (bcc);
g_list_free (to);
g_list_free (cc);
@@ -4166,9 +4196,9 @@ handle_mailto (EMsgComposer *composer, const char *mailto)
e_msg_composer_hdrs_set_cc (hdrs, ccv);
e_msg_composer_hdrs_set_bcc (hdrs, bccv);
- eab_destination_freev (tov);
- eab_destination_freev (ccv);
- eab_destination_freev (bccv);
+ e_destination_freev (tov);
+ e_destination_freev (ccv);
+ e_destination_freev (bccv);
if (subject) {
e_msg_composer_hdrs_set_subject (hdrs, subject);
@@ -4241,9 +4271,9 @@ e_msg_composer_show_attachments (EMsgComposer *composer,
void
e_msg_composer_set_headers (EMsgComposer *composer,
const char *from,
- EABDestination **to,
- EABDestination **cc,
- EABDestination **bcc,
+ EDestination **to,
+ EDestination **cc,
+ EDestination **bcc,
const char *subject)
{
EMsgComposerHdrs *hdrs;
@@ -5131,7 +5161,7 @@ e_msg_composer_set_view_bcc (EMsgComposer *composer, gboolean view_bcc)
}
-EABDestination **
+EDestination **
e_msg_composer_get_recipients (EMsgComposer *composer)
{
g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
@@ -5139,7 +5169,7 @@ e_msg_composer_get_recipients (EMsgComposer *composer)
return composer->hdrs ? e_msg_composer_hdrs_get_recipients (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
}
-EABDestination **
+EDestination **
e_msg_composer_get_to (EMsgComposer *composer)
{
g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
@@ -5147,7 +5177,7 @@ e_msg_composer_get_to (EMsgComposer *composer)
return composer->hdrs ? e_msg_composer_hdrs_get_to (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
}
-EABDestination **
+EDestination **
e_msg_composer_get_cc (EMsgComposer *composer)
{
g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
@@ -5155,7 +5185,7 @@ e_msg_composer_get_cc (EMsgComposer *composer)
return composer->hdrs ? e_msg_composer_hdrs_get_cc (E_MSG_COMPOSER_HDRS (composer->hdrs)) : NULL;
}
-EABDestination **
+EDestination **
e_msg_composer_get_bcc (EMsgComposer *composer)
{
g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 5e5fd669cb..649cc1be68 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -146,9 +146,9 @@ void e_msg_composer_show_attachments (EMsgCo
gboolean show);
void e_msg_composer_set_headers (EMsgComposer *composer,
const char *from,
- EABDestination **to,
- EABDestination **cc,
- EABDestination **bcc,
+ EDestination **to,
+ EDestination **cc,
+ EDestination **bcc,
const char *subject);
void e_msg_composer_set_body_text (EMsgComposer *composer,
const char *text);
@@ -191,10 +191,10 @@ gboolean e_msg_composer_get_view_bcc (EMsgCo
void e_msg_composer_set_view_bcc (EMsgComposer *composer,
gboolean view_bcc);
-EABDestination **e_msg_composer_get_recipients (EMsgComposer *composer);
-EABDestination **e_msg_composer_get_to (EMsgComposer *composer);
-EABDestination **e_msg_composer_get_cc (EMsgComposer *composer);
-EABDestination **e_msg_composer_get_bcc (EMsgComposer *composer);
+EDestination **e_msg_composer_get_recipients (EMsgComposer *composer);
+EDestination **e_msg_composer_get_to (EMsgComposer *composer);
+EDestination **e_msg_composer_get_cc (EMsgComposer *composer);
+EDestination **e_msg_composer_get_bcc (EMsgComposer *composer);
const char *e_msg_composer_get_subject (EMsgComposer *composer);
EAccount *e_msg_composer_get_preferred_account (EMsgComposer *composer);
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index 6e3c8b61a4..07ce35a706 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -49,26 +49,26 @@ struct _EvolutionComposerPrivate {
};
/* CORBA interface implementation. */
-static EABDestination **
+static EDestination **
corba_recipientlist_to_destv (const GNOME_Evolution_Composer_RecipientList *cl)
{
GNOME_Evolution_Composer_Recipient *recip;
- EABDestination **destv;
+ EDestination **destv;
int i;
if (cl->_length == 0)
return NULL;
- destv = g_new (EABDestination *, cl->_length+1);
+ destv = g_new (EDestination *, cl->_length+1);
for (i = 0; i < cl->_length; ++i) {
recip = &(cl->_buffer[i]);
- destv[i] = eab_destination_new ();
+ destv[i] = e_destination_new ();
if (*recip->name)
- eab_destination_set_name (destv[i], recip->name);
- eab_destination_set_email (destv[i], recip->address);
+ e_destination_set_name (destv[i], recip->name);
+ e_destination_set_email (destv[i], recip->address);
}
destv[cl->_length] = NULL;
@@ -87,7 +87,7 @@ impl_Composer_set_headers (PortableServer_Servant servant,
{
BonoboObject *bonobo_object;
EvolutionComposer *composer;
- EABDestination **tov, **ccv, **bccv;
+ EDestination **tov, **ccv, **bccv;
EAccountList *accounts;
EAccount *account;
EIterator *iter;
@@ -124,9 +124,9 @@ impl_Composer_set_headers (PortableServer_Servant servant,
e_msg_composer_set_headers (composer->composer, account->name,
tov, ccv, bccv, subject);
- eab_destination_freev (tov);
- eab_destination_freev (ccv);
- eab_destination_freev (bccv);
+ e_destination_freev (tov);
+ e_destination_freev (ccv);
+ e_destination_freev (bccv);
}
static void
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 20:45:02 +0800