aboutsummaryrefslogtreecommitdiffstats
path: root/composer/evolution-composer.c
diff options
context:
space:
mode:
Diffstat (limited to 'composer/evolution-composer.c')
-rw-r--r--composer/evolution-composer.c107
1 files changed, 44 insertions, 63 deletions
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index 851bf3c853..d816a6d897 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -33,6 +33,8 @@
#include <camel/camel.h>
#include "evolution-composer.h"
#include "mail/mail-config.h"
+#include "mail/mail-session.h"
+#include "e-util/e-html-utils.h"
#define PARENT_TYPE BONOBO_OBJECT_TYPE
static BonoboObjectClass *parent_class = NULL;
@@ -83,42 +85,32 @@ impl_Composer_set_headers (PortableServer_Servant servant,
BonoboObject *bonobo_object;
EvolutionComposer *composer;
EDestination **tov, **ccv, **bccv;
- EAccountList *accounts;
- EAccount *account;
- EIterator *iter;
- int found = 0;
-
+ const MailConfigAccount *account;
+ const GSList *accounts;
+
bonobo_object = bonobo_object_from_servant (servant);
composer = EVOLUTION_COMPOSER (bonobo_object);
-
+
account = mail_config_get_account_by_name (from);
if (!account) {
accounts = mail_config_get_accounts ();
- iter = e_list_get_iterator ((EList *) accounts);
- while (e_iterator_is_valid (iter)) {
- account = (EAccount *) e_iterator_get (iter);
-
- if (!strcasecmp (account->id->address, from)) {
- found = TRUE;
+ while (accounts) {
+ account = accounts->data;
+ if (!g_strcasecmp (account->id->address, from))
break;
- }
-
- e_iterator_next (iter);
+ accounts = accounts->next;
}
-
- g_object_unref (iter);
-
- if (!found)
+ if (!accounts)
account = mail_config_get_default_account ();
}
-
+
tov = corba_recipientlist_to_destv (to);
ccv = corba_recipientlist_to_destv (cc);
bccv = corba_recipientlist_to_destv (bcc);
e_msg_composer_set_headers (composer->composer, account->name,
tov, ccv, bccv, subject);
-
+
e_destination_freev (tov);
e_destination_freev (ccv);
e_destination_freev (bccv);
@@ -153,12 +145,11 @@ impl_Composer_set_body (PortableServer_Servant servant,
bonobo_object = bonobo_object_from_servant (servant);
composer = EVOLUTION_COMPOSER (bonobo_object);
- if (!strcasecmp (mime_type, "text/plain")) {
- char *htmlbody = camel_text_to_html (body, CAMEL_MIME_FILTER_TOHTML_PRE, 0);
-
+ if (!g_strcasecmp (mime_type, "text/plain")) {
+ char *htmlbody = e_text_to_html (body, E_TEXT_TO_HTML_PRE);
e_msg_composer_set_body_text (composer->composer, htmlbody);
g_free (htmlbody);
- } else if (!strcasecmp (mime_type, "text/html"))
+ } else if (!g_strcasecmp (mime_type, "text/html"))
e_msg_composer_set_body_text (composer->composer, body);
else
e_msg_composer_set_body (composer->composer, body, mime_type);
@@ -182,7 +173,7 @@ impl_Composer_attach_MIME (PortableServer_Servant servant,
attachment = camel_mime_part_new ();
status = camel_data_wrapper_construct_from_stream (
CAMEL_DATA_WRAPPER (attachment), mem_stream);
- camel_object_unref (mem_stream);
+ camel_object_unref (CAMEL_OBJECT (mem_stream));
if (status == -1) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
@@ -223,7 +214,7 @@ impl_Composer_attach_data (PortableServer_Servant servant,
"inline" : "attachment");
e_msg_composer_attach (composer->composer, attachment);
- camel_object_unref (attachment);
+ camel_object_unref (CAMEL_OBJECT (attachment));
}
static void
@@ -277,49 +268,38 @@ destroy (GtkObject *object)
{
EvolutionComposer *composer = EVOLUTION_COMPOSER (object);
- if (composer->composer) {
- g_object_unref((composer->composer));
- composer->composer = NULL;
- }
+ if (composer->composer)
+ gtk_object_unref (GTK_OBJECT (composer->composer));
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static void
-evolution_composer_class_init (EvolutionComposerClass *klass)
+class_init (EvolutionComposerClass *klass)
{
GtkObjectClass *object_class;
- POA_GNOME_Evolution_Composer__epv *epv;
object_class = GTK_OBJECT_CLASS (klass);
object_class->destroy = destroy;
- parent_class = g_type_class_ref(bonobo_object_get_type ());
+ parent_class = gtk_type_class (bonobo_object_get_type ());
- epv = &klass->epv;
-
- epv->setHeaders = impl_Composer_set_headers;
- epv->setMultipartType = impl_Composer_set_multipart_type;
- epv->setBody = impl_Composer_set_body;
- epv->attachMIME = impl_Composer_attach_MIME;
- epv->attachData = impl_Composer_attach_data;
- epv->show = impl_Composer_show;
- epv->send = impl_Composer_send;
+ Composer_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
+ Composer_vepv.GNOME_Evolution_Composer_epv = evolution_composer_get_epv ();
}
static void
-evolution_composer_init (EvolutionComposer *composer)
+init (EvolutionComposer *composer)
{
- BonoboObject *item_handler;
- EAccount *account;
-
- account = mail_config_get_default_account ();
+ const MailConfigAccount *account;
+
+ account = mail_config_get_default_account ();
composer->composer = e_msg_composer_new ();
-
- g_signal_connect (composer->composer, "send",
- G_CALLBACK (send_cb), NULL);
- g_signal_connect (composer->composer, "save-draft",
- G_CALLBACK (save_draft_cb), NULL);
+
+ gtk_signal_connect (GTK_OBJECT (composer->composer), "send",
+ GTK_SIGNAL_FUNC (send_cb), NULL);
+ gtk_signal_connect (GTK_OBJECT (composer->composer), "save-draft",
+ GTK_SIGNAL_FUNC (save_draft_cb), NULL);
}
#if 0
@@ -366,7 +346,7 @@ evolution_composer_construct (EvolutionComposer *composer,
g_return_if_fail (EVOLUTION_IS_COMPOSER (composer));
g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
- /*bonobo_object_construct (BONOBO_OBJECT (composer), corba_object);*/
+ bonobo_object_construct (BONOBO_OBJECT (composer), corba_object);
item_handler = BONOBO_OBJECT (
bonobo_item_handler_new (NULL, get_object, composer));
@@ -377,11 +357,10 @@ EvolutionComposer *
evolution_composer_new (void)
{
EvolutionComposer *new;
-#if 0
POA_GNOME_Evolution_Composer *servant;
CORBA_Environment ev;
GNOME_Evolution_Composer corba_object;
-
+
servant = (POA_GNOME_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &Composer_vepv;
@@ -397,28 +376,30 @@ evolution_composer_new (void)
new = gtk_type_new (evolution_composer_get_type ());
corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new),
servant);
-#endif
- new = g_object_new(EVOLUTION_TYPE_COMPOSER, NULL);
- evolution_composer_construct (new, NULL);
+ evolution_composer_construct (new, corba_object);
return new;
}
-BONOBO_TYPE_FUNC_FULL(EvolutionComposer, GNOME_Evolution_Composer, BONOBO_TYPE_OBJECT, evolution_composer)
+E_MAKE_TYPE (evolution_composer, "EvolutionComposer", EvolutionComposer, class_init, init, PARENT_TYPE)
#define GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ComposerFactory"
static BonoboObject *
-factory_fn (BonoboGenericFactory *factory, const char *id, void *closure)
+factory_fn (BonoboGenericFactory *factory, void *closure)
{
if (!mail_config_is_configured ()) {
- e_notice (NULL, GTK_MESSAGE_ERROR,
+ e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Could not create composer window, because you "
"have not yet\nconfigured any identities in the "
"mail component."));
return NULL;
}
+ if (! (session && mail_session_get_interactive ())) {
+ /* Don't return a composer if mailer isn't ready. */
+ return NULL;
+ }
return BONOBO_OBJECT (evolution_composer_new ());
}
@@ -428,7 +409,7 @@ evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
{
if (bonobo_generic_factory_new (GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID,
factory_fn, NULL) == NULL) {
- e_notice (NULL, GTK_MESSAGE_ERROR,
+ e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
_("Cannot initialize the Evolution composer."));
exit (1);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 01:28:33 +0800