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 | |
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')
-rw-r--r-- | mail/e-mail-account-store.c | 8 | ||||
-rw-r--r-- | mail/e-mail-autoconfig.c | 6 | ||||
-rw-r--r-- | mail/e-mail-browser.c | 30 | ||||
-rw-r--r-- | mail/e-mail-config-activity-page.c | 6 | ||||
-rw-r--r-- | mail/e-mail-config-confirm-page.c | 10 | ||||
-rw-r--r-- | mail/e-mail-config-defaults-page.c | 8 | ||||
-rw-r--r-- | mail/e-mail-config-identity-page.c | 10 | ||||
-rw-r--r-- | mail/e-mail-config-lookup-page.c | 12 | ||||
-rw-r--r-- | mail/e-mail-config-page.c | 46 | ||||
-rw-r--r-- | mail/e-mail-config-provider-page.c | 8 | ||||
-rw-r--r-- | mail/e-mail-config-receiving-page.c | 8 | ||||
-rw-r--r-- | mail/e-mail-config-security-page.c | 8 | ||||
-rw-r--r-- | mail/e-mail-config-sending-page.c | 8 | ||||
-rw-r--r-- | mail/e-mail-config-service-page.c | 10 | ||||
-rw-r--r-- | mail/e-mail-config-summary-page.c | 12 | ||||
-rw-r--r-- | mail/e-mail-config-welcome-page.c | 10 | ||||
-rw-r--r-- | mail/e-mail-config-window.c | 6 | ||||
-rw-r--r-- | mail/e-mail-label-list-store.c | 6 | ||||
-rw-r--r-- | mail/e-mail-paned-view.c | 26 | ||||
-rw-r--r-- | mail/e-mail-reader.c | 156 | ||||
-rw-r--r-- | mail/em-folder-tree.c | 66 | ||||
-rw-r--r-- | mail/em-utils.c | 1 | ||||
-rw-r--r-- | mail/message-list.c | 54 |
23 files changed, 257 insertions, 258 deletions
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c index 4301eb6e25..cfcbbc9caa 100644 --- a/mail/e-mail-account-store.c +++ b/mail/e-mail-account-store.c @@ -70,7 +70,7 @@ static guint signals[LAST_SIGNAL]; /* Forward Declarations */ static void e_mail_account_store_interface_init - (GtkTreeModelIface *interface); + (GtkTreeModelIface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailAccountStore, @@ -943,10 +943,10 @@ e_mail_account_store_class_init (EMailAccountStoreClass *class) } static void -e_mail_account_store_interface_init (GtkTreeModelIface *interface) +e_mail_account_store_interface_init (GtkTreeModelIface *iface) { - interface->row_changed = mail_account_store_row_changed; - interface->row_inserted = mail_account_store_row_inserted; + iface->row_changed = mail_account_store_row_changed; + iface->row_inserted = mail_account_store_row_inserted; } static void diff --git a/mail/e-mail-autoconfig.c b/mail/e-mail-autoconfig.c index 8e4d403238..93261c4107 100644 --- a/mail/e-mail-autoconfig.c +++ b/mail/e-mail-autoconfig.c @@ -114,7 +114,7 @@ enum { }; /* Forward Declarations */ -static void e_mail_autoconfig_initable_init (GInitableIface *interface); +static void e_mail_autoconfig_initable_init (GInitableIface *iface); /* By default, the GAsyncInitable interface calls GInitable.init() * from a separate thread, so we only have to override GInitable. */ @@ -723,9 +723,9 @@ e_mail_autoconfig_class_init (EMailAutoconfigClass *class) } static void -e_mail_autoconfig_initable_init (GInitableIface *interface) +e_mail_autoconfig_initable_init (GInitableIface *iface) { - interface->init = mail_autoconfig_initable_init; + iface->init = mail_autoconfig_initable_init; } static void 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 diff --git a/mail/e-mail-config-activity-page.c b/mail/e-mail-config-activity-page.c index a5db47b349..c925216453 100644 --- a/mail/e-mail-config-activity-page.c +++ b/mail/e-mail-config-activity-page.c @@ -30,7 +30,7 @@ struct _EMailConfigActivityPagePrivate { /* Forward Declarations */ static void e_mail_config_activity_page_alert_sink_init - (EAlertSinkInterface *interface); + (EAlertSinkInterface *iface); G_DEFINE_ABSTRACT_TYPE_WITH_CODE ( EMailConfigActivityPage, @@ -133,9 +133,9 @@ e_mail_config_activity_page_class_init (EMailConfigActivityPageClass *class) } static void -e_mail_config_activity_page_alert_sink_init (EAlertSinkInterface *interface) +e_mail_config_activity_page_alert_sink_init (EAlertSinkInterface *iface) { - interface->submit_alert = mail_config_activity_page_submit_alert; + iface->submit_alert = mail_config_activity_page_submit_alert; } static void diff --git a/mail/e-mail-config-confirm-page.c b/mail/e-mail-config-confirm-page.c index 94ff2b4ed5..b1767a6a09 100644 --- a/mail/e-mail-config-confirm-page.c +++ b/mail/e-mail-config-confirm-page.c @@ -37,7 +37,7 @@ enum { /* Forward Declarations */ static void e_mail_config_confirm_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigConfirmPage, @@ -163,11 +163,11 @@ e_mail_config_confirm_page_class_init (EMailConfigConfirmPageClass *class) } static void -e_mail_config_confirm_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_confirm_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Done"); - interface->page_type = GTK_ASSISTANT_PAGE_CONFIRM; - interface->sort_order = E_MAIL_CONFIG_CONFIRM_PAGE_SORT_ORDER; + iface->title = _("Done"); + iface->page_type = GTK_ASSISTANT_PAGE_CONFIRM; + iface->sort_order = E_MAIL_CONFIG_CONFIRM_PAGE_SORT_ORDER; } static void diff --git a/mail/e-mail-config-defaults-page.c b/mail/e-mail-config-defaults-page.c index 50cda447d7..7298e09fd6 100644 --- a/mail/e-mail-config-defaults-page.c +++ b/mail/e-mail-config-defaults-page.c @@ -50,7 +50,7 @@ enum { /* Forward Declarations */ static void e_mail_config_defaults_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigDefaultsPage, @@ -851,10 +851,10 @@ e_mail_config_defaults_page_class_init (EMailConfigDefaultsPageClass *class) } static void -e_mail_config_defaults_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_defaults_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Defaults"); - interface->sort_order = E_MAIL_CONFIG_DEFAULTS_PAGE_SORT_ORDER; + iface->title = _("Defaults"); + iface->sort_order = E_MAIL_CONFIG_DEFAULTS_PAGE_SORT_ORDER; } static void diff --git a/mail/e-mail-config-identity-page.c b/mail/e-mail-config-identity-page.c index edec711098..6c9072f3bf 100644 --- a/mail/e-mail-config-identity-page.c +++ b/mail/e-mail-config-identity-page.c @@ -49,7 +49,7 @@ enum { /* Forward Declarations */ static void e_mail_config_identity_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigIdentityPage, @@ -672,11 +672,11 @@ e_mail_config_identity_page_class_init (EMailConfigIdentityPageClass *class) } static void -e_mail_config_identity_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_identity_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Identity"); - interface->sort_order = E_MAIL_CONFIG_IDENTITY_PAGE_SORT_ORDER; - interface->check_complete = mail_config_identity_page_check_complete; + iface->title = _("Identity"); + iface->sort_order = E_MAIL_CONFIG_IDENTITY_PAGE_SORT_ORDER; + iface->check_complete = mail_config_identity_page_check_complete; } static void diff --git a/mail/e-mail-config-lookup-page.c b/mail/e-mail-config-lookup-page.c index a5036e2eac..8986469530 100644 --- a/mail/e-mail-config-lookup-page.c +++ b/mail/e-mail-config-lookup-page.c @@ -22,7 +22,7 @@ /* Forward Declarations */ static void e_mail_config_lookup_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigLookupPage, @@ -86,14 +86,14 @@ e_mail_config_lookup_page_class_init (EMailConfigLookupPageClass *class) } static void -e_mail_config_lookup_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_lookup_page_interface_init (EMailConfigPageInterface *iface) { /* Do not set a title. We don't want this * page listed in a GtkAssistant sidebar. */ - interface->title = ""; - interface->sort_order = E_MAIL_CONFIG_LOOKUP_PAGE_SORT_ORDER; - interface->page_type = GTK_ASSISTANT_PAGE_CUSTOM; - interface->check_complete = mail_config_lookup_page_check_complete; + iface->title = ""; + iface->sort_order = E_MAIL_CONFIG_LOOKUP_PAGE_SORT_ORDER; + iface->page_type = GTK_ASSISTANT_PAGE_CUSTOM; + iface->check_complete = mail_config_lookup_page_check_complete; } static void diff --git a/mail/e-mail-config-page.c b/mail/e-mail-config-page.c index cfef05dedb..a6047b9d04 100644 --- a/mail/e-mail-config-page.c +++ b/mail/e-mail-config-page.c @@ -120,19 +120,19 @@ mail_config_page_check_complete_accumulator (GSignalInvocationHint *ihint, } static void -e_mail_config_page_default_init (EMailConfigPageInterface *interface) +e_mail_config_page_default_init (EMailConfigPageInterface *iface) { - interface->title = _("Untitled"); - interface->page_type = GTK_ASSISTANT_PAGE_CONTENT; + iface->title = _("Untitled"); + iface->page_type = GTK_ASSISTANT_PAGE_CONTENT; - interface->check_complete = mail_config_page_check_complete; - interface->submit_sync = mail_config_page_submit_sync; - interface->submit = mail_config_page_submit; - interface->submit_finish = mail_config_page_submit_finish; + iface->check_complete = mail_config_page_check_complete; + iface->submit_sync = mail_config_page_submit_sync; + iface->submit = mail_config_page_submit; + iface->submit_finish = mail_config_page_submit_finish; signals[CHANGED] = g_signal_new ( "changed", - G_TYPE_FROM_INTERFACE (interface), + G_TYPE_FROM_INTERFACE (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMailConfigPageInterface, changed), NULL, NULL, @@ -141,7 +141,7 @@ e_mail_config_page_default_init (EMailConfigPageInterface *interface) signals[SETUP_DEFAULTS] = g_signal_new ( "setup-defaults", - G_TYPE_FROM_INTERFACE (interface), + G_TYPE_FROM_INTERFACE (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMailConfigPageInterface, setup_defaults), NULL, NULL, @@ -150,7 +150,7 @@ e_mail_config_page_default_init (EMailConfigPageInterface *interface) signals[CHECK_COMPLETE] = g_signal_new ( "check-complete", - G_TYPE_FROM_INTERFACE (interface), + G_TYPE_FROM_INTERFACE (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMailConfigPageInterface, check_complete), mail_config_page_check_complete_accumulator, NULL, @@ -159,7 +159,7 @@ e_mail_config_page_default_init (EMailConfigPageInterface *interface) signals[COMMIT_CHANGES] = g_signal_new ( "commit-changes", - G_TYPE_FROM_INTERFACE (interface), + G_TYPE_FROM_INTERFACE (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMailConfigPageInterface, commit_changes), NULL, NULL, @@ -243,14 +243,14 @@ e_mail_config_page_submit_sync (EMailConfigPage *page, GCancellable *cancellable, GError **error) { - EMailConfigPageInterface *interface; + EMailConfigPageInterface *iface; g_return_val_if_fail (E_IS_MAIL_CONFIG_PAGE (page), FALSE); - interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page); - g_return_val_if_fail (interface->submit_sync != NULL, FALSE); + iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page); + g_return_val_if_fail (iface->submit_sync != NULL, FALSE); - return interface->submit_sync (page, cancellable, error); + return iface->submit_sync (page, cancellable, error); } void @@ -259,14 +259,14 @@ e_mail_config_page_submit (EMailConfigPage *page, GAsyncReadyCallback callback, gpointer user_data) { - EMailConfigPageInterface *interface; + EMailConfigPageInterface *iface; g_return_if_fail (E_IS_MAIL_CONFIG_PAGE (page)); - interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page); - g_return_if_fail (interface->submit != NULL); + iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page); + g_return_if_fail (iface->submit != NULL); - return interface->submit (page, cancellable, callback, user_data); + return iface->submit (page, cancellable, callback, user_data); } gboolean @@ -274,14 +274,14 @@ e_mail_config_page_submit_finish (EMailConfigPage *page, GAsyncResult *result, GError **error) { - EMailConfigPageInterface *interface; + EMailConfigPageInterface *iface; g_return_val_if_fail (E_IS_MAIL_CONFIG_PAGE (page), FALSE); g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); - interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page); - g_return_val_if_fail (interface->submit_finish != NULL, FALSE); + iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page); + g_return_val_if_fail (iface->submit_finish != NULL, FALSE); - return interface->submit_finish (page, result, error); + return iface->submit_finish (page, result, error); } diff --git a/mail/e-mail-config-provider-page.c b/mail/e-mail-config-provider-page.c index c43fdcc696..0bd0033d6b 100644 --- a/mail/e-mail-config-provider-page.c +++ b/mail/e-mail-config-provider-page.c @@ -42,7 +42,7 @@ enum { /* Forward Declarations */ static void e_mail_config_provider_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigProviderPage, @@ -694,10 +694,10 @@ e_mail_config_provider_page_class_init (EMailConfigProviderPageClass *class) } static void -e_mail_config_provider_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_provider_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Receiving Options"); - interface->sort_order = E_MAIL_CONFIG_PROVIDER_PAGE_SORT_ORDER; + iface->title = _("Receiving Options"); + iface->sort_order = E_MAIL_CONFIG_PROVIDER_PAGE_SORT_ORDER; } static void diff --git a/mail/e-mail-config-receiving-page.c b/mail/e-mail-config-receiving-page.c index 10bb3b06e4..b289ef8554 100644 --- a/mail/e-mail-config-receiving-page.c +++ b/mail/e-mail-config-receiving-page.c @@ -22,7 +22,7 @@ /* Forward Declarations */ static void e_mail_config_receiving_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigReceivingPage, @@ -44,10 +44,10 @@ e_mail_config_receiving_page_class_init (EMailConfigReceivingPageClass *class) } static void -e_mail_config_receiving_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_receiving_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Receiving Email"); - interface->sort_order = E_MAIL_CONFIG_RECEIVING_PAGE_SORT_ORDER; + iface->title = _("Receiving Email"); + iface->sort_order = E_MAIL_CONFIG_RECEIVING_PAGE_SORT_ORDER; } static void diff --git a/mail/e-mail-config-security-page.c b/mail/e-mail-config-security-page.c index c6b2de3c91..3250576f75 100644 --- a/mail/e-mail-config-security-page.c +++ b/mail/e-mail-config-security-page.c @@ -42,7 +42,7 @@ enum { /* Forward Declarations */ static void e_mail_config_security_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigSecurityPage, @@ -640,10 +640,10 @@ e_mail_config_security_page_class_init (EMailConfigSecurityPageClass *class) } static void -e_mail_config_security_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_security_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Security"); - interface->sort_order = E_MAIL_CONFIG_SECURITY_PAGE_SORT_ORDER; + iface->title = _("Security"); + iface->sort_order = E_MAIL_CONFIG_SECURITY_PAGE_SORT_ORDER; } static void diff --git a/mail/e-mail-config-sending-page.c b/mail/e-mail-config-sending-page.c index 1ac39ffe68..56d39de30a 100644 --- a/mail/e-mail-config-sending-page.c +++ b/mail/e-mail-config-sending-page.c @@ -22,7 +22,7 @@ /* Forward Declarations */ static void e_mail_config_sending_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigSendingPage, @@ -44,10 +44,10 @@ e_mail_config_sending_page_class_init (EMailConfigSendingPageClass *class) } static void -e_mail_config_sending_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_sending_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Sending Email"); - interface->sort_order = E_MAIL_CONFIG_SENDING_PAGE_SORT_ORDER; + iface->title = _("Sending Email"); + iface->sort_order = E_MAIL_CONFIG_SENDING_PAGE_SORT_ORDER; } static void diff --git a/mail/e-mail-config-service-page.c b/mail/e-mail-config-service-page.c index 7e62ced82a..a27fac0d2e 100644 --- a/mail/e-mail-config-service-page.c +++ b/mail/e-mail-config-service-page.c @@ -86,7 +86,7 @@ enum { /* Forward Declarations */ static void e_mail_config_service_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_ABSTRACT_TYPE_WITH_CODE ( EMailConfigServicePage, @@ -559,11 +559,11 @@ e_mail_config_service_page_class_init (EMailConfigServicePageClass *class) } static void -e_mail_config_service_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_service_page_interface_init (EMailConfigPageInterface *iface) { - interface->setup_defaults = mail_config_service_page_setup_defaults; - interface->check_complete = mail_config_service_page_check_complete; - interface->commit_changes = mail_config_service_page_commit_changes; + iface->setup_defaults = mail_config_service_page_setup_defaults; + iface->check_complete = mail_config_service_page_check_complete; + iface->commit_changes = mail_config_service_page_commit_changes; } static void diff --git a/mail/e-mail-config-summary-page.c b/mail/e-mail-config-summary-page.c index bfee28a254..79a04e287c 100644 --- a/mail/e-mail-config-summary-page.c +++ b/mail/e-mail-config-summary-page.c @@ -70,7 +70,7 @@ static gulong signals[LAST_SIGNAL]; /* Forward Declarations */ static void e_mail_config_summary_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigSummaryPage, @@ -781,12 +781,12 @@ e_mail_config_summary_page_class_init (EMailConfigSummaryPageClass *class) } static void -e_mail_config_summary_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_summary_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Account Summary"); - interface->sort_order = E_MAIL_CONFIG_SUMMARY_PAGE_SORT_ORDER; - interface->check_complete = mail_config_summary_page_check_complete; - interface->commit_changes = mail_config_summary_page_commit_changes; + iface->title = _("Account Summary"); + iface->sort_order = E_MAIL_CONFIG_SUMMARY_PAGE_SORT_ORDER; + iface->check_complete = mail_config_summary_page_check_complete; + iface->commit_changes = mail_config_summary_page_commit_changes; } static void diff --git a/mail/e-mail-config-welcome-page.c b/mail/e-mail-config-welcome-page.c index 401a2c9ec9..4459a23e46 100644 --- a/mail/e-mail-config-welcome-page.c +++ b/mail/e-mail-config-welcome-page.c @@ -37,7 +37,7 @@ enum { /* Forward Declarations */ static void e_mail_config_welcome_page_interface_init - (EMailConfigPageInterface *interface); + (EMailConfigPageInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailConfigWelcomePage, @@ -161,11 +161,11 @@ e_mail_config_welcome_page_class_init (EMailConfigWelcomePageClass *class) } static void -e_mail_config_welcome_page_interface_init (EMailConfigPageInterface *interface) +e_mail_config_welcome_page_interface_init (EMailConfigPageInterface *iface) { - interface->title = _("Welcome"); - interface->page_type = GTK_ASSISTANT_PAGE_INTRO; - interface->sort_order = E_MAIL_CONFIG_WELCOME_PAGE_SORT_ORDER; + iface->title = _("Welcome"); + iface->page_type = GTK_ASSISTANT_PAGE_INTRO; + iface->sort_order = E_MAIL_CONFIG_WELCOME_PAGE_SORT_ORDER; } static void diff --git a/mail/e-mail-config-window.c b/mail/e-mail-config-window.c index 1608e67867..e200132f43 100644 --- a/mail/e-mail-config-window.c +++ b/mail/e-mail-config-window.c @@ -56,7 +56,7 @@ enum { /* Forward Declarations */ static void e_mail_config_window_alert_sink_init - (EAlertSinkInterface *interface); + (EAlertSinkInterface *iface); static guint signals[LAST_SIGNAL]; @@ -492,9 +492,9 @@ e_mail_config_window_class_init (EMailConfigWindowClass *class) } static void -e_mail_config_window_alert_sink_init (EAlertSinkInterface *interface) +e_mail_config_window_alert_sink_init (EAlertSinkInterface *iface) { - interface->submit_alert = mail_config_window_submit_alert; + iface->submit_alert = mail_config_window_submit_alert; } static void diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c index 0ef9c352c1..3d9a1a8784 100644 --- a/mail/e-mail-label-list-store.c +++ b/mail/e-mail-label-list-store.c @@ -62,7 +62,7 @@ static struct { /* Forward Declarations */ static void e_mail_label_list_store_interface_init - (GtkTreeModelIface *interface); + (GtkTreeModelIface *iface); static void labels_settings_changed_cb (GSettings *settings, const gchar *key, gpointer user_data); @@ -437,9 +437,9 @@ e_mail_label_list_store_class_init (EMailLabelListStoreClass *class) } static void -e_mail_label_list_store_interface_init (GtkTreeModelIface *interface) +e_mail_label_list_store_interface_init (GtkTreeModelIface *iface) { - interface->row_inserted = mail_label_list_store_row_inserted; + iface->row_inserted = mail_label_list_store_row_inserted; } static void diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index d0d58240f2..0a9a0c0f1a 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -71,7 +71,7 @@ enum { #define STATE_GROUP_GLOBAL_FOLDER "GlobalFolder" /* Forward Declarations */ -static void e_mail_paned_view_reader_init (EMailReaderInterface *interface); +static void e_mail_paned_view_reader_init (EMailReaderInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMailPanedView, e_mail_paned_view, E_TYPE_MAIL_VIEW, @@ -1034,19 +1034,19 @@ e_mail_paned_view_class_init (EMailPanedViewClass *class) } static void -e_mail_paned_view_reader_init (EMailReaderInterface *interface) +e_mail_paned_view_reader_init (EMailReaderInterface *iface) { - interface->get_action_group = mail_paned_view_get_action_group; - interface->get_alert_sink = mail_paned_view_get_alert_sink; - interface->get_backend = mail_paned_view_get_backend; - interface->get_mail_display = mail_paned_view_get_mail_display; - interface->get_hide_deleted = mail_paned_view_get_hide_deleted; - interface->get_message_list = mail_paned_view_get_message_list; - interface->get_popup_menu = mail_paned_view_get_popup_menu; - interface->get_preview_pane = mail_paned_view_get_preview_pane; - interface->get_window = mail_paned_view_get_window; - interface->set_folder = mail_paned_view_set_folder; - interface->open_selected_mail = mail_paned_view_reader_open_selected_mail; + iface->get_action_group = mail_paned_view_get_action_group; + iface->get_alert_sink = mail_paned_view_get_alert_sink; + iface->get_backend = mail_paned_view_get_backend; + iface->get_mail_display = mail_paned_view_get_mail_display; + iface->get_hide_deleted = mail_paned_view_get_hide_deleted; + iface->get_message_list = mail_paned_view_get_message_list; + iface->get_popup_menu = mail_paned_view_get_popup_menu; + iface->get_preview_pane = mail_paned_view_get_preview_pane; + iface->get_window = mail_paned_view_get_window; + iface->set_folder = mail_paned_view_set_folder; + iface->open_selected_mail = mail_paned_view_reader_open_selected_mail; } static void diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 5537954267..b3dadcf6d5 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -3613,24 +3613,24 @@ mail_reader_init_charset_actions (EMailReader *reader, } static void -e_mail_reader_default_init (EMailReaderInterface *interface) +e_mail_reader_default_init (EMailReaderInterface *iface) { quark_private = g_quark_from_static_string ("e-mail-reader-private"); - interface->get_alert_sink = mail_reader_get_alert_sink; - interface->get_selected_uids = mail_reader_get_selected_uids; - interface->ref_folder = mail_reader_ref_folder; - interface->set_folder = mail_reader_set_folder; - interface->set_message = mail_reader_set_message; - interface->open_selected_mail = e_mail_reader_open_selected; - interface->folder_loaded = mail_reader_folder_loaded; - interface->message_loaded = mail_reader_message_loaded; - interface->message_seen = mail_reader_message_seen; - interface->show_search_bar = mail_reader_show_search_bar; - interface->update_actions = mail_reader_update_actions; + iface->get_alert_sink = mail_reader_get_alert_sink; + iface->get_selected_uids = mail_reader_get_selected_uids; + iface->ref_folder = mail_reader_ref_folder; + iface->set_folder = mail_reader_set_folder; + iface->set_message = mail_reader_set_message; + iface->open_selected_mail = e_mail_reader_open_selected; + iface->folder_loaded = mail_reader_folder_loaded; + iface->message_loaded = mail_reader_message_loaded; + iface->message_seen = mail_reader_message_seen; + iface->show_search_bar = mail_reader_show_search_bar; + iface->update_actions = mail_reader_update_actions; g_object_interface_install_property ( - interface, + iface, g_param_spec_enum ( "forward-style", "Forward Style", @@ -3640,7 +3640,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) G_PARAM_READWRITE)); g_object_interface_install_property ( - interface, + iface, g_param_spec_boolean ( "group-by-threads", "Group by Threads", @@ -3649,7 +3649,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) G_PARAM_READWRITE)); g_object_interface_install_property ( - interface, + iface, g_param_spec_enum ( "reply-style", "Reply Style", @@ -3660,7 +3660,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) signals[CHANGED] = g_signal_new ( "changed", - G_OBJECT_CLASS_TYPE (interface), + G_OBJECT_CLASS_TYPE (iface), G_SIGNAL_RUN_FIRST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, @@ -3668,7 +3668,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) signals[COMPOSER_CREATED] = g_signal_new ( "composer-created", - G_OBJECT_CLASS_TYPE (interface), + G_OBJECT_CLASS_TYPE (iface), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EMailReaderInterface, composer_created), NULL, NULL, NULL, @@ -3678,7 +3678,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) signals[FOLDER_LOADED] = g_signal_new ( "folder-loaded", - G_OBJECT_CLASS_TYPE (interface), + G_OBJECT_CLASS_TYPE (iface), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EMailReaderInterface, folder_loaded), NULL, NULL, @@ -3687,7 +3687,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) signals[MESSAGE_LOADED] = g_signal_new ( "message-loaded", - G_OBJECT_CLASS_TYPE (interface), + G_OBJECT_CLASS_TYPE (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMailReaderInterface, message_loaded), NULL, NULL, @@ -3698,7 +3698,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) signals[MESSAGE_SEEN] = g_signal_new ( "message-seen", - G_OBJECT_CLASS_TYPE (interface), + G_OBJECT_CLASS_TYPE (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMailReaderInterface, message_seen), NULL, NULL, @@ -3709,7 +3709,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) signals[SHOW_SEARCH_BAR] = g_signal_new ( "show-search-bar", - G_OBJECT_CLASS_TYPE (interface), + G_OBJECT_CLASS_TYPE (iface), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (EMailReaderInterface, show_search_bar), NULL, NULL, @@ -3718,7 +3718,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface) signals[UPDATE_ACTIONS] = g_signal_new ( "update-actions", - G_OBJECT_CLASS_TYPE (interface), + G_OBJECT_CLASS_TYPE (iface), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (EMailReaderInterface, update_actions), NULL, NULL, @@ -4261,185 +4261,185 @@ GtkActionGroup * e_mail_reader_get_action_group (EMailReader *reader, EMailReaderActionGroup group) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_action_group != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_action_group != NULL, NULL); - return interface->get_action_group (reader, group); + return iface->get_action_group (reader, group); } EAlertSink * e_mail_reader_get_alert_sink (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_alert_sink != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_alert_sink != NULL, NULL); - return interface->get_alert_sink (reader); + return iface->get_alert_sink (reader); } EMailBackend * e_mail_reader_get_backend (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_backend != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_backend != NULL, NULL); - return interface->get_backend (reader); + return iface->get_backend (reader); } EMailDisplay * e_mail_reader_get_mail_display (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_mail_display != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_mail_display != NULL, NULL); - return interface->get_mail_display (reader); + return iface->get_mail_display (reader); } gboolean e_mail_reader_get_hide_deleted (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), FALSE); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_hide_deleted != NULL, FALSE); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_hide_deleted != NULL, FALSE); - return interface->get_hide_deleted (reader); + return iface->get_hide_deleted (reader); } GtkWidget * e_mail_reader_get_message_list (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_message_list != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_message_list != NULL, NULL); - return interface->get_message_list (reader); + return iface->get_message_list (reader); } GtkMenu * e_mail_reader_get_popup_menu (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_popup_menu != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_popup_menu != NULL, NULL); - return interface->get_popup_menu (reader); + return iface->get_popup_menu (reader); } EPreviewPane * e_mail_reader_get_preview_pane (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_preview_pane != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_preview_pane != NULL, NULL); - return interface->get_preview_pane (reader); + return iface->get_preview_pane (reader); } GPtrArray * e_mail_reader_get_selected_uids (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_selected_uids != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_selected_uids != NULL, NULL); - return interface->get_selected_uids (reader); + return iface->get_selected_uids (reader); } GtkWindow * e_mail_reader_get_window (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->get_window != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->get_window != NULL, NULL); - return interface->get_window (reader); + return iface->get_window (reader); } CamelFolder * e_mail_reader_ref_folder (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->ref_folder != NULL, NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->ref_folder != NULL, NULL); - return interface->ref_folder (reader); + return iface->ref_folder (reader); } void e_mail_reader_set_folder (EMailReader *reader, CamelFolder *folder) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_if_fail (E_IS_MAIL_READER (reader)); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_if_fail (interface->set_folder != NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_if_fail (iface->set_folder != NULL); - interface->set_folder (reader, folder); + iface->set_folder (reader, folder); } void e_mail_reader_set_message (EMailReader *reader, const gchar *message_uid) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_if_fail (E_IS_MAIL_READER (reader)); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_if_fail (interface->set_message != NULL); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_if_fail (iface->set_message != NULL); - interface->set_message (reader, message_uid); + iface->set_message (reader, message_uid); } guint e_mail_reader_open_selected_mail (EMailReader *reader) { - EMailReaderInterface *interface; + EMailReaderInterface *iface; g_return_val_if_fail (E_IS_MAIL_READER (reader), 0); - interface = E_MAIL_READER_GET_INTERFACE (reader); - g_return_val_if_fail (interface->open_selected_mail != NULL, 0); + iface = E_MAIL_READER_GET_INTERFACE (reader); + g_return_val_if_fail (iface->open_selected_mail != NULL, 0); - return interface->open_selected_mail (reader); + return iface->open_selected_mail (reader); } EMailForwardStyle diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 3a094e6735..be0bc766f8 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -174,7 +174,7 @@ struct _folder_tree_selection_data { }; /* Forward Declarations */ -static void em_folder_tree_selectable_init (ESelectableInterface *interface); +static void em_folder_tree_selectable_init (ESelectableInterface *iface); G_DEFINE_TYPE_WITH_CODE ( EMFolderTree, @@ -1681,14 +1681,14 @@ folder_tree_selectable_update_actions (ESelectable *selectable, g_return_if_fail (folder_tree != NULL); if (folder_tree->priv->selectable != NULL) { - ESelectableInterface *interface; + ESelectableInterface *iface; ESelectable *selectable; selectable = E_SELECTABLE (folder_tree->priv->selectable); - interface = E_SELECTABLE_GET_INTERFACE (selectable); - g_return_if_fail (interface->update_actions != NULL); + iface = E_SELECTABLE_GET_INTERFACE (selectable); + g_return_if_fail (iface->update_actions != NULL); - interface->update_actions ( + iface->update_actions ( selectable, focus_tracker, clipboard_targets, n_clipboard_targets); } @@ -1697,7 +1697,7 @@ folder_tree_selectable_update_actions (ESelectable *selectable, static void folder_tree_selectable_cut_clipboard (ESelectable *selectable) { - ESelectableInterface *interface; + ESelectableInterface *iface; EMFolderTree *folder_tree; GtkWidget *proxy; @@ -1707,21 +1707,21 @@ folder_tree_selectable_cut_clipboard (ESelectable *selectable) if (!E_IS_SELECTABLE (proxy)) return; - interface = E_SELECTABLE_GET_INTERFACE (proxy); + iface = E_SELECTABLE_GET_INTERFACE (proxy); - if (interface->cut_clipboard == NULL) + if (iface->cut_clipboard == NULL) return; if (gtk_widget_get_can_focus (proxy)) gtk_widget_grab_focus (proxy); - interface->cut_clipboard (E_SELECTABLE (proxy)); + iface->cut_clipboard (E_SELECTABLE (proxy)); } static void folder_tree_selectable_copy_clipboard (ESelectable *selectable) { - ESelectableInterface *interface; + ESelectableInterface *iface; EMFolderTree *folder_tree; GtkWidget *proxy; @@ -1731,21 +1731,21 @@ folder_tree_selectable_copy_clipboard (ESelectable *selectable) if (!E_IS_SELECTABLE (proxy)) return; - interface = E_SELECTABLE_GET_INTERFACE (proxy); + iface = E_SELECTABLE_GET_INTERFACE (proxy); - if (interface->copy_clipboard == NULL) + if (iface->copy_clipboard == NULL) return; if (gtk_widget_get_can_focus (proxy)) gtk_widget_grab_focus (proxy); - interface->copy_clipboard (E_SELECTABLE (proxy)); + iface->copy_clipboard (E_SELECTABLE (proxy)); } static void folder_tree_selectable_paste_clipboard (ESelectable *selectable) { - ESelectableInterface *interface; + ESelectableInterface *iface; EMFolderTree *folder_tree; GtkWidget *proxy; @@ -1755,21 +1755,21 @@ folder_tree_selectable_paste_clipboard (ESelectable *selectable) if (!E_IS_SELECTABLE (proxy)) return; - interface = E_SELECTABLE_GET_INTERFACE (proxy); + iface = E_SELECTABLE_GET_INTERFACE (proxy); - if (interface->paste_clipboard == NULL) + if (iface->paste_clipboard == NULL) return; if (gtk_widget_get_can_focus (proxy)) gtk_widget_grab_focus (proxy); - interface->paste_clipboard (E_SELECTABLE (proxy)); + iface->paste_clipboard (E_SELECTABLE (proxy)); } static void folder_tree_selectable_delete_selection (ESelectable *selectable) { - ESelectableInterface *interface; + ESelectableInterface *iface; EMFolderTree *folder_tree; GtkWidget *proxy; @@ -1779,21 +1779,21 @@ folder_tree_selectable_delete_selection (ESelectable *selectable) if (!E_IS_SELECTABLE (proxy)) return; - interface = E_SELECTABLE_GET_INTERFACE (proxy); + iface = E_SELECTABLE_GET_INTERFACE (proxy); - if (interface->delete_selection == NULL) + if (iface->delete_selection == NULL) return; if (gtk_widget_get_can_focus (proxy)) gtk_widget_grab_focus (proxy); - interface->delete_selection (E_SELECTABLE (proxy)); + iface->delete_selection (E_SELECTABLE (proxy)); } static void folder_tree_selectable_select_all (ESelectable *selectable) { - ESelectableInterface *interface; + ESelectableInterface *iface; EMFolderTree *folder_tree; GtkWidget *proxy; @@ -1803,26 +1803,26 @@ folder_tree_selectable_select_all (ESelectable *selectable) if (!E_IS_SELECTABLE (proxy)) return; - interface = E_SELECTABLE_GET_INTERFACE (proxy); + iface = E_SELECTABLE_GET_INTERFACE (proxy); - if (interface->select_all == NULL) + if (iface->select_all == NULL) return; if (gtk_widget_get_can_focus (proxy)) gtk_widget_grab_focus (proxy); - interface->select_all (E_SELECTABLE (proxy)); + iface->select_all (E_SELECTABLE (proxy)); } static void -em_folder_tree_selectable_init (ESelectableInterface *interface) -{ - interface->update_actions = folder_tree_selectable_update_actions; - interface->cut_clipboard = folder_tree_selectable_cut_clipboard; - interface->copy_clipboard = folder_tree_selectable_copy_clipboard; - interface->paste_clipboard = folder_tree_selectable_paste_clipboard; - interface->delete_selection = folder_tree_selectable_delete_selection; - interface->select_all = folder_tree_selectable_select_all; +em_folder_tree_selectable_init (ESelectableInterface *iface) +{ + iface->update_actions = folder_tree_selectable_update_actions; + iface->cut_clipboard = folder_tree_selectable_cut_clipboard; + iface->copy_clipboard = folder_tree_selectable_copy_clipboard; + iface->paste_clipboard = folder_tree_selectable_paste_clipboard; + iface->delete_selection = folder_tree_selectable_delete_selection; + iface->select_all = folder_tree_selectable_select_all; } GtkWidget * diff --git a/mail/em-utils.c b/mail/em-utils.c index 48f05b1665..5a938ab41b 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -37,7 +37,6 @@ #define DATADIR windows_DATADIR #include <windows.h> #undef DATADIR -#undef interface #endif #include <libebook/libebook.h> diff --git a/mail/message-list.c b/mail/message-list.c index 81d1bb4182..28296f4e5d 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -173,9 +173,9 @@ enum { /* Forward Declarations */ static void message_list_selectable_init - (ESelectableInterface *interface); + (ESelectableInterface *iface); static void message_list_tree_model_init - (ETreeModelInterface *interface); + (ETreeModelInterface *iface); static gboolean message_list_get_hide_deleted (MessageList *message_list, CamelFolder *folder); @@ -3257,35 +3257,35 @@ message_list_class_init (MessageListClass *class) } static void -message_list_selectable_init (ESelectableInterface *interface) +message_list_selectable_init (ESelectableInterface *iface) { - interface->update_actions = message_list_selectable_update_actions; - interface->select_all = message_list_selectable_select_all; + iface->update_actions = message_list_selectable_update_actions; + iface->select_all = message_list_selectable_select_all; } static void -message_list_tree_model_init (ETreeModelInterface *interface) -{ - interface->get_root = message_list_get_root; - interface->get_parent = message_list_get_parent; - interface->get_first_child = message_list_get_first_child; - interface->get_next = message_list_get_next; - interface->is_root = message_list_is_root; - interface->is_expandable = message_list_is_expandable; - interface->get_n_nodes = message_list_get_n_nodes; - interface->get_n_children = message_list_get_n_children; - interface->depth = message_list_depth; - interface->get_expanded_default = message_list_get_expanded_default; - interface->column_count = message_list_column_count; - interface->get_save_id = message_list_get_save_id; - interface->get_node_by_id = message_list_get_node_by_id; - interface->sort_value_at = message_list_sort_value_at; - interface->value_at = message_list_value_at; - interface->duplicate_value = message_list_duplicate_value; - interface->free_value = message_list_free_value; - interface->initialize_value = message_list_initialize_value; - interface->value_is_empty = message_list_value_is_empty; - interface->value_to_string = message_list_value_to_string; +message_list_tree_model_init (ETreeModelInterface *iface) +{ + iface->get_root = message_list_get_root; + iface->get_parent = message_list_get_parent; + iface->get_first_child = message_list_get_first_child; + iface->get_next = message_list_get_next; + iface->is_root = message_list_is_root; + iface->is_expandable = message_list_is_expandable; + iface->get_n_nodes = message_list_get_n_nodes; + iface->get_n_children = message_list_get_n_children; + iface->depth = message_list_depth; + iface->get_expanded_default = message_list_get_expanded_default; + iface->column_count = message_list_column_count; + iface->get_save_id = message_list_get_save_id; + iface->get_node_by_id = message_list_get_node_by_id; + iface->sort_value_at = message_list_sort_value_at; + iface->value_at = message_list_value_at; + iface->duplicate_value = message_list_duplicate_value; + iface->free_value = message_list_free_value; + iface->initialize_value = message_list_initialize_value; + iface->value_is_empty = message_list_value_is_empty; + iface->value_to_string = message_list_value_to_string; } static void |