GNOME.org
 

[libsoup/wip/xmlrpc-variant: 9/11] fixup! xmlrpc: Deprecate gvalue API

commit 6fb88d9ebd48af3b266e92393a61f041be04d78e
Author: Dan Winship <danw gnome org>
Date:   Thu Aug 6 08:47:01 2015 -0400

    fixup! xmlrpc: Deprecate gvalue API

 docs/reference/Makefile.am              |    2 +-
 docs/reference/libsoup-2.4-docs.sgml    |    1 -
 docs/reference/libsoup-2.4-sections.txt |   38 -------------------------------
 libsoup/soup-value-utils.c              |   32 +++++++++++++-------------
 libsoup/soup-xmlrpc-old.c               |   21 +++++++++++-----
 5 files changed, 31 insertions(+), 63 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 311fce8..6011da1 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -46,7 +46,7 @@ IGNORE_HFILES= soup.h soup-enum-types.h \
        soup-misc-private.h soup-proxy-uri-resolver.h \
        soup-proxy-resolver-wrapper.h soup-proxy-uri-resolver.h \
        soup-cache-private.h soup-cache-client-input-stream.h \
-       soup-socket-private.h
+       soup-socket-private.h soup-value-utils.h soup-xmlrpc-old.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES = 
diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
index 7e553ff..7bd4858 100644
--- a/docs/reference/libsoup-2.4-docs.sgml
+++ b/docs/reference/libsoup-2.4-docs.sgml
@@ -62,7 +62,6 @@
     <title>Web Services APIs</title>
     <xi:include href="xml/soup-form.xml"/>
     <xi:include href="xml/soup-xmlrpc.xml"/>
-    <xi:include href="xml/soup-value-utils.xml"/>
     <xi:include href="xml/soup-websocket.xml"/>
   </chapter>
 
diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index 184fc95..a35d9dc 100644
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -850,50 +850,12 @@ soup_xmlrpc_build_response
 soup_xmlrpc_build_fault
 soup_xmlrpc_message_set_response
 soup_xmlrpc_message_set_fault
-<SUBSECTION>
-soup_xmlrpc_build_method_call
-soup_xmlrpc_request_new
-soup_xmlrpc_parse_method_response
-soup_xmlrpc_extract_method_response
-soup_xmlrpc_parse_method_call
-soup_xmlrpc_extract_method_call
-soup_xmlrpc_build_method_response
-soup_xmlrpc_set_response
-soup_xmlrpc_set_fault
 <SUBSECTION Private>
 soup_xmlrpc_error_quark
 soup_xmlrpc_fault_quark
 </SECTION>
 
 <SECTION>
-<FILE>soup-value-utils</FILE>
-<TITLE>GValue Support</TITLE>
-soup_value_hash_new
-soup_value_hash_new_with_vals
-soup_value_hash_insert_value
-soup_value_hash_insert
-soup_value_hash_insert_vals
-soup_value_hash_lookup
-soup_value_hash_lookup_vals
-<SUBSECTION>
-soup_value_array_from_args
-soup_value_array_to_args
-soup_value_array_new
-soup_value_array_new_with_vals
-soup_value_array_insert
-soup_value_array_append
-soup_value_array_append_vals
-soup_value_array_get_nth
-<SUBSECTION>
-SOUP_VALUE_SETV
-SOUP_VALUE_GETV
-<SUBSECTION>
-SOUP_TYPE_BYTE_ARRAY
-<SUBSECTION Private>
-soup_byte_array_get_type
-</SECTION>
-
-<SECTION>
 <FILE>soup-logger</FILE>
 <TITLE>SoupLogger</TITLE>
 SoupLogger
diff --git a/libsoup/soup-value-utils.c b/libsoup/soup-value-utils.c
index 711d71b..8ff2d86 100644
--- a/libsoup/soup-value-utils.c
+++ b/libsoup/soup-value-utils.c
@@ -110,9 +110,10 @@ soup_value_hash_insert_valist (GHashTable *hash, const char *first_key,
  * with soup_value_hash_insert(), the keys and values are copied
  * rather than being inserted directly.
  *
- * Deprecated: Use #GVariant API instead.
  * Return value: (element-type utf8 GValue) (transfer full): a new
  * #GHashTable, initialized with the given values
+ *
+ * Deprecated: Use #GVariant API instead.
  **/
 GHashTable *
 soup_value_hash_new_with_vals (const char *first_key, ...)
@@ -205,9 +206,10 @@ soup_value_hash_insert_vals (GHashTable *hash, const char *first_key, ...)
  * Looks up @key in @hash and stores its value into the provided
  * location.
  *
- * Deprecated: Use #GVariant API instead.
  * Return value: %TRUE if @hash contained a value with key @key and
  * type @type, %FALSE if not.
+ *
+ * Deprecated: Use #GVariant API instead.
  **/
 gboolean
 soup_value_hash_lookup (GHashTable *hash, const char *key, GType type, ...)
@@ -236,12 +238,13 @@ soup_value_hash_lookup (GHashTable *hash, const char *key, GType type, ...)
  *
  * Looks up a number of keys in @hash and returns their values.
  *
- * Deprecated: Use #GVariant API instead.
  * Return value: %TRUE if all of the keys were found, %FALSE
  * if any were missing; note that you will generally need to
  * initialize each destination variable to a reasonable default
  * value, since there is no way to tell which keys were found
  * and which were not.
+ *
+ * Deprecated: Use #GVariant API instead.
  **/
 gboolean
 soup_value_hash_lookup_vals (GHashTable *hash, const char *first_key, ...)
@@ -273,10 +276,6 @@ soup_value_hash_lookup_vals (GHashTable *hash, const char *first_key, ...)
 }
 
 
-#ifdef G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-#endif
-
 /**
  * soup_value_array_from_args:
  * @args: arguments to create a #GValueArray from
@@ -286,9 +285,10 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  * by %G_TYPE_INVALID. (The array will contain copies of the provided
  * data rather than pointing to the passed-in data directly.)
  *
- * Deprecated: Use #GVariant API instead.
  * Return value: (nullable): a new #GValueArray, or %NULL if an error
  * occurred.
+ *
+ * Deprecated: Use #GVariant API instead.
  **/
 GValueArray *
 soup_value_array_from_args (va_list args)
@@ -315,8 +315,9 @@ soup_value_array_from_args (va_list args)
  * terminated by %G_TYPE_INVALID. The returned values will point to the
  * same memory as the values in the array.
  *
- * Deprecated: Use #GVariant API instead.
  * Return value: success or failure
+ *
+ * Deprecated: Use #GVariant API instead.
  **/
 gboolean
 soup_value_array_to_args (GValueArray *array, va_list args)
@@ -343,8 +344,9 @@ soup_value_array_to_args (GValueArray *array, va_list args)
  * Creates a new %GValueArray. (This is just a wrapper around
  * g_value_array_new(), for naming consistency purposes.)
  *
- * Deprecated: Use #GVariant API instead.
  * Return value: a new %GValueArray
+ *
+ * Deprecated: Use #GVariant API instead.
  **/
 GValueArray *
 soup_value_array_new (void)
@@ -377,8 +379,9 @@ soup_value_array_append_valist (GValueArray *array,
  * Creates a new %GValueArray and copies the provided values
  * into it.
  *
- * Deprecated: Use #GVariant API instead.
  * Return value: a new %GValueArray
+ *
+ * Deprecated: Use #GVariant API instead.
  **/
 GValueArray *
 soup_value_array_new_with_vals (GType first_type, ...)
@@ -475,9 +478,10 @@ soup_value_array_append_vals (GValueArray *array, GType first_type, ...)
  * Gets the @index_ element of @array and stores its value into the
  * provided location.
  *
- * Deprecated: Use #GVariant API instead.
  * Return value: %TRUE if @array contained a value with index @index_
  * and type @type, %FALSE if not.
+ *
+ * Deprecated: Use #GVariant API instead.
  **/
 gboolean
 soup_value_array_get_nth (GValueArray *array, guint index_, GType type, ...)
@@ -495,10 +499,6 @@ soup_value_array_get_nth (GValueArray *array, guint index_, GType type, ...)
        return TRUE;
 }
 
-#ifdef G_GNUC_END_IGNORE_DEPRECATIONS
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif
-
 static GByteArray *
 soup_byte_array_copy (GByteArray *ba)
 {
diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c
index c14374b..f31dd17 100644
--- a/libsoup/soup-xmlrpc-old.c
+++ b/libsoup/soup-xmlrpc-old.c
@@ -147,9 +147,10 @@ insert_value (xmlNode *parent, GValue *value)
  * For structs, use a #GHashTable that maps strings to #GValue;
  * soup_value_hash_new() and related methods can help with this.
  *
- * Deprecated: Use soup_xmlrpc_build_request() instead.
  * Return value: (nullable): the text of the methodCall, or %NULL on
  * error
+ *
+ * Deprecated: Use soup_xmlrpc_build_request() instead.
  **/
 char *
 soup_xmlrpc_build_method_call (const char *method_name,
@@ -224,9 +225,10 @@ soup_xmlrpc_request_newv (const char *uri, const char *method_name, va_list args
  * and then a value of the appropriate type, finally terminated by
  * %G_TYPE_INVALID.
  *
- * Deprecated: Use soup_xmlrpc_message_new() instead.
  * Return value: (transfer full): a #SoupMessage encoding the
  * indicated XML-RPC request.
+ *
+ * Deprecated: Use soup_xmlrpc_message_new() instead.
  **/
 SoupMessage *
 soup_xmlrpc_request_new (const char *uri, const char *method_name, ...)
@@ -251,9 +253,10 @@ soup_xmlrpc_request_new (const char *uri, const char *method_name, ...)
  * The glib type to XML-RPC type mapping is as with
  * soup_xmlrpc_build_method_call(), qv.
  *
- * Deprecated: Use soup_xmlrpc_build_response() instead.
  * Return value: (nullable): the text of the methodResponse, or %NULL
  * on error
+ *
+ * Deprecated: Use soup_xmlrpc_build_response() instead.
  **/
 char *
 soup_xmlrpc_build_method_response (GValue *value)
@@ -492,8 +495,9 @@ parse_value (xmlNode *xmlvalue, GValue *value)
  * soup_xmlrpc_extract_method_call(), which is more convenient if you
  * know in advance what the types of the parameters will be.
  *
- * Deprecated: Use soup_xmlrpc_parse_request_full() instead.
  * Return value: success or failure.
+ *
+ * Deprecated: Use soup_xmlrpc_parse_request_full() instead.
  **/
 gboolean
 soup_xmlrpc_parse_method_call (const char *method_call, int length,
@@ -569,8 +573,9 @@ fail:
  * See also soup_xmlrpc_parse_method_call(), which can be used if
  * you don't know the types of the parameters.
  *
- * Deprecated: Use soup_xmlrpc_parse_request_full() instead.
  * Return value: success or failure.
+ *
+ * Deprecated: Use soup_xmlrpc_parse_request_full() instead.
  **/
 gboolean
 soup_xmlrpc_extract_method_call (const char *method_call, int length,
@@ -608,9 +613,10 @@ soup_xmlrpc_extract_method_call (const char *method_call, int length,
  * soup_xmlrpc_parse_method_response() will return %FALSE, but @error
  * will be unset.)
  *
- * Deprecated: Use soup_xmlrpc_parse_response() instead.
  * Return value: %TRUE if a return value was parsed, %FALSE if the
  * response could not be parsed, or contained a fault.
+ *
+ * Deprecated: Use soup_xmlrpc_parse_response() instead.
  **/
 gboolean
 soup_xmlrpc_parse_method_response (const char *method_response, int length,
@@ -695,9 +701,10 @@ fail:
  * at all, soup_xmlrpc_extract_method_response() will return %FALSE,
  * but @error will be unset.)
  *
- * Deprecated: Use soup_xmlrpc_parse_response() instead.
  * Return value: %TRUE if a return value was parsed, %FALSE if the
  * response was of the wrong type, or contained a fault.
+ *
+ * Deprecated: Use soup_xmlrpc_parse_response() instead.
  **/
 gboolean
 soup_xmlrpc_extract_method_response (const char *method_response, int length,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]