aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/vcard-inline/vcard-inline.c
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/vcard-inline/vcard-inline.c')
-rw-r--r--plugins/vcard-inline/vcard-inline.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 0aafc8c82d..0b7756211f 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -24,9 +24,6 @@
#include <glib/gi18n-lib.h>
#include <libebook/e-book.h>
#include <libebook/e-contact.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream-mem.h>
#include <gtkhtml/gtkhtml-embedded.h>
#include "addressbook/gui/merging/eab-contact-merging.h"
@@ -52,6 +49,13 @@ static gint org_gnome_vcard_inline_classid;
/* Forward Declarations */
void org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target);
+gint e_plugin_lib_enable (EPlugin *ep, gint enable);
+
+gint
+e_plugin_lib_enable (EPlugin *ep, gint enable)
+{
+ return 0;
+}
static void
org_gnome_vcard_inline_pobject_free (EMFormatHTMLPObject *object)
@@ -94,7 +98,7 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
/* Stream takes ownership of the byte array. */
stream = camel_stream_mem_new_with_byte_array (array);
- data_wrapper = camel_medium_get_content_object (medium);
+ data_wrapper = camel_medium_get_content (medium);
camel_data_wrapper_decode_to_stream (data_wrapper, stream);
/* because the result is not NULL-terminated */
@@ -104,8 +108,8 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
contact_list = eab_contact_list_from_string (string);
vcard_object->contact_list = contact_list;
- camel_object_unref (mime_part);
- camel_object_unref (stream);
+ g_object_unref (mime_part);
+ g_object_unref (stream);
}
static void
@@ -280,7 +284,7 @@ org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target)
classid, target->part,
org_gnome_vcard_inline_embed);
- camel_object_ref (target->part);
+ g_object_ref (target->part);
vcard_object->object.free = org_gnome_vcard_inline_pobject_free;
org_gnome_vcard_inline_decode (vcard_object, target->part);