[libsoup] Mark old session-(async|sync) methods as deprecated

[Dan Winship <danw src gnome org>]

commit 9aaa13affd6404a2f0041b31c8990d8e6efa1eee
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Nov 3 08:05:25 2015 +0100

    Mark old session-(async|sync) methods as deprecated
    
    They were not marked as deprecated yet to give people time to port over
    without getting annoying warnings. Now that we are at the start
    of a cycle let's mark them.
    Fix all the consequent deprecation warnings.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757146

 examples/simple-proxy.c      |    2 +-
 libsoup/soup-session-async.c |    4 ++++
 libsoup/soup-session-async.h |   13 ++++++++++++-
 libsoup/soup-session-sync.c  |    4 ++++
 libsoup/soup-session-sync.h  |   13 ++++++++++++-
 tests/no-ssl-test.c          |    2 ++
 tests/ssl-test.c             |    2 ++
 tests/test-utils.h           |    5 +++++
 8 files changed, 42 insertions(+), 3 deletions(-)
---
diff --git a/examples/simple-proxy.c b/examples/simple-proxy.c
index 7657355..e585490 100644
--- a/examples/simple-proxy.c
+++ b/examples/simple-proxy.c
@@ -405,7 +405,7 @@ main (int argc, char **argv)
        }
        g_slist_free (uris);
 
-       session = soup_session_async_new ();
+       session = soup_session_new ();
 
        g_print ("\nWaiting for requests...\n");
 
diff --git a/libsoup/soup-session-async.c b/libsoup/soup-session-async.c
index b935348..e9d4712 100644
--- a/libsoup/soup-session-async.c
+++ b/libsoup/soup-session-async.c
@@ -30,6 +30,8 @@
  * linkend="libsoup-session-porting">porting guide</link>.
  **/
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
 G_DEFINE_TYPE (SoupSessionAsync, soup_session_async, SOUP_TYPE_SESSION)
 
 static void
@@ -141,3 +143,5 @@ soup_session_async_class_init (SoupSessionAsyncClass *soup_session_async_class)
        session_class->send_message = soup_session_async_send_message;
        session_class->cancel_message = soup_session_async_cancel_message;
 }
+
+G_GNUC_END_IGNORE_DEPRECATIONS;
diff --git a/libsoup/soup-session-async.h b/libsoup/soup-session-async.h
index a39b6b9..d5a450e 100644
--- a/libsoup/soup-session-async.h
+++ b/libsoup/soup-session-async.h
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
 #define SOUP_TYPE_SESSION_ASYNC            (soup_session_async_get_type ())
 #define SOUP_SESSION_ASYNC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SESSION_ASYNC, 
SoupSessionAsync))
 #define SOUP_SESSION_ASYNC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SESSION_ASYNC, 
SoupSessionAsyncClass))
-#define SOUP_IS_SESSION_ASYNC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SOUP_TYPE_SESSION_ASYNC))
+#define SOUP_IS_SESSION_ASYNC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
_soup_session_async_get_type_undeprecated ()))
 #define SOUP_IS_SESSION_ASYNC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SOUP_TYPE_SESSION_ASYNC))
 #define SOUP_SESSION_ASYNC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_SESSION_ASYNC, 
SoupSessionAsyncClass))
 
@@ -34,12 +34,23 @@ typedef struct {
 } SoupSessionAsyncClass;
 
 SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_54
 GType soup_session_async_get_type (void);
 
+static inline GType
+_soup_session_async_get_type_undeprecated (void)
+{
+       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+       return soup_session_async_get_type ();
+       G_GNUC_END_IGNORE_DEPRECATIONS;
+}
+
 #ifndef SOUP_DISABLE_DEPRECATED
 SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_54_FOR(soup_session_new)
 SoupSession *soup_session_async_new              (void);
 SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_54_FOR(soup_session_new)
 SoupSession *soup_session_async_new_with_options (const char *optname1,
                                                  ...) G_GNUC_NULL_TERMINATED;
 #endif
diff --git a/libsoup/soup-session-sync.c b/libsoup/soup-session-sync.c
index 374f22b..42e5078 100644
--- a/libsoup/soup-session-sync.c
+++ b/libsoup/soup-session-sync.c
@@ -29,6 +29,8 @@
  * linkend="libsoup-session-porting">porting guide</link>.
  **/
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
 G_DEFINE_TYPE (SoupSessionSync, soup_session_sync, SOUP_TYPE_SESSION)
 
 static void
@@ -127,3 +129,5 @@ soup_session_sync_class_init (SoupSessionSyncClass *session_sync_class)
        /* virtual method override */
        session_class->queue_message = soup_session_sync_queue_message;
 }
+
+G_GNUC_END_IGNORE_DEPRECATIONS;
diff --git a/libsoup/soup-session-sync.h b/libsoup/soup-session-sync.h
index b658aa5..56c340c 100644
--- a/libsoup/soup-session-sync.h
+++ b/libsoup/soup-session-sync.h
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
 #define SOUP_TYPE_SESSION_SYNC            (soup_session_sync_get_type ())
 #define SOUP_SESSION_SYNC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SESSION_SYNC, 
SoupSessionSync))
 #define SOUP_SESSION_SYNC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SESSION_SYNC, 
SoupSessionSyncClass))
-#define SOUP_IS_SESSION_SYNC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SOUP_TYPE_SESSION_SYNC))
+#define SOUP_IS_SESSION_SYNC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
_soup_session_sync_get_type_undeprecated ()))
 #define SOUP_IS_SESSION_SYNC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SOUP_TYPE_SESSION_SYNC))
 #define SOUP_SESSION_SYNC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_SESSION_SYNC, 
SoupSessionSyncClass))
 
@@ -34,12 +34,23 @@ typedef struct {
 } SoupSessionSyncClass;
 
 SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_54
 GType soup_session_sync_get_type (void);
 
+static inline GType
+_soup_session_sync_get_type_undeprecated (void)
+{
+       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+       return soup_session_sync_get_type ();
+       G_GNUC_END_IGNORE_DEPRECATIONS;
+}
+
 #ifndef SOUP_DISABLE_DEPRECATED
 SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_54_FOR(soup_session_new)
 SoupSession *soup_session_sync_new              (void);
 SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_54_FOR(soup_session_new_with_options)
 SoupSession *soup_session_sync_new_with_options (const char *optname1,
                                                 ...) G_GNUC_NULL_TERMINATED;
 #endif
diff --git a/tests/no-ssl-test.c b/tests/no-ssl-test.c
index e6114b9..c9d9bca 100644
--- a/tests/no-ssl-test.c
+++ b/tests/no-ssl-test.c
@@ -58,7 +58,9 @@ do_session_property_tests (void)
 
        g_test_bug ("700518");
 
+       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
        session = soup_session_async_new ();
+       G_GNUC_END_IGNORE_DEPRECATIONS;
 
        /* Temporarily undeprecate SOUP_SESSION_SSL_CA_FILE to avoid warnings. */
        pspec = g_object_class_find_property (g_type_class_peek (SOUP_TYPE_SESSION),
diff --git a/tests/ssl-test.c b/tests/ssl-test.c
index cc8197f..223647e 100644
--- a/tests/ssl-test.c
+++ b/tests/ssl-test.c
@@ -154,7 +154,9 @@ do_session_property_tests (void)
 
        SOUP_TEST_SKIP_IF_NO_TLS;
 
+       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
        session = soup_session_async_new ();
+       G_GNUC_END_IGNORE_DEPRECATIONS;
 
        /* Temporarily undeprecate SOUP_SESSION_SSL_CA_FILE to avoid warnings. */
        pspec = g_object_class_find_property (g_type_class_peek (SOUP_TYPE_SESSION),
diff --git a/tests/test-utils.h b/tests/test-utils.h
index 43ef5a7..0bc065f 100644
--- a/tests/test-utils.h
+++ b/tests/test-utils.h
@@ -52,6 +52,11 @@ typedef enum {
        SOUP_TEST_REQUEST_CANCEL_AFTER_SEND_FINISH = (1 << 5),
 } SoupTestRequestFlags;
 
+#undef SOUP_TYPE_SESSION_ASYNC
+#define SOUP_TYPE_SESSION_ASYNC (_soup_session_async_get_type_undeprecated ())
+#undef SOUP_TYPE_SESSION_SYNC
+#define SOUP_TYPE_SESSION_SYNC (_soup_session_sync_get_type_undeprecated ())
+
 SoupSession *soup_test_session_new         (GType type, ...);
 void         soup_test_session_abort_unref (SoupSession *session);