GNOME.org
 

[evolution-data-server/tintou/vala-metadata] vala: Improve metadata

commit 5efa3d975f7df4841c7bcf198be3ad25b1b0de74
Author: Corentin Noël <corentin noel collabora com>
Date:   Fri Jan 17 14:32:33 2020 +0100

    vala: Improve metadata

 src/addressbook/libedata-book/e-book-backend.c | 18 ++++----
 src/addressbook/libedata-book/e-book-sqlite.c  |  4 +-
 src/camel/camel-folder-summary.c               |  8 ++--
 src/camel/camel-mime-part-utils.c              | 19 +++++---
 src/camel/camel-mime-part-utils.h              | 20 +++++++--
 src/camel/camel-provider.c                     |  3 +-
 src/camel/camel-provider.h                     | 11 +++++
 src/camel/camel-session.c                      |  2 +-
 src/vala/Camel-1.2.metadata                    | 62 ++++++++++++++++++++++++--
 9 files changed, 116 insertions(+), 31 deletions(-)
---
diff --git a/src/addressbook/libedata-book/e-book-backend.c b/src/addressbook/libedata-book/e-book-backend.c
index d09df57af..651df31a0 100644
--- a/src/addressbook/libedata-book/e-book-backend.c
+++ b/src/addressbook/libedata-book/e-book-backend.c
@@ -2570,7 +2570,7 @@ e_book_backend_get_contact_list_uids_finish (EBookBackend *backend,
 }
 
 /**
- * e_book_backend_start_view:
+ * e_book_backend_start_view: (virtual impl_start_view)
  * @backend: an #EBookBackend
  * @view: the #EDataBookView to start
  *
@@ -2594,7 +2594,7 @@ e_book_backend_start_view (EBookBackend *backend,
 }
 
 /**
- * e_book_backend_stop_view:
+ * e_book_backend_stop_view: (virtual impl_stop_view)
  * @backend: an #EBookBackend
  * @view: the #EDataBookView to stop
  *
@@ -2811,7 +2811,7 @@ e_book_backend_foreach_view_notify_progress (EBookBackend *backend,
 }
 
 /**
- * e_book_backend_get_backend_property:
+ * e_book_backend_get_backend_property: (virtual impl_get_backend_property)
  * @backend: an #EBookBackend
  * @prop_name: a backend property name
  *
@@ -2878,7 +2878,7 @@ e_book_backend_is_readonly (EBookBackend *backend)
 }
 
 /**
- * e_book_backend_get_direct_book:
+ * e_book_backend_get_direct_book: (virtual impl_get_direct_book)
  * @backend: an #EBookBackend
  *
  * Tries to create an #EDataBookDirect for @backend if
@@ -2907,7 +2907,7 @@ e_book_backend_get_direct_book (EBookBackend *backend)
 }
 
 /**
- * e_book_backend_configure_direct:
+ * e_book_backend_configure_direct: (virtual impl_configure_direct)
  * @backend: an #EBookBackend
  * @config: The configuration string for the given backend
  *
@@ -2938,7 +2938,7 @@ e_book_backend_configure_direct (EBookBackend *backend,
 }
 
 /**
- * e_book_backend_set_locale:
+ * e_book_backend_set_locale: (virtual impl_set_locale)
  * @backend: an #EBookBackend
  * @locale: the new locale for the addressbook
  * @cancellable: optional #GCancellable object, or %NULL
@@ -2982,7 +2982,7 @@ e_book_backend_set_locale (EBookBackend *backend,
 }
 
 /**
- * e_book_backend_dup_locale:
+ * e_book_backend_dup_locale: (virtual impl_dup_locale)
  * @backend: an #EBookBackend
  *
  * Fetches a copy of the currently configured locale for the addressbook
@@ -3202,7 +3202,7 @@ e_book_backend_prepare_for_completion (EBookBackend *backend,
 }
 
 /**
- * e_book_backend_create_cursor:
+ * e_book_backend_create_cursor: (virtual impl_create_cursor)
  * @backend: an #EBookBackend
  * @sort_fields: the #EContactFields to sort by
  * @sort_types: the #EBookCursorSortTypes for the sorted fields
@@ -3257,7 +3257,7 @@ e_book_backend_create_cursor (EBookBackend *backend,
 }
 
 /**
- * e_book_backend_delete_cursor:
+ * e_book_backend_delete_cursor: (virtual impl_delete_cursor)
  * @backend: an #EBookBackend
  * @cursor: the #EDataBookCursor to destroy
  * @error: return location for a #GError, or %NULL
diff --git a/src/addressbook/libedata-book/e-book-sqlite.c b/src/addressbook/libedata-book/e-book-sqlite.c
index 89029febe..79ca346d6 100644
--- a/src/addressbook/libedata-book/e-book-sqlite.c
+++ b/src/addressbook/libedata-book/e-book-sqlite.c
@@ -6497,7 +6497,7 @@ e_book_sqlite_class_init (EBookSqliteClass *class)
                g_cclosure_marshal_generic,
                G_TYPE_BOOLEAN, 6,
                G_TYPE_POINTER,
-               G_TYPE_OBJECT,
+               E_TYPE_CONTACT,
                G_TYPE_STRING,
                G_TYPE_BOOLEAN,
                G_TYPE_OBJECT,
@@ -6514,7 +6514,7 @@ e_book_sqlite_class_init (EBookSqliteClass *class)
                G_TYPE_BOOLEAN, 4,
                G_TYPE_POINTER,
                G_TYPE_STRING,
-               G_TYPE_OBJECT,
+               G_TYPE_CANCELLABLE,
                G_TYPE_POINTER);
 }
 
diff --git a/src/camel/camel-folder-summary.c b/src/camel/camel-folder-summary.c
index d9ad04dcd..c981228bd 100644
--- a/src/camel/camel-folder-summary.c
+++ b/src/camel/camel-folder-summary.c
@@ -1404,7 +1404,7 @@ message_info_from_uid (CamelFolderSummary *summary,
 }
 
 /**
- * camel_folder_summary_get:
+ * camel_folder_summary_get: (virtual message_info_from_uid)
  * @summary: a #CamelFolderSummary object
  * @uid: a uid
  *
@@ -2449,7 +2449,7 @@ camel_folder_summary_add (CamelFolderSummary *summary,
 }
 
 /**
- * camel_folder_summary_info_new_from_headers:
+ * camel_folder_summary_info_new_from_headers: (virtual message_info_new_from_headers)
  * @summary: a #CamelFolderSummary object
  * @headers: rfc822 headers as #CamelNameValueArray
  *
@@ -2476,7 +2476,7 @@ camel_folder_summary_info_new_from_headers (CamelFolderSummary *summary,
 }
 
 /**
- * camel_folder_summary_info_new_from_parser:
+ * camel_folder_summary_info_new_from_parser: (virtual message_info_new_from_parser)
  * @summary: a #CamelFolderSummary object
  * @parser: a #CamelMimeParser object
  *
@@ -2555,7 +2555,7 @@ camel_folder_summary_info_new_from_parser (CamelFolderSummary *summary,
 }
 
 /**
- * camel_folder_summary_info_new_from_message:
+ * camel_folder_summary_info_new_from_message: (virtual message_info_new_from_message)
  * @summary: a #CamelFolderSummary object
  * @message: a #CamelMimeMessage object
  *
diff --git a/src/camel/camel-mime-part-utils.c b/src/camel/camel-mime-part-utils.c
index 580230699..81265fe91 100644
--- a/src/camel/camel-mime-part-utils.c
+++ b/src/camel/camel-mime-part-utils.c
@@ -319,15 +319,20 @@ camel_message_content_info_new_from_headers (const CamelNameValueArray *headers)
        return ci;
 }
 
-/* Calls the @func for each ci, including the top one. The @func can return TRUE to
-   continue processing or FALSE to stop it.
-   The function returns FALSE on error or when the @func returned FALSE, otherwise
-   it returns TRUE. */
+/**
+ * camel_message_content_info_traverse:
+ * @ci: a #CamelMessageContentInfo
+ * @func: (scope call): a #CamelMessageContentInfoTraverseCallback
+ * @user_data: user data passed to @func
+ *
+ * Calls the @func for each #CamelMessageContentInfo, including the top one.
+ * The @func can return %TRUE to continue processing or %FALSE to stop it.
+ *
+ * Returns: %FALSE on error or when the @func returned %FALSE, otherwise %TRUE
+ **/
 gboolean
 camel_message_content_info_traverse (CamelMessageContentInfo *ci,
-                                    gboolean (* func) (CamelMessageContentInfo *ci,
-                                                       gint depth,
-                                                       gpointer user_data),
+                                    CamelMessageContentInfoTraverseCallback func,
                                     gpointer user_data)
 {
        CamelMessageContentInfo *next, *cur;
diff --git a/src/camel/camel-mime-part-utils.h b/src/camel/camel-mime-part-utils.h
index da6d22684..6f77c24ed 100644
--- a/src/camel/camel-mime-part-utils.h
+++ b/src/camel/camel-mime-part-utils.h
@@ -38,6 +38,22 @@ gboolean     camel_mime_part_construct_content_from_parser
 
 typedef struct _CamelMessageContentInfo CamelMessageContentInfo;
 
+/**
+ * CamelMessageContentInfoTraverseCallback:
+ * @ci: a #CamelMessageContentInfo
+ * @depth: the current depth
+ * @user_data: data passed to camel_message_content_info_traverse()
+ *
+ * This is the callback signature for camel_message_content_info_traverse().
+ *
+ * Returns: %TRUE to continue processing or %FALSE to stop it.
+ *
+ * Since: 3.36
+ **/
+typedef gboolean       (*CamelMessageContentInfoTraverseCallback)      (CamelMessageContentInfo *ci,
+                                                                        gint depth,
+                                                                        gpointer user_data);
+
 /* A tree of message content info structures
  * describe the content structure of the message (if it has any) */
 struct _CamelMessageContentInfo {
@@ -72,9 +88,7 @@ CamelMessageContentInfo *
                                                (CamelMimePart *mime_part);
 gboolean       camel_message_content_info_traverse
                                                (CamelMessageContentInfo *ci,
-                                                gboolean (* func) (CamelMessageContentInfo *ci,
-                                                                   gint depth,
-                                                                   gpointer user_data),
+                                                CamelMessageContentInfoTraverseCallback func,
                                                 gpointer user_data);
 /* debugging functions */
 void           camel_message_content_info_dump (CamelMessageContentInfo *ci,
diff --git a/src/camel/camel-provider.c b/src/camel/camel-provider.c
index e2cebd436..8e4dad45a 100644
--- a/src/camel/camel-provider.c
+++ b/src/camel/camel-provider.c
@@ -472,7 +472,8 @@ fail:
  * camel_provider_auto_detect:
  * @provider: camel provider
  * @url: a #CamelURL
- * @auto_detected: (inout): output hash table of auto-detected values
+ * @auto_detected: (out) (element-type utf8 utf8) (nullable): output
+ * #GHashTable of auto-detected values
  * @error: return location for a #GError, or %NULL
  *
  * After filling in the standard Username/Hostname/Port/Path settings
diff --git a/src/camel/camel-provider.h b/src/camel/camel-provider.h
index 11261a280..4e144a6d8 100644
--- a/src/camel/camel-provider.h
+++ b/src/camel/camel-provider.h
@@ -129,6 +129,17 @@ typedef struct {
        gboolean is_ssl;
 } CamelProviderPortEntry;
 
+/**
+ * CamelProviderAutoDetectFunc:
+ * @url: a #CamelURL
+ * @auto_detected: (out) (element-type utf8 utf8) (nullable): output
+ * #GHashTable of auto-detected values
+ * @error: return location for a #GError, or %NULL
+ *
+ * Function used in camel_provider_auto_detect().
+ *
+ * Returns: 0 on success or -1 on fail.
+ **/
 typedef gint (*CamelProviderAutoDetectFunc) (CamelURL *url, GHashTable **auto_detected, GError **error);
 
 typedef struct {
diff --git a/src/camel/camel-session.c b/src/camel/camel-session.c
index 1a060006b..f573d2896 100644
--- a/src/camel/camel-session.c
+++ b/src/camel/camel-session.c
@@ -756,7 +756,7 @@ camel_session_init (CamelSession *session)
  * Returns the #GMainContext on which event sources for @session are to
  * be attached.
  *
- * Returns: a #GMainContext
+ * Returns: (transfer full): a #GMainContext
  *
  * Since: 3.8
  **/
diff --git a/src/vala/Camel-1.2.metadata b/src/vala/Camel-1.2.metadata
index 6798d5cdd..bb8c7a083 100644
--- a/src/vala/Camel-1.2.metadata
+++ b/src/vala/Camel-1.2.metadata
@@ -1,25 +1,61 @@
+*.*.cancellable default=null
+
 CipherValidity.sign skip
 CipherValidity.encrypt skip
 
+CipherCertInfo.properties type_arguments="Camel.CipherCertInfoProperty"
+
+ContentDisposition.params type="Camel.HeaderParam"
+ContentType.params type="Camel.HeaderParam"
+
 FilterGetFolderFunc skip=false
 FilterDriver.set* skip=false
 
+FolderChangeInfo.priv skip
+FolderSummary.message_info_from_uid skip=false
+
+MimeFilter.new symbol_type="function"
+
+FolderSummary.info_new_from_headers name="new_message_info_from_headers"
+FolderSummary.info_new_from_message name="new_message_info_from_message"
+FolderSummary.info_new_from_parser name="new_message_info_from_parser"
+FolderSummary.message_info_new_from_headers name="new_message_info_from_headers"
+FolderSummary.message_info_new_from_message name="new_message_info_from_message"
+FolderSummary.message_info_new_from_parser name="new_message_info_from_parser"
+FolderSummary.free_array skip
+FolderSummary.get_folder type="unowned Camel.Folder"
+FolderSummary.header_load.store type="Camel.Store"
+
+FolderSummary.summary_header_load name="header_load_impl"
+FolderSummary.summary_header_load.fir type="Camel.FIRecord"
+FolderSummary.summary_header_save name="header_save_impl" type="Camel.FIRecord"
+
+// They are already covered by FolderSummary.new_message_info_ or FolderSummary.get
+MessageInfo.new skip
+MessageInfo.new_from_headers skip
+
 // We need to skip the methods because the signals and virtual methods have the same name
 Object.state_read#method skip
 Object.state_read.fp type="GLib.FileStream"
 Object.state_write#method skip
 Object.state_write.fp type="GLib.FileStream"
+Operation.push_message skip
 Operation.pop_message skip
 Operation.progress skip
 
+WeakRefGroup.get type="GLib.Object"
+WeakRefGroup.set.object type="owned GLib.Object"
+
 Session* skip=false
 SExp* skip=false
+SExp.* skip=false
 
 // Recursive structs are not allowed
-MessageContentInfo.next type="void*"
-MessageContentInfo.childs type="void*"
-MessageContentInfo.parent type="void*"
-SExpTerm.value.func.terms type="void*[]"
+MessageContentInfo.next type="unowned Camel.MessageContentInfo?"
+MessageContentInfo.childs type="unowned Camel.MessageContentInfo?"
+MessageContentInfo.parent type="unowned Camel.MessageContentInfo?"
+SExpTerm.value.func.terms type="Camel.SExpTerm[]" array_length_field="termcount"
+HeaderParam.next type="Camel.HeaderParam?"
 
 localtime_with_offset.tm type="Posix.tm"
 mktime_utc.tm type="Posix.tm"
@@ -27,6 +63,8 @@ mktime_utc.tm type="Posix.tm"
 HeaderAddress.new_name#constructor name="with_name"
 
 // FILE* are supported by Vala
+StoreSummary.* skip=false
+StoreSummary.store_info_load.file type="GLib.FileStream"
 StoreSummary.store_info_save.file type="GLib.FileStream"
 StoreSummary.summary_header_load.file type="GLib.FileStream"
 StoreSummary.summary_header_save.file type="GLib.FileStream"
@@ -38,5 +76,21 @@ FilterDriver.set_logfile.logfile type="GLib.FileStream"
 
 FolderSummary.prepare_fetch_all#virtual_method name="prepare_fetch_all_v"
 
+Provider.priv skip
+Provider.authtypes type_arguments="unowned Camel.ServiceAuthType"
+
+VeeFolder.add_vuid.mi_data type="Camel.VeeMessageInfoData"
+VeeFolder.remove_vuid.mi_data type="Camel.VeeMessageInfoData"
+
+SMIMEContext.describe_part.part type="Camel.MimePart"
+
+Trie.add skip=false
+Trie.search skip=false
+
+UrlScanner.add skip=false
+UrlScanner.scan skip=false
+
+NetworkService.new_connectable skip=false
+
 // Abstract classes can't have creation methods
 Sasl.new symbol_type="function" name="for_service"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]