callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I should have merged in the patch rather than being lazy and copying the file from the other branch. *kicks myself in the butt*

Browse Source 
svn path=/trunk/; revision=14872
This commit is contained in:
Jeffrey Stedfast
2001-12-04 21:56:38 +00:00
parent 8438d0bc82
commit b15abd7c7e
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
composer/e-msg-composer.c
View File

@ -65,6 +65,8 @@
#include <gal/e-text/e-entry.h> #include <gal/e-text/e-entry.h>
#include <gtkhtml/gtkhtml.h> #include <gtkhtml/gtkhtml.h>
/*#include <addressbook/backend/ebook/e-card.h>*/
#include "widgets/misc/e-charset-picker.h" #include "widgets/misc/e-charset-picker.h"
#include "camel/camel.h" #include "camel/camel.h"
@ -107,11 +109,13 @@ static guint signals[LAST_SIGNAL] = { 0 };
enum { enum {
DND_TYPE_MESSAGE_RFC822, DND_TYPE_MESSAGE_RFC822,
DND_TYPE_TEXT_URI_LIST, DND_TYPE_TEXT_URI_LIST,
DND_TYPE_TEXT_VCARD,
}; };
static GtkTargetEntry drop_types[] = { static GtkTargetEntry drop_types[] = {
{ "message/rfc822", 0, DND_TYPE_MESSAGE_RFC822 }, { "message/rfc822", 0, DND_TYPE_MESSAGE_RFC822 },
{ "text/uri-list", 0, DND_TYPE_TEXT_URI_LIST }, { "text/uri-list", 0, DND_TYPE_TEXT_URI_LIST },
{ "text/x-vcard", 0, DND_TYPE_TEXT_VCARD },
}; };
static const int num_drop_types = sizeof (drop_types) / sizeof (drop_types[0]); static const int num_drop_types = sizeof (drop_types) / sizeof (drop_types[0]);
@ -455,8 +459,6 @@ build_message (EMsgComposer *composer)
camel_internet_address_get (from, 0, NULL, &pgpid); camel_internet_address_get (from, 0, NULL, &pgpid);
} }
printf ("build_message(): pgpid = '%s'\n", pgpid);
mail_crypto_pgp_mime_part_sign (&part, pgpid, CAMEL_CIPHER_HASH_SHA1, &ex); mail_crypto_pgp_mime_part_sign (&part, pgpid, CAMEL_CIPHER_HASH_SHA1, &ex);
if (from) if (from)
@ -1769,8 +1771,6 @@ setup_ui (EMsgComposer *composer)
g_free (default_charset); g_free (default_charset);
if (!session || !camel_session_is_online (session)) { if (!session || !camel_session_is_online (session)) {
char *tooltip;
/* Move the accelerator from Send to Send Later */ /* Move the accelerator from Send to Send Later */
bonobo_ui_component_set_prop ( bonobo_ui_component_set_prop (
composer->uic, "/commands/FileSend", composer->uic, "/commands/FileSend",
@ -2096,6 +2096,7 @@ drag_data_received (EMsgComposer *composer, GdkDragContext *context,
guint info, guint time) guint info, guint time)
{ {
gchar *tmp, *filename, **filenames; gchar *tmp, *filename, **filenames;
CamelMimePart *mime_part;
CamelStream *stream; CamelStream *stream;
CamelURL *url; CamelURL *url;
int i; int i;
@ -2133,6 +2134,17 @@ drag_data_received (EMsgComposer *composer, GdkDragContext *context,
g_free (filenames); g_free (filenames);
break; break;
case DND_TYPE_TEXT_VCARD:
mime_part = camel_mime_part_new ();
camel_mime_part_set_content (mime_part, selection->data,
selection->length, "text/x-vcard");
camel_mime_part_set_disposition (mime_part, "inline");
e_msg_composer_attachment_bar_attach_mime_part
(E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar),
mime_part);
camel_object_unref (CAMEL_OBJECT (mime_part));
default: default:
break; break;
} }