[gupnp/wip/phako/new-api: 12/17] wip: Deprecate old proxy action messages



commit 2b2848151508a82d8d3aff350d9a46b9664f8550
Author: Jens Georg <mail jensge org>
Date:   Sun Jan 13 17:41:21 2019 +0100

    wip: Deprecate old proxy action messages

 libgupnp/gupnp-service-proxy.c |  2 ++
 libgupnp/gupnp-service-proxy.h | 37 +++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c
index 7d03f85..6636e54 100644
--- a/libgupnp/gupnp-service-proxy.c
+++ b/libgupnp/gupnp-service-proxy.c
@@ -400,10 +400,12 @@ gupnp_service_proxy_send_action (GUPnPServiceProxy *proxy,
         gboolean ret;
 
         va_start (var_args, error);
+        G_GNUC_BEGIN_IGNORE_DEPRECATIONS
         ret = gupnp_service_proxy_send_action_valist (proxy,
                                                       action,
                                                       error,
                                                       var_args);
+        G_GNUC_END_IGNORE_DEPRECATIONS
         va_end (var_args);
 
         return ret;
diff --git a/libgupnp/gupnp-service-proxy.h b/libgupnp/gupnp-service-proxy.h
index 74e574d..7400213 100644
--- a/libgupnp/gupnp-service-proxy.h
+++ b/libgupnp/gupnp-service-proxy.h
@@ -89,20 +89,20 @@ typedef void (* GUPnPServiceProxyNotifyCallback) (GUPnPServiceProxy *proxy,
                                                   GValue            *value,
                                                   gpointer           user_data);
 
-gboolean
+G_GNUC_DEPRECATED gboolean
 gupnp_service_proxy_send_action    (GUPnPServiceProxy              *proxy,
                                     const char                     *action,
                                     GError                        **error,
                                     ...) G_GNUC_NULL_TERMINATED;
 
-gboolean
+G_GNUC_DEPRECATED gboolean
 gupnp_service_proxy_send_action_valist
                                    (GUPnPServiceProxy              *proxy,
                                     const char                     *action,
                                     GError                        **error,
                                     va_list                         var_args);
 
-gboolean
+G_GNUC_DEPRECATED gboolean
 gupnp_service_proxy_send_action_list (GUPnPServiceProxy *proxy,
                                       const char        *action,
                                       GList             *in_names,
@@ -111,14 +111,14 @@ gupnp_service_proxy_send_action_list (GUPnPServiceProxy *proxy,
                                       GList             *out_types,
                                       GList            **out_values,
                                       GError           **error);
-GUPnPServiceProxyAction *
+G_GNUC_DEPRECATED GUPnPServiceProxyAction *
 gupnp_service_proxy_begin_action   (GUPnPServiceProxy              *proxy,
                                     const char                     *action,
                                     GUPnPServiceProxyActionCallback callback,
                                     gpointer                        user_data,
                                     ...) G_GNUC_NULL_TERMINATED;
 
-GUPnPServiceProxyAction *
+G_GNUC_DEPRECATED GUPnPServiceProxyAction *
 gupnp_service_proxy_begin_action_valist
                                    (GUPnPServiceProxy              *proxy,
                                     const char                     *action,
@@ -126,7 +126,7 @@ gupnp_service_proxy_begin_action_valist
                                     gpointer                        user_data,
                                     va_list                         var_args);
 
-GUPnPServiceProxyAction *
+G_GNUC_DEPRECATED GUPnPServiceProxyAction *
 gupnp_service_proxy_begin_action_list
                                    (GUPnPServiceProxy              *proxy,
                                     const char                     *action,
@@ -135,20 +135,20 @@ gupnp_service_proxy_begin_action_list
                                     GUPnPServiceProxyActionCallback callback,
                                     gpointer                        user_data);
 
-gboolean
+G_GNUC_DEPRECATED gboolean
 gupnp_service_proxy_end_action     (GUPnPServiceProxy              *proxy,
                                     GUPnPServiceProxyAction        *action,
                                     GError                        **error,
                                     ...) G_GNUC_NULL_TERMINATED;
 
-gboolean
+G_GNUC_DEPRECATED gboolean
 gupnp_service_proxy_end_action_valist
                                    (GUPnPServiceProxy              *proxy,
                                     GUPnPServiceProxyAction        *action,
                                     GError                        **error,
                                     va_list                         var_args);
 
-gboolean
+G_GNUC_DEPRECATED gboolean
 gupnp_service_proxy_end_action_list
                                   (GUPnPServiceProxy       *proxy,
                                    GUPnPServiceProxyAction *action,
@@ -157,14 +157,14 @@ gupnp_service_proxy_end_action_list
                                    GList                  **out_values,
                                    GError                  **error);
 
-gboolean
+G_GNUC_DEPRECATED gboolean
 gupnp_service_proxy_end_action_hash
                                    (GUPnPServiceProxy              *proxy,
                                     GUPnPServiceProxyAction        *action,
                                     GHashTable                     *hash,
                                     GError                        **error);
 
-void
+G_GNUC_DEPRECATED void
 gupnp_service_proxy_cancel_action  (GUPnPServiceProxy              *proxy,
                                     GUPnPServiceProxyAction        *action);
 
@@ -208,6 +208,8 @@ gupnp_service_proxy_set_subscribed (GUPnPServiceProxy              *proxy,
 gboolean
 gupnp_service_proxy_get_subscribed (GUPnPServiceProxy              *proxy);
 
+/* New action API */
+
 GUPnPServiceProxyAction *
 gupnp_service_proxy_action_new (const char *action,
                                 ...) G_GNUC_NULL_TERMINATED;
@@ -217,6 +219,12 @@ gupnp_service_proxy_action_new_from_list (const char *action,
                                           GList      *in_names,
                                           GList      *in_values);
 
+GUPnPServiceProxyAction *
+gupnp_service_proxy_action_ref (GUPnPServiceProxyAction *action);
+
+void
+gupnp_service_proxy_action_unref (GUPnPServiceProxyAction *action);
+
 gboolean
 gupnp_service_proxy_action_get_result (GUPnPServiceProxyAction *action,
                                        GError                 **error,
@@ -253,13 +261,6 @@ gupnp_service_proxy_call_action (GUPnPServiceProxy       *proxy,
                                  GCancellable            *cancellable,
                                  GError                 **error);
 
-GUPnPServiceProxyAction *
-gupnp_service_proxy_action_ref (GUPnPServiceProxyAction *action);
-
-void
-gupnp_service_proxy_action_unref (GUPnPServiceProxyAction *action);
-
-
 G_END_DECLS
 
 #endif /* GUPNP_SERVICE_PROXY_H */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]