From: Philip Van Hoof Date: Mon, 28 Jan 2008 22:23:16 +0000 (+0000) Subject: Adapted to API change for Tinymail rev 3304 X-Git-Tag: git_migration_finished~1751 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=94dd9606eadbd7df971e7abc458bbbd903cdc772 Adapted to API change for Tinymail rev 3304 pmo-trunk-r4100 --- diff --git a/src/modest-count-stream.c b/src/modest-count-stream.c index f10314e..4ad1287 100644 --- a/src/modest-count-stream.c +++ b/src/modest-count-stream.c @@ -149,13 +149,13 @@ modest_count_stream_instance_init (GTypeInstance *instance, gpointer g_class) static void tny_stream_init (TnyStreamIface *klass) { - klass->read_func = modest_count_stream_read; - klass->write_func = modest_count_stream_write; - klass->flush_func = modest_count_stream_flush; - klass->close_func = modest_count_stream_close; - klass->is_eos_func = modest_count_stream_is_eos; - klass->reset_func = modest_count_stream_reset; - klass->write_to_stream_func = modest_count_stream_write_to_stream; + klass->read = modest_count_stream_read; + klass->write = modest_count_stream_write; + klass->flush = modest_count_stream_flush; + klass->close = modest_count_stream_close; + klass->is_eos = modest_count_stream_is_eos; + klass->reset = modest_count_stream_reset; + klass->write_to_stream = modest_count_stream_write_to_stream; } static void diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index de3ab30..495cf9b 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -1163,7 +1163,7 @@ internal_folder_observer_finalize (GObject *object) static void tny_folder_observer_init (TnyFolderObserverIface *iface) { - iface->update_func = internal_folder_observer_update; + iface->update = internal_folder_observer_update; } static void internal_folder_observer_class_init (InternalFolderObserverClass *klass) diff --git a/src/modest-stream-text-to-html.c b/src/modest-stream-text-to-html.c index 4eee0f0..50e1135 100644 --- a/src/modest-stream-text-to-html.c +++ b/src/modest-stream-text-to-html.c @@ -323,11 +323,11 @@ modest_stream_text_to_html_iface_init (gpointer g_iface, gpointer iface_data) klass = (TnyStreamIface*) g_iface; - klass->read_func = text_to_html_read; - klass->write_func = text_to_html_write; - klass->flush_func = text_to_html_flush; - klass->close_func = text_to_html_close; - klass->is_eos_func = text_to_html_is_eos; - klass->reset_func = text_to_html_reset; - klass->write_to_stream_func = text_to_html_write_to_stream; + klass->read = text_to_html_read; + klass->write = text_to_html_write; + klass->flush = text_to_html_flush; + klass->close = text_to_html_close; + klass->is_eos = text_to_html_is_eos; + klass->reset = text_to_html_reset; + klass->write_to_stream = text_to_html_write_to_stream; } diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 2dd83d0..63f2ab6 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -1063,7 +1063,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyAlertType type, gboolean question, - const GError *error) + GError *error) { ModestTransportStoreProtocol proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; @@ -1163,15 +1163,15 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data) klass = (TnyAccountStoreIface *)g; - klass->get_accounts_func = + klass->get_accounts = modest_tny_account_store_get_accounts; - klass->get_cache_dir_func = + klass->get_cache_dir = modest_tny_account_store_get_cache_dir; - klass->get_device_func = + klass->get_device = modest_tny_account_store_get_device; - klass->alert_func = + klass->alert = modest_tny_account_store_alert; - klass->find_account_func = + klass->find_account = modest_tny_account_store_find_account_by_url; } diff --git a/src/modest-tny-local-folders-account.c b/src/modest-tny-local-folders-account.c index 6b2b6a8..69ea053 100644 --- a/src/modest-tny-local-folders-account.c +++ b/src/modest-tny-local-folders-account.c @@ -80,8 +80,8 @@ modest_tny_local_folders_account_class_init (ModestTnyLocalFoldersAccountClass * object_class->finalize = modest_tny_local_folders_account_finalize; /* Override virtual functions from the parent class: */ - TNY_CAMEL_STORE_ACCOUNT_CLASS(klass)->get_folders_func = get_folders; - TNY_CAMEL_STORE_ACCOUNT_CLASS(klass)->create_folder_func = create_folder; + TNY_CAMEL_STORE_ACCOUNT_CLASS(klass)->get_folders = get_folders; + TNY_CAMEL_STORE_ACCOUNT_CLASS(klass)->create_folder = create_folder; } static void @@ -154,7 +154,7 @@ get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GE /* Call the base class implementation: */ parent_class = g_type_class_peek_parent (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT_GET_CLASS (self)); - parent_class->get_folders_func (self, list, query, err); + parent_class->get_folders (self, list, query, err); /* Add our extra folder only if it passes the query */ priv = TNY_LOCAL_FOLDERS_ACCOUNT_GET_PRIVATE (self); @@ -182,7 +182,7 @@ create_folder (TnyFolderStore *self, } /* Call the base class implementation: */ - return parent_class->create_folder_func (self, name, err); + return parent_class->create_folder (self, name, err); } /*****************************/ diff --git a/src/modest-tny-platform-factory.c b/src/modest-tny-platform-factory.c index 838eb63..84290ef 100644 --- a/src/modest-tny-platform-factory.c +++ b/src/modest-tny-platform-factory.c @@ -164,11 +164,11 @@ tny_platform_factory_init (gpointer g, gpointer iface_data) { TnyPlatformFactoryIface *klass = (TnyPlatformFactoryIface *)g; - klass->new_account_store_func = modest_tny_platform_factory_new_account_store; - klass->new_device_func = modest_tny_platform_factory_new_device; - klass->new_msg_view_func = modest_tny_platform_factory_new_msg_view; - klass->new_msg_func = modest_tny_platform_factory_new_msg; - klass->new_mime_part_func = modest_tny_platform_factory_new_mime_part; + klass->new_account_store = modest_tny_platform_factory_new_account_store; + klass->new_device = modest_tny_platform_factory_new_device; + klass->new_msg_view = modest_tny_platform_factory_new_msg_view; + klass->new_msg = modest_tny_platform_factory_new_msg; + klass->new_mime_part = modest_tny_platform_factory_new_mime_part; return; } diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index bf79501..8a6b9a1 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -282,7 +282,7 @@ modest_tny_send_queue_add_async (TnySendQueue *self, gpointer user_data) { /* Call the superclass passing our own callback */ - TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_async_func (self, msg, _on_added_to_outbox, NULL, NULL); + TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_async (self, msg, _on_added_to_outbox, NULL, NULL); } @@ -348,9 +348,9 @@ modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_tny_send_queue_finalize; - TNY_CAMEL_SEND_QUEUE_CLASS(klass)->add_async_func = modest_tny_send_queue_add_async; - TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_outbox_func = modest_tny_send_queue_get_outbox; - TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_sentbox_func = modest_tny_send_queue_get_sentbox; + TNY_CAMEL_SEND_QUEUE_CLASS(klass)->add_async = modest_tny_send_queue_add_async; + TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_outbox = modest_tny_send_queue_get_outbox; + TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_sentbox = modest_tny_send_queue_get_sentbox; klass->status_changed = NULL; signals[STATUS_CHANGED_SIGNAL] = diff --git a/src/modest-transport-account-decorator.c b/src/modest-transport-account-decorator.c index e0024c8..177027e 100644 --- a/src/modest-transport-account-decorator.c +++ b/src/modest-transport-account-decorator.c @@ -86,7 +86,7 @@ modest_transport_account_decorator_send (TnyTransportAccount *self, TnyMsg *msg, if (connection_specific_account) { tny_transport_account_send (connection_specific_account, msg, err); } else { - TNY_CAMEL_TRANSPORT_ACCOUNT_CLASS(parent_class)->send_func (self, msg, err); + TNY_CAMEL_TRANSPORT_ACCOUNT_CLASS(parent_class)->send (self, msg, err); } } @@ -102,7 +102,7 @@ modest_transport_account_decorator_class_init (ModestTransportAccountDecoratorCl parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_transport_account_decorator_finalize; - transport_class->send_func = modest_transport_account_decorator_send; + transport_class->send = modest_transport_account_decorator_send; /* g_type_class_add_private (gobject_class, sizeof(ModestTransportAccountDecoratorPrivate)); */ } diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c index b36e7fc..a94f1a0 100644 --- a/src/widgets/modest-attachment-view.c +++ b/src/widgets/modest-attachment-view.c @@ -480,9 +480,9 @@ tny_mime_part_view_init (gpointer g, gpointer iface_data) { TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g; - klass->get_part_func = modest_attachment_view_get_part; - klass->set_part_func = modest_attachment_view_set_part; - klass->clear_func = modest_attachment_view_clear; + klass->get_part = modest_attachment_view_get_part; + klass->set_part = modest_attachment_view_set_part; + klass->clear = modest_attachment_view_clear; return; } diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index a753113..e22b93e 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -1069,7 +1069,7 @@ tny_account_store_view_init (gpointer g, gpointer iface_data) { TnyAccountStoreViewIface *klass = (TnyAccountStoreViewIface *)g; - klass->set_account_store_func = modest_folder_view_set_account_store; + klass->set_account_store = modest_folder_view_set_account_store; return; } diff --git a/src/widgets/modest-gtkhtml-mime-part-view.c b/src/widgets/modest-gtkhtml-mime-part-view.c index 0a3fd5d..077e174 100644 --- a/src/widgets/modest-gtkhtml-mime-part-view.c +++ b/src/widgets/modest-gtkhtml-mime-part-view.c @@ -545,9 +545,9 @@ tny_mime_part_view_init (gpointer g, gpointer iface_data) { TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g; - klass->get_part_func = modest_gtkhtml_mime_part_view_get_part; - klass->set_part_func = modest_gtkhtml_mime_part_view_set_part; - klass->clear_func = modest_gtkhtml_mime_part_view_clear; + klass->get_part = modest_gtkhtml_mime_part_view_get_part; + klass->set_part = modest_gtkhtml_mime_part_view_set_part; + klass->clear = modest_gtkhtml_mime_part_view_clear; return; } diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c index fa53d07..ec9b7bf 100644 --- a/src/widgets/modest-gtkhtml-msg-view.c +++ b/src/widgets/modest-gtkhtml-msg-view.c @@ -1689,12 +1689,12 @@ tny_msg_view_init (gpointer g, gpointer iface_data) { TnyMsgViewIface *klass = (TnyMsgViewIface *)g; - klass->get_msg_func = modest_msg_view_get_msg; - klass->set_msg_func = modest_msg_view_set_msg; - klass->set_unavailable_func = modest_msg_view_set_unavailable; - klass->clear_func = modest_msg_view_clear; - klass->create_mime_part_view_for_func = modest_msg_view_create_mime_part_view_for; - klass->create_new_inline_viewer_func = modest_msg_view_create_new_inline_viewer; + klass->get_msg = modest_msg_view_get_msg; + klass->set_msg = modest_msg_view_set_msg; + klass->set_unavailable = modest_msg_view_set_unavailable; + klass->clear = modest_msg_view_clear; + klass->create_mime_part_view_for = modest_msg_view_create_mime_part_view_for; + klass->create_new_inline_viewer = modest_msg_view_create_new_inline_viewer; return; } @@ -1786,9 +1786,9 @@ tny_mime_part_view_init (gpointer g, gpointer iface_data) { TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g; - klass->get_part_func = modest_msg_view_mp_get_part; - klass->set_part_func = modest_msg_view_mp_set_part; - klass->clear_func = modest_msg_view_mp_clear; + klass->get_part = modest_msg_view_mp_get_part; + klass->set_part = modest_msg_view_mp_set_part; + klass->clear = modest_msg_view_mp_clear; return; } diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 4499008..9b169b8 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -284,7 +284,7 @@ modest_header_view_class_init (ModestHeaderViewClass *klass) static void tny_folder_observer_init (TnyFolderObserverIface *klass) { - klass->update_func = folder_monitor_update; + klass->update = folder_monitor_update; } static GtkTreeViewColumn* diff --git a/src/widgets/modest-mail-header-view.c b/src/widgets/modest-mail-header-view.c index d125322..a4413e2 100644 --- a/src/widgets/modest-mail-header-view.c +++ b/src/widgets/modest-mail-header-view.c @@ -489,8 +489,8 @@ tny_header_view_init (gpointer g, gpointer iface_data) { TnyHeaderViewIface *klass = (TnyHeaderViewIface *)g; - klass->set_header_func = modest_mail_header_view_set_header; - klass->clear_func = modest_mail_header_view_clear; + klass->set_header = modest_mail_header_view_set_header; + klass->clear = modest_mail_header_view_clear; return; } diff --git a/src/widgets/modest-tny-stream-gtkhtml.c b/src/widgets/modest-tny-stream-gtkhtml.c index c92cc68..af05333 100644 --- a/src/widgets/modest-tny-stream-gtkhtml.c +++ b/src/widgets/modest-tny-stream-gtkhtml.c @@ -226,11 +226,11 @@ modest_tny_stream_gtkhml_iface_init (gpointer g_iface, gpointer iface_data) klass = (TnyStreamIface*) g_iface; - klass->read_func = gtkhtml_read; - klass->write_func = gtkhtml_write; - klass->flush_func = gtkhtml_flush; - klass->close_func = gtkhtml_close; - klass->is_eos_func = gtkhtml_is_eos; - klass->reset_func = gtkhtml_reset; - klass->write_to_stream_func = gtkhtml_write_to_stream; + klass->read = gtkhtml_read; + klass->write = gtkhtml_write; + klass->flush = gtkhtml_flush; + klass->close = gtkhtml_close; + klass->is_eos = gtkhtml_is_eos; + klass->reset = gtkhtml_reset; + klass->write_to_stream = gtkhtml_write_to_stream; }