Rename EMailPartVCardInline to EMailPartVCard.

4 files changed, 20 insertions, 20 deletions

diff --git a/modules/vcard-inline/Makefile.am b/modules/vcard-inline/Makefile.am
index 47d87af104..16ef25da26 100644
--- a/modules/vcard-inline/Makefile.am
+++ b/modules/vcard-inline/Makefile.am
@@ -14,7 +14,7 @@ module_vcard_inline_la_SOURCES =				\
 	e-mail-formatter-vcard-inline.h					\
 	e-mail-parser-vcard-inline.c					\
 	e-mail-parser-vcard-inline.h					\
-	e-mail-part-vcard-inline.h					\
+	e-mail-part-vcard.h						\
 	evolution-module-vcard-inline.c
 
 module_vcard_inline_la_LIBADD =				\
diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index 6baa818138..d120481fbf 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -21,7 +21,7 @@
 #endif
 
 #include "e-mail-formatter-vcard-inline.h"
-#include "e-mail-part-vcard-inline.h"
+#include "e-mail-part-vcard.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -64,11 +64,11 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension,
                           CamelStream *stream,
                           GCancellable *cancellable)
 {
-	EMailPartVCardInline *vcard_part;
+	EMailPartVCard *vcard_part;
 
 	g_return_val_if_fail (E_IS_MAIL_PART_VCARD (part), FALSE);
 
-	vcard_part = (EMailPartVCardInline *) part;
+	vcard_part = (EMailPartVCard *) part;
 
 	if (context->mode == E_MAIL_FORMATTER_MODE_RAW)  {
 
diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c
index e59c2543d4..899f24bc2b 100644
--- a/modules/vcard-inline/e-mail-parser-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 
 #include "e-mail-parser-vcard-inline.h"
-#include "e-mail-part-vcard-inline.h"
+#include "e-mail-part-vcard.h"
 
 #include <camel/camel.h>
 
@@ -70,7 +70,7 @@ static const gchar *parser_mime_types[] = {
 static void
 mail_part_vcard_inline_free (EMailPart *mail_part)
 {
-	EMailPartVCardInline *vi_part = (EMailPartVCardInline *) mail_part;
+	EMailPartVCard *vi_part = (EMailPartVCard *) mail_part;
 
 	g_clear_object (&vi_part->contact_display);
 	g_clear_object (&vi_part->message_label);
@@ -134,7 +134,7 @@ client_connect_cb (GObject *source_object,
 static void
 save_vcard_cb (WebKitDOMEventTarget *button,
                WebKitDOMEvent *event,
-               EMailPartVCardInline *vcard_part)
+               EMailPartVCard *vcard_part)
 {
 	EShell *shell;
 	ESource *source;
@@ -180,7 +180,7 @@ save_vcard_cb (WebKitDOMEventTarget *button,
 static void
 display_mode_toggle_cb (WebKitDOMEventTarget *button,
                         WebKitDOMEvent *event,
-                        EMailPartVCardInline *vcard_part)
+                        EMailPartVCard *vcard_part)
 {
 	EABContactDisplayMode mode;
 	gchar *uri;
@@ -238,7 +238,7 @@ display_mode_toggle_cb (WebKitDOMEventTarget *button,
 }
 
 static void
-bind_dom (EMailPartVCardInline *vcard_part,
+bind_dom (EMailPartVCard *vcard_part,
           WebKitDOMElement *attachment)
 {
 	WebKitDOMNodeList *list;
@@ -290,7 +290,7 @@ bind_dom (EMailPartVCardInline *vcard_part,
 }
 
 static void
-decode_vcard (EMailPartVCardInline *vcard_part,
+decode_vcard (EMailPartVCard *vcard_part,
               CamelMimePart *mime_part)
 {
 	CamelDataWrapper *data_wrapper;
@@ -329,15 +329,15 @@ empe_vcard_inline_parse (EMailParserExtension *extension,
                          GCancellable *cancellable,
                          GQueue *out_mail_parts)
 {
-	EMailPartVCardInline *vcard_part;
+	EMailPartVCard *vcard_part;
 	GQueue work_queue = G_QUEUE_INIT;
 	gint len;
 
 	len = part_id->len;
 	g_string_append (part_id, ".org-gnome-vcard-inline-display");
 
-	vcard_part = (EMailPartVCardInline *) e_mail_part_subclass_new (
-		part, part_id->str, sizeof (EMailPartVCardInline),
+	vcard_part = (EMailPartVCard *) e_mail_part_subclass_new (
+		part, part_id->str, sizeof (EMailPartVCard),
 		(GFreeFunc) mail_part_vcard_inline_free);
 	vcard_part->parent.mime_type = camel_content_type_simple (
 		camel_mime_part_get_content_type (part));
diff --git a/modules/vcard-inline/e-mail-part-vcard-inline.h b/modules/vcard-inline/e-mail-part-vcard.h
index b74dd76d1d..c05b0a8570 100644
--- a/modules/vcard-inline/e-mail-part-vcard-inline.h
+++ b/modules/vcard-inline/e-mail-part-vcard.h
@@ -1,5 +1,5 @@
 /*
- * e-mail-part-vcard-inline.h
+ * e-mail-part-vcard.h
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef E_MAIL_PART_VCARD_INLINE_H
-#define E_MAIL_PART_VCARD_INLINE_H
+#ifndef E_MAIL_PART_VCARD_H
+#define E_MAIL_PART_VCARD_H
 
 #include <em-format/e-mail-part.h>
 
@@ -25,13 +25,13 @@
 #include <webkit/webkitdom.h>
 
 #define E_IS_MAIL_PART_VCARD(part) \
-	(E_MAIL_PART_IS (part, EMailPartVCardInline))
+	(E_MAIL_PART_IS (part, EMailPartVCard))
 
 G_BEGIN_DECLS
 
-typedef struct _EMailPartVCardInline EMailPartVCardInline;
+typedef struct _EMailPartVCard EMailPartVCard;
 
-struct _EMailPartVCardInline {
+struct _EMailPartVCard {
 	EMailPart parent;
 
 	GSList *contact_list;
@@ -49,5 +49,5 @@ struct _EMailPartVCardInline {
 
 G_END_DECLS
 
-#endif /* E_MAIL_PART_VCARD_INLINE_H */
+#endif /* E_MAIL_PART_VCARD_H */