diff options
author | Tarnyko <tarnyko@tarnyko.net> | 2014-02-26 23:15:21 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2014-02-26 23:15:21 +0800 |
commit | 5c60d57082ede522169b65efa67a1e268989b487 (patch) | |
tree | b77a62c5fbee1719f7216f7135c068ca081c9c77 /mail/e-mail-browser.c | |
parent | 5727d74fb54a1c76922099d023a182418c3bac70 (diff) | |
download | gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.gz gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.bz2 gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.lz gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.xz gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.zst gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.zip |
Replace 'interface' with 'iface' in the code
Win32 headers have a #define for 'interface', which breaks the build
when this word is used in the code, thus replace it to 'iface',
the same way as GLib or GTK+ code use to have it. (See bug #722068.)
Diffstat (limited to 'mail/e-mail-browser.c')
-rw-r--r-- | mail/e-mail-browser.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 549892b2ca..8d0982d52c 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -101,7 +101,7 @@ static const gchar *ui = "</ui>"; static void e_mail_browser_reader_init - (EMailReaderInterface *interface); + (EMailReaderInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailBrowser, @@ -838,7 +838,7 @@ static void mail_browser_set_message (EMailReader *reader, const gchar *uid) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; EMailBrowser *browser; CamelMessageInfo *info; CamelFolder *folder; @@ -846,8 +846,8 @@ mail_browser_set_message (EMailReader *reader, browser = E_MAIL_BROWSER (reader); /* Chain up to parent's set_message() method. */ - interface = g_type_default_interface_peek (E_TYPE_MAIL_READER); - interface->set_message (reader, uid); + iface = g_type_default_interface_peek (E_TYPE_MAIL_READER); + iface->set_message (reader, uid); if (uid == NULL) { e_mail_browser_close (browser); @@ -1010,18 +1010,18 @@ e_mail_browser_class_init (EMailBrowserClass *class) } static void -e_mail_browser_reader_init (EMailReaderInterface *interface) +e_mail_browser_reader_init (EMailReaderInterface *iface) { - interface->get_action_group = mail_browser_get_action_group; - interface->get_backend = mail_browser_get_backend; - interface->get_mail_display = mail_browser_get_mail_display; - interface->get_hide_deleted = mail_browser_get_hide_deleted; - interface->get_message_list = mail_browser_get_message_list; - interface->get_popup_menu = mail_browser_get_popup_menu; - interface->get_preview_pane = mail_browser_get_preview_pane; - interface->get_window = mail_browser_get_window; - interface->set_message = mail_browser_set_message; - interface->composer_created = mail_browser_composer_created; + iface->get_action_group = mail_browser_get_action_group; + iface->get_backend = mail_browser_get_backend; + iface->get_mail_display = mail_browser_get_mail_display; + iface->get_hide_deleted = mail_browser_get_hide_deleted; + iface->get_message_list = mail_browser_get_message_list; + iface->get_popup_menu = mail_browser_get_popup_menu; + iface->get_preview_pane = mail_browser_get_preview_pane; + iface->get_window = mail_browser_get_window; + iface->set_message = mail_browser_set_message; + iface->composer_created = mail_browser_composer_created; } static void |