Changeset 3275

Timestamp:

01/17/08 11:16:18

Author:

mdoff

Message:

Modify .defs to take account of changes in API.
Start to wrap missing callback functions.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/bindings/python/gendefs/Makefile.am (modified) (4 diffs)
• trunk/bindings/python/tinymail-base.defs (modified) (1 diff)
• trunk/bindings/python/tinymail-camel-base.defs (modified) (8 diffs)
• trunk/bindings/python/tinymail-camel.override (modified) (2 diffs)
• trunk/bindings/python/tinymail.override (modified) (1 diff)
• trunk/bindings/python/tinymailui-base.defs (modified) (1 diff)
• trunk/bindings/python/tinymailui-gtk-base.defs (modified) (10 diffs)
• trunk/bindings/python/tinymailui-gtk.override (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/config.h.in (modified) (6 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-01-16  Mark Doffman  <mark.doffman@codethink.co.uk>
+        * bindings/python/*.defs: Regenerate .defs files for updated API.
+
+        * bindings/python/*.override: Add missing headers and Gtk types.
+
+        * bindings/python/tinymail.override: Begin adding wrappers for
+        callbacks.
+
-2008-01-16  Jürg Billeter  <j@bitron.ch>
-

trunk/bindings/python/gendefs/Makefile.am

@@ -13 +13 @@
-#
-tinymail_h_files = \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-tinymail-base.defs: $(tinymail_h_files) $(top_srcdir)/bindings/python/gendefs/defsgen.py
@@ -54 +56 @@
-
-tinymailui_h_files = \
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-tinymailui-base.defs: $(tinymailui_h_files) $(top_srcdir)/bindings/python/gendefs/defsgen.py
@@ -68 +71 @@
-
-tinymailui_gtk_h_files = \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-tinymailui-gtk-base.defs: $(tinymailui_gtk_h_files) $(top_srcdir)/bindings/python/gendefs/defsgen.py
@@ -87 +93 @@
-
-tinymail_camel_h_files = \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-tinymail-camel-base.defs : $(tinymail_camel_h_files) $(top_srcdir)/bindings/python/gendefs/defsgen.py

trunk/bindings/python/tinymail-base.defs

@@ -1 @@
-;; -*- scheme -*-
-; boxed definitions ...
-
-; interface definitions ...
-
-(define-interface Account
-  (in-module "Tny")
-  (c-name "TnyAccount")
-  (gtype-id "TNY_TYPE_ACCOUNT")
-  (prerequisite "GObject")
-)
-
-(define-interface AccountStore
-  (in-module "Tny")
-  (c-name "TnyAccountStore")
-  (gtype-id "TNY_TYPE_ACCOUNT_STORE")
-  (prerequisite "GObject")
-)
-
-(define-interface Device
-  (in-module "Tny")
-  (c-name "TnyDevice")
-  (gtype-id "TNY_TYPE_DEVICE")
-  (prerequisite "GObject")
-)
-
-(define-interface Folder
-  (in-module "Tny")
-  (c-name "TnyFolder")
-  (gtype-id "TNY_TYPE_FOLDER")
-  (prerequisite "GObject")
-)
-
-(define-interface FolderObserver
-  (in-module "Tny")
-  (c-name "TnyFolderObserver")
-  (gtype-id "TNY_TYPE_FOLDER_OBSERVER")
-)
-
-(define-interface FolderStore
-  (in-module "Tny")
-  (c-name "TnyFolderStore")
-  (gtype-id "TNY_TYPE_FOLDER_STORE")
-)
-
-(define-interface FolderStoreObserver
-  (in-module "Tny")
-  (c-name "TnyFolderStoreObserver")
-  (gtype-id "TNY_TYPE_FOLDER_STORE_OBSERVER")
-)
-
-(define-interface Header
-  (in-module "Tny")
-  (c-name "TnyHeader")
-  (gtype-id "TNY_TYPE_HEADER")
-  (prerequisite "GObject")
-)
-
-(define-interface Iterator
-  (in-module "Tny")
-  (c-name "TnyIterator")
-  (gtype-id "TNY_TYPE_ITERATOR")
-)
-
-(define-interface List
-  (in-module "Tny")
-  (c-name "TnyList")
-  (gtype-id "TNY_TYPE_LIST")
-)
-
-(define-interface Lockable
-  (in-module "Tny")
-  (c-name "TnyLockable")
-  (gtype-id "TNY_TYPE_LOCKABLE")
-)
-
-(define-interface MimePart
-  (in-module "Tny")
-  (c-name "TnyMimePart")
-  (gtype-id "TNY_TYPE_MIME_PART")
-)
-
-(define-interface Msg
-  (in-module "Tny")
-  (c-name "TnyMsg")
-  (gtype-id "TNY_TYPE_MSG")
-  (prerequisite "TnyMimePart")
-  (prerequisite "GObject")
-)
-
-(define-interface MsgReceiveStrategy
-  (in-module "Tny")
-  (c-name "TnyMsgReceiveStrategy")
-  (gtype-id "TNY_TYPE_MSG_RECEIVE_STRATEGY")
-)
-
-(define-interface MsgRemoveStrategy
-  (in-module "Tny")
-  (c-name "TnyMsgRemoveStrategy")
-  (gtype-id "TNY_TYPE_MSG_REMOVE_STRATEGY")
-)
-
-(define-interface PasswordGetter
-  (in-module "Tny")
-  (c-name "TnyPasswordGetter")
-  (gtype-id "TNY_TYPE_PASSWORD_GETTER")
-)
-
-(define-interface SendQueue
-  (in-module "Tny")
-  (c-name "TnySendQueue")
-  (gtype-id "TNY_TYPE_SEND_QUEUE")
-  (prerequisite "GObject")
-)
-
-(define-interface StoreAccount
-  (in-module "Tny")
-  (c-name "TnyStoreAccount")
-  (gtype-id "TNY_TYPE_STORE_ACCOUNT")
-  (prerequisite "TnyAccount")
-  (prerequisite "TnyFolderStore")
-  (prerequisite "GObject")
-)
-
-(define-interface Stream
-  (in-module "Tny")
-  (c-name "TnyStream")
-  (gtype-id "TNY_TYPE_STREAM")
-)
-
-(define-interface TransportAccount
-  (in-module "Tny")
-  (c-name "TnyTransportAccount")
-  (gtype-id "TNY_TYPE_TRANSPORT_ACCOUNT")
-  (prerequisite "TnyAccount")
-  (prerequisite "GObject")
-)
-
-; object definitions ...
-
-(define-object CombinedAccount
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyCombinedAccount")
-  (gtype-id "TNY_TYPE_COMBINED_ACCOUNT")
-  (implements "TnyAccount")
-  (implements "TnyFolderStore")
-  (implements "TnyStoreAccount")
-  (implements "TnyTransportAccount")
-)
-
-(define-object FolderChange
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyFolderChange")
-  (gtype-id "TNY_TYPE_FOLDER_CHANGE")
-)
-
-(define-object FolderMonitor
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyFolderMonitor")
-  (gtype-id "TNY_TYPE_FOLDER_MONITOR")
-  (implements "TnyFolderObserver")
-)
-
-(define-object FolderStats
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyFolderStats")
-  (gtype-id "TNY_TYPE_FOLDER_STATS")
-)
-
-(define-object FolderStoreChange
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyFolderStoreChange")
-  (gtype-id "TNY_TYPE_FOLDER_STORE_CHANGE")
-)
-
-(define-object FolderStoreQuery
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyFolderStoreQuery")
-  (gtype-id "TNY_TYPE_FOLDER_STORE_QUERY")
-)
-
-(define-object FolderStoreQueryItem
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyFolderStoreQueryItem")
-  (gtype-id "TNY_TYPE_FOLDER_STORE_QUERY_ITEM")
-)
-
-(define-object FsStream
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyFsStream")
-  (gtype-id "TNY_TYPE_FS_STREAM")
-  (implements "TnyStream")
-)
-
-(define-object MergeFolder
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyMergeFolder")
-  (gtype-id "TNY_TYPE_MERGE_FOLDER")
-  (implements "TnyFolder")
-  (implements "TnyFolderObserver")
-)
-
-(define-object NoopLockable
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyNoopLockable")
-  (gtype-id "TNY_TYPE_NOOP_LOCKABLE")
-  (implements "TnyLockable")
-)
-
-(define-object Pair
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnyPair")
-  (gtype-id "TNY_TYPE_PAIR")
-)
-
-(define-object SimpleList
-  (in-module "Tny")
-  (parent "GObject")
-  (c-name "TnySimpleList")
-  (gtype-id "TNY_TYPE_SIMPLE_LIST")
-  (implements "TnyList")
-)
-
-; pointer definitions ...
-
-;; Enumerations and Flags ...
-
-(define-enum AccountType
-  (in-module "Tny")
-  (c-name "TnyAccountType")
-  (gtype-id "TNY_TYPE_ACCOUNT_TYPE")
-  (values
-    '("store" "TNY_ACCOUNT_TYPE_STORE")
-    '("transport" "TNY_ACCOUNT_TYPE_TRANSPORT")
-  )
-)
-
-(define-enum AlertType
-  (in-module "Tny")
-  (c-name "TnyAlertType")
-  (gtype-id "TNY_TYPE_ALERT_TYPE")
-  (values
-    '("info" "TNY_ALERT_TYPE_INFO")
-    '("warning" "TNY_ALERT_TYPE_WARNING")
-    '("error" "TNY_ALERT_TYPE_ERROR")
-  )
-)
-
-(define-enum Error
-  (in-module "Tny")
-  (c-name "TnyError")
-  (gtype-id "TNY_TYPE_ERROR")
-  (values
-    '("error_unspec" "TNY_ERROR_UNSPEC")
-    '("folder_error_sync" "TNY_FOLDER_ERROR_SYNC")
-    '("folder_error_remove_msg" "TNY_FOLDER_ERROR_REMOVE_MSG")
-    '("folder_error_remove_msgs" "TNY_FOLDER_ERROR_REMOVE_MSGS")
-    '("folder_error_add_msg" "TNY_FOLDER_ERROR_ADD_MSG")
-    '("folder_error_refresh" "TNY_FOLDER_ERROR_REFRESH")
-    '("folder_error_get_msg" "TNY_FOLDER_ERROR_GET_MSG")
-    '("folder_error_transfer_msgs" "TNY_FOLDER_ERROR_TRANSFER_MSGS")
-    '("folder_error_set_name" "TNY_FOLDER_ERROR_SET_NAME")
-    '("folder_error_copy" "TNY_FOLDER_ERROR_COPY")
-    '("folder_store_error_remove_folder" "TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER")
-    '("folder_store_error_get_folders" "TNY_FOLDER_STORE_ERROR_GET_FOLDERS")
-    '("folder_store_error_create_folder" "TNY_FOLDER_STORE_ERROR_CREATE_FOLDER")
-    '("transport_account_error_send" "TNY_TRANSPORT_ACCOUNT_ERROR_SEND")
-    '("transport_account_error_send_host_lookup_failed" "TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED")
-    '("transport_account_error_send_service_unavailable" "TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE")
-    '("transport_account_error_send_authentication_not_supported" "TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED")
-    '("transport_account_error_send_user_cancel" "TNY_ACCOUNT_ERROR_TRY_CONNECT_SEND_USER_CANCEL")
-    '("account_error_try_connect" "TNY_ACCOUNT_ERROR_TRY_CONNECT")
-    '("account_error_try_connect_host_lookup_failed" "TNY_ACCOUNT_ERROR_TRY_CONNECT_HOST_LOOKUP_FAILED")
-    '("account_error_try_connect_service_unavailable" "TNY_ACCOUNT_ERROR_TRY_CONNECT_SERVICE_UNAVAILABLE")
-    '("account_error_try_connect_authentication_not_supported" "TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED")
-    '("account_error_try_connect_certificate" "TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE")
-    '("account_error_try_connect_user_cancel" "TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL")
-    '("account_store_error_unknown_alert" "TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT")
-    '("send_queue_error_add" "TNY_SEND_QUEUE_ERROR_ADD")
-    '("account_store_cancel_alert" "TNY_ACCOUNT_STORE_ERROR_CANCEL_ALERT")
-    '("account_get_supported_auth" "TNY_ACCOUNT_ERROR_GET_SUPPORTED_AUTH")
-  )
-)
-
-(define-enum ErrorDomain
-  (in-module "Tny")
-  (c-name "TnyErrorDomain")
-  (gtype-id "TNY_TYPE_ERROR_DOMAIN")
-  (values
-    '("folder_error" "TNY_FOLDER_ERROR")
-    '("folder_store_error" "TNY_FOLDER_STORE_ERROR")
-    '("transport_account_error" "TNY_TRANSPORT_ACCOUNT_ERROR")
-    '("account_error" "TNY_ACCOUNT_ERROR")
-    '("account_store_error" "TNY_ACCOUNT_STORE_ERROR")
-    '("send_queue_error" "TNY_SEND_QUEUE_ERROR")
-  )
-)
-
-(define-enum FolderType
-  (in-module "Tny")
-  (c-name "TnyFolderType")
-  (gtype-id "TNY_TYPE_FOLDER_TYPE")
-  (values
-    '("unknown" "TNY_FOLDER_TYPE_UNKNOWN")
-    '("normal" "TNY_FOLDER_TYPE_NORMAL")
-    '("inbox" "TNY_FOLDER_TYPE_INBOX")
-    '("outbox" "TNY_FOLDER_TYPE_OUTBOX")
-    '("trash" "TNY_FOLDER_TYPE_TRASH")
-    '("junk" "TNY_FOLDER_TYPE_JUNK")
-    '("sent" "TNY_FOLDER_TYPE_SENT")
-    '("root" "TNY_FOLDER_TYPE_ROOT")
-    '("notes" "TNY_FOLDER_TYPE_NOTES")
-    '("drafts" "TNY_FOLDER_TYPE_DRAFTS")
-    '("contacts" "TNY_FOLDER_TYPE_CONTACTS")
-    '("calendar" "TNY_FOLDER_TYPE_CALENDAR")
-    '("archive" "TNY_FOLDER_TYPE_ARCHIVE")
-    '("merge" "TNY_FOLDER_TYPE_MERGE")
-  )
-)
-
-(define-enum GetAccountsRequestType
-  (in-module "Tny")
-  (c-name "TnyGetAccountsRequestType")
-  (gtype-id "TNY_TYPE_GET_ACCOUNTS_REQUEST_TYPE")
-  (values
-    '("transport" "TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS")
-    '("store" "TNY_ACCOUNT_STORE_STORE_ACCOUNTS")
-    '("both" "TNY_ACCOUNT_STORE_BOTH")
-  )
-)
-
-(define-enum StatusCode
-  (in-module "Tny")
-  (c-name "TnyStatusCode")
-  (gtype-id "TNY_TYPE_STATUS_CODE")
-  (values
-    '("folder_status_code_refresh" "TNY_FOLDER_STATUS_CODE_REFRESH")
-    '("folder_status_code_get_msg" "TNY_FOLDER_STATUS_CODE_GET_MSG")
-    '("get_msg_queue_status_get_msg" "TNY_GET_MSG_QUEUE_STATUS_GET_MSG")
-    '("xfer-msgs" "TNY_FOLDER_STATUS_CODE_XFER_MSGS")
-    '("copy-folder" "TNY_FOLDER_STATUS_CODE_COPY_FOLDER")
-    '("get-secure-auth" "TNY_GET_SUPPORTED_SECURE_AUTH_STATUS_GET_SECURE_AUTH")
-    '("code-sync" "TNY_FOLDER_STATUS_CODE_SYNC")
-  )
-)
-
-(define-enum StatusDomain
-  (in-module "Tny")
-  (c-name "TnyStatusDomain")
-  (gtype-id "TNY_TYPE_STATUS_DOMAIN")
-  (values
-    '("folder_status" "TNY_FOLDER_STATUS")
-    '("get_msg_queue_status" "TNY_GET_MSG_QUEUE_STATUS")
-    '("secured-auth-status" "TNY_GET_SUPPORTED_SECURE_AUTH_STATUS")
-  )
-)
-
-(define-flags FolderStoreQueryOption
-  (in-module "Tny")
-  (c-name "TnyFolderStoreQueryOption")
-  (gtype-id "TNY_TYPE_FOLDER_STORE_QUERY_OPTION")
-  (values
-    '("subscribed" "TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED")
-    '("unsubscribed" "TNY_FOLDER_STORE_QUERY_OPTION_UNSUBSCRIBED")
-    '("match_on_name" "TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME")
-    '("match_on_id" "TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_ID")
-    '("pattern_is_case_insensitive" "TNY_FOLDER_STORE_QUERY_OPTION_PATTERN_IS_CASE_INSENSITIVE")
-    '("pattern_is_regex" "TNY_FOLDER_STORE_QUERY_OPTION_PATTERN_IS_REGEX")
-  )
-)
-
-(define-flags HeaderFlags
-  (in-module "Tny")
-  (c-name "TnyHeaderFlags")
-  (gtype-id "TNY_TYPE_HEADER_FLAGS")
-  (values
-    '("answered" "TNY_HEADER_FLAG_ANSWERED")
-    '("deleted" "TNY_HEADER_FLAG_DELETED")
-    '("draft" "TNY_HEADER_FLAG_DRAFT")
-    '("flagged" "TNY_HEADER_FLAG_FLAGGED")
-    '("seen" "TNY_HEADER_FLAG_SEEN")
-    '("attachments" "TNY_HEADER_FLAG_ATTACHMENTS")
-    '("cached" "TNY_HEADER_FLAG_CACHED")
-    '("partial" "TNY_HEADER_FLAG_PARTIAL")
-    '("expunged" "TNY_HEADER_FLAG_EXPUNGED")
-    '("priority" "TNY_HEADER_FLAG_PRIORITY")
-  )
-)
-
-
-;; From tny-account-store.h
-
-(define-function account_store_get_type
-  (c-name "tny_account_store_get_type")
-  (return-type "GType")
-)
-
-(define-function get_accounts_request_type_get_type
-  (c-name "tny_get_accounts_request_type_get_type")
-  (return-type "GType")
-)
-
-(define-function alert_type_get_type
-  (c-name "tny_alert_type_get_type")
-  (return-type "GType")
-)
-
-(define-method get_accounts
-  (of-object "TnyAccountStore")
-  (c-name "tny_account_store_get_accounts")
-  (return-type "none")
-  (parameters
-    '("TnyList*" "list")
-    '("TnyGetAccountsRequestType" "types")
-  )
-)
-
-(define-method get_cache_dir
-  (of-object "TnyAccountStore")
-  (c-name "tny_account_store_get_cache_dir")
-  (return-type "const-gchar*")
-)
-
-(define-method get_device
-  (of-object "TnyAccountStore")
-  (c-name "tny_account_store_get_device")
-  (return-type "TnyDevice*")
-)
-
-(define-method alert
-  (of-object "TnyAccountStore")
-  (c-name "tny_account_store_alert")
-  (return-type "gboolean")
-  (parameters
-    '("TnyAccount*" "account")
-    '("TnyAlertType" "type")
-    '("gboolean" "question")
-    '("const-GError*" "error")
-  )
-)
-
-(define-method find_account
-  (of-object "TnyAccountStore")
-  (c-name "tny_account_store_find_account")
-  (return-type "TnyAccount*")
-  (parameters
-    '("const-gchar*" "url_string")
-  )
-)
-
-(define-virtual get_accounts_func
-  (of-object "TnyAccountStore")
-  (return-type "none")
-  (parameters
-    '("TnyList*" "list")
-    '("TnyGetAccountsRequestType" "types")
-  )
-)
-
-(define-virtual get_cache_dir_func
-  (of-object "TnyAccountStore")
-  (return-type "const-gchar*")
-)
-
-(define-virtual get_device_func
-  (of-object "TnyAccountStore")
-  (return-type "TnyDevice*")
-)
-
-(define-virtual alert_func
-  (of-object "TnyAccountStore")
-  (return-type "gboolean")
-  (parameters
-    '("TnyAccount*" "account")
-    '("TnyAlertType" "type")
-    '("gboolean" "question")
-    '("const-GError*" "error")
-  )
-)
-
-(define-virtual find_account_func
-  (of-object "TnyAccountStore")
-  (return-type "TnyAccount*")
-  (parameters
-    '("const-gchar*" "url_string")
-  )
-)
-
-(define-virtual connecting_started
-  (of-object "TnyAccountStore")
-  (return-type "none")
-)
-
-
-
-;; From tny-account.h
-
-(define-function account_get_type
-  (c-name "tny_account_get_type")
-  (return-type "GType")
-)
-
-(define-function account_type_get_type
-  (c-name "tny_account_type_get_type")
-  (return-type "GType")
-)
-
-(define-method get_connection_status
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_connection_status")
-  (return-type "TnyConnectionStatus")
-)
-
-(define-method set_id
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_id")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "id")
-  )
-)
-
-(define-method set_name
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_name")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "name")
-  )
-)
-
-(define-method set_secure_auth_mech
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_secure_auth_mech")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "mech")
-  )
-)
-
-(define-method set_proto
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_proto")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "proto")
-  )
-)
-
-(define-method set_user
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_user")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "user")
-  )
-)
-
-(define-method set_hostname
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_hostname")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "host")
-  )
-)
-
-(define-method set_port
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_port")
-  (return-type "none")
-  (parameters
-    '("guint" "port")
-  )
-)
-
-(define-method set_pass_func
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_pass_func")
-  (return-type "none")
-  (parameters
-    '("TnyGetPassFunc" "get_pass_func")
-  )
-)
-
-(define-method set_url_string
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_url_string")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "url_string")
-  )
-)
-
-(define-method get_account_type
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_account_type")
-  (return-type "TnyAccountType")
-)
-
-(define-method get_id
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_id")
-  (return-type "const-gchar*")
-)
-
-(define-method get_name
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_name")
-  (return-type "const-gchar*")
-)
-
-(define-method get_secure_auth_mech
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_secure_auth_mech")
-  (return-type "const-gchar*")
-)
-
-(define-method get_proto
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_proto")
-  (return-type "const-gchar*")
-)
-
-(define-method get_user
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_user")
-  (return-type "const-gchar*")
-)
-
-(define-method get_hostname
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_hostname")
-  (return-type "const-gchar*")
-)
-
-(define-method get_port
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_port")
-  (return-type "guint")
-)
-
-(define-method get_url_string
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_url_string")
-  (return-type "gchar*")
-)
-
-(define-method get_pass_func
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_pass_func")
-  (return-type "TnyGetPassFunc")
-)
-
-(define-method set_forget_pass_func
-  (of-object "TnyAccount")
-  (c-name "tny_account_set_forget_pass_func")
-  (return-type "none")
-  (parameters
-    '("TnyForgetPassFunc" "forget_pass_func")
-  )
-)
-
-(define-method get_forget_pass_func
-  (of-object "TnyAccount")
-  (c-name "tny_account_get_forget_pass_func")
-  (return-type "TnyForgetPassFunc")
-)
-
-(define-method cancel
-  (of-object "TnyAccount")
-  (c-name "tny_account_cancel")
-  (return-type "none")
-)
-
-(define-method matches_url_string
-  (of-object "TnyAccount")
-  (c-name "tny_account_matches_url_string")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "url_string")
-  )
-)
-
-(define-method start_operation
-  (of-object "TnyAccount")
-  (c-name "tny_account_start_operation")
-  (return-type "none")
-  (parameters
-    '("TnyStatusDomain" "domain")
-    '("TnyStatusCode" "code")
-    '("TnyStatusCallback" "status_callback")
-    '("gpointer" "status_user_data")
-  )
-)
-
-(define-method stop_operation
-  (of-object "TnyAccount")
-  (c-name "tny_account_stop_operation")
-  (return-type "none")
-  (parameters
-    '("gboolean*" "canceled")
-  )
-)
-
-(define-method is_ready
-  (of-object "TnyAccount")
-  (c-name "tny_account_is_ready")
-  (return-type "gboolean")
-)
-
-(define-virtual get_connection_status_func
-  (of-object "TnyAccount")
-  (return-type "TnyConnectionStatus")
-)
-
-(define-virtual set_id_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "id")
-  )
-)
-
-(define-virtual set_name_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "name")
-  )
-)
-
-(define-virtual set_secure_auth_mech_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "mech")
-  )
-)
-
-(define-virtual set_proto_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "proto")
-  )
-)
-
-(define-virtual set_user_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "user")
-  )
-)
-
-(define-virtual set_hostname_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "host")
-  )
-)
-
-(define-virtual set_port_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("guint" "port")
-  )
-)
-
-(define-virtual set_url_string_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "url_string")
-  )
-)
-
-(define-virtual set_pass_func_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("TnyGetPassFunc" "get_pass_func")
-  )
-)
-
-(define-virtual set_forget_pass_func_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("TnyForgetPassFunc" "get_forget_pass_func")
-  )
-)
-
-(define-virtual get_pass_func_func
-  (of-object "TnyAccount")
-  (return-type "TnyGetPassFunc")
-)
-
-(define-virtual get_forget_pass_func_func
-  (of-object "TnyAccount")
-  (return-type "TnyForgetPassFunc")
-)
-
-(define-virtual get_id_func
-  (of-object "TnyAccount")
-  (return-type "const-gchar*")
-)
-
-(define-virtual get_name_func
-  (of-object "TnyAccount")
-  (return-type "const-gchar*")
-)
-
-(define-virtual get_secure_auth_mech_func
-  (of-object "TnyAccount")
-  (return-type "const-gchar*")
-)
-
-(define-virtual get_proto_func
-  (of-object "TnyAccount")
-  (return-type "const-gchar*")
-)
-
-(define-virtual get_user_func
-  (of-object "TnyAccount")
-  (return-type "const-gchar*")
-)
-
-(define-virtual get_hostname_func
-  (of-object "TnyAccount")
-  (return-type "const-gchar*")
-)
-
-(define-virtual get_port_func
-  (of-object "TnyAccount")
-  (return-type "guint")
-)
-
-(define-virtual get_url_string_func
-  (of-object "TnyAccount")
-  (return-type "gchar*")
-)
-
-(define-virtual get_account_type_func
-  (of-object "TnyAccount")
-  (return-type "TnyAccountType")
-)
-
-(define-virtual cancel_func
-  (of-object "TnyAccount")
-  (return-type "none")
-)
-
-(define-virtual matches_url_string_func
-  (of-object "TnyAccount")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "url_string")
-  )
-)
-
-(define-virtual start_operation_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("TnyStatusDomain" "domain")
-    '("TnyStatusCode" "code")
-    '("TnyStatusCallback" "status_callback")
-    '("gpointer" "status_user_data")
-  )
-)
-
-(define-virtual stop_operation_func
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("gboolean*" "canceled")
-  )
-)
-
-(define-virtual is_ready_func
-  (of-object "TnyAccount")
-  (return-type "gboolean")
-)
-
-(define-virtual connection_status_changed
-  (of-object "TnyAccount")
-  (return-type "none")
-  (parameters
-    '("TnyConnectionStatus" "status")
-  )
-)
-
-(define-virtual changed
-  (of-object "TnyAccount")
-  (return-type "none")
-)
-
-
-
-;; From tny-combined-account.h
-
-(define-function combined_account_get_type
-  (c-name "tny_combined_account_get_type")
-  (return-type "GType")
-)
-
-(define-function combined_account_new
-  (c-name "tny_combined_account_new")
-  (is-constructor-of "TnyCombinedAccount")
-  (return-type "TnyAccount*")
-  (parameters
-    '("TnyTransportAccount*" "ta")
-    '("TnyStoreAccount*" "sa")
-  )
-)
-
-(define-method get_transport_account
-  (of-object "TnyCombinedAccount")
-  (c-name "tny_combined_account_get_transport_account")
-  (return-type "TnyTransportAccount*")
-)
-
-(define-method get_store_account
-  (of-object "TnyCombinedAccount")
-  (c-name "tny_combined_account_get_store_account")