From 8858e3983c4321e1bc2a541c5adc327209805632 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 19 May 2013 12:05:41 -0400 Subject: Rename EMailPartVCardInline to EMailPartVCard. --- modules/vcard-inline/Makefile.am | 2 +- .../vcard-inline/e-mail-formatter-vcard-inline.c | 6 +-- modules/vcard-inline/e-mail-parser-vcard-inline.c | 18 ++++---- modules/vcard-inline/e-mail-part-vcard-inline.h | 53 ---------------------- modules/vcard-inline/e-mail-part-vcard.h | 53 ++++++++++++++++++++++ 5 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 modules/vcard-inline/e-mail-part-vcard-inline.h create mode 100644 modules/vcard-inline/e-mail-part-vcard.h (limited to 'modules') 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 @@ -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 #include "e-mail-parser-vcard-inline.h" -#include "e-mail-part-vcard-inline.h" +#include "e-mail-part-vcard.h" #include @@ -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-inline.h deleted file mode 100644 index b74dd76d1d..0000000000 --- a/modules/vcard-inline/e-mail-part-vcard-inline.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * e-mail-part-vcard-inline.h - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - */ - -#ifndef E_MAIL_PART_VCARD_INLINE_H -#define E_MAIL_PART_VCARD_INLINE_H - -#include - -#include -#include - -#define E_IS_MAIL_PART_VCARD(part) \ - (E_MAIL_PART_IS (part, EMailPartVCardInline)) - -G_BEGIN_DECLS - -typedef struct _EMailPartVCardInline EMailPartVCardInline; - -struct _EMailPartVCardInline { - EMailPart parent; - - GSList *contact_list; - GtkWidget *contact_display; - GtkWidget *message_label; - - EABContactFormatter *formatter; - WebKitDOMElement *iframe; - WebKitDOMElement *toggle_button; - WebKitDOMElement *save_button; - - CamelFolder *folder; - gchar *message_uid; -}; - -G_END_DECLS - -#endif /* E_MAIL_PART_VCARD_INLINE_H */ - diff --git a/modules/vcard-inline/e-mail-part-vcard.h b/modules/vcard-inline/e-mail-part-vcard.h new file mode 100644 index 0000000000..c05b0a8570 --- /dev/null +++ b/modules/vcard-inline/e-mail-part-vcard.h @@ -0,0 +1,53 @@ +/* + * 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 + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + */ + +#ifndef E_MAIL_PART_VCARD_H +#define E_MAIL_PART_VCARD_H + +#include + +#include +#include + +#define E_IS_MAIL_PART_VCARD(part) \ + (E_MAIL_PART_IS (part, EMailPartVCard)) + +G_BEGIN_DECLS + +typedef struct _EMailPartVCard EMailPartVCard; + +struct _EMailPartVCard { + EMailPart parent; + + GSList *contact_list; + GtkWidget *contact_display; + GtkWidget *message_label; + + EABContactFormatter *formatter; + WebKitDOMElement *iframe; + WebKitDOMElement *toggle_button; + WebKitDOMElement *save_button; + + CamelFolder *folder; + gchar *message_uid; +}; + +G_END_DECLS + +#endif /* E_MAIL_PART_VCARD_H */ + -- cgit v1.2.3