GNOME.org
 

[libsoup/wip/nacho/soup-extern] Fix methods that are not exported

commit 78db8495563f33d904ed0ec31266f6c8036a787c
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Oct 27 09:12:21 2015 +0100

    Fix methods that are not exported

 Makefile.glib                |    4 ++--
 libsoup/soup-session-async.h |    7 ++++++-
 libsoup/soup-session-sync.h  |    7 ++++++-
 libsoup/soup-session.h       |    1 +
 libsoup/soup-value-utils.h   |   16 ++++++++++++++++
 libsoup/soup-version.h.in    |    4 ++++
 6 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.glib b/Makefile.glib
index c28c983..6f2a140 100644
--- a/Makefile.glib
+++ b/Makefile.glib
@@ -205,8 +205,8 @@ $(1).h.stamp: $(_glib_enum_types_h_sources) Makefile
                --fhead "/* Generated by glib-mkenums. Do not edit */\n\n#ifndef 
$(_glib_enum_types_guard)\n#define $(_glib_enum_types_guard)\n\n" \
                $$(GLIB_MKENUMS_H_FLAGS) \
                $$($(_glib_enum_types_prefix)_MKENUMS_H_FLAGS) \
-               --fhead "#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-               --vhead "GType @enum_name _get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX 
_TYPE_@ENUMSHORT@ (@enum_name _get_type ())\n" \
+               --fhead "#include <glib-object.h>\n#include <libsoup/soup-version.h>\n\nG_BEGIN_DECLS\n" \
+               --vhead "SOUP_AVAILABLE_IN_2_4 GType @enum_name _get_type (void) G_GNUC_CONST;\n#define 
@ENUMPREFIX _TYPE_@ENUMSHORT@ (@enum_name _get_type ())\n" \
                --ftail "G_END_DECLS\n\n#endif /* $(_glib_enum_types_guard) */" \
                $$(filter-out Makefile, $$^) > $(1).h.tmp && \
        (cmp -s $(1).h.tmp $(1).h || cp $(1).h.tmp $(1).h) && \
diff --git a/libsoup/soup-session-async.h b/libsoup/soup-session-async.h
index fbf7871..8ca8f95 100644
--- a/libsoup/soup-session-async.h
+++ b/libsoup/soup-session-async.h
@@ -33,11 +33,16 @@ typedef struct {
        void (*_libsoup_reserved4) (void);
 } SoupSessionAsyncClass;
 
-/* FIXME: when was this deprecated? */
+SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_42
 GType soup_session_async_get_type (void);
 
 #ifndef SOUP_DISABLE_DEPRECATED
+SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_42
 SoupSession *soup_session_async_new              (void);
+SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_42
 SoupSession *soup_session_async_new_with_options (const char *optname1,
                                                  ...) G_GNUC_NULL_TERMINATED;
 #endif
diff --git a/libsoup/soup-session-sync.h b/libsoup/soup-session-sync.h
index 2f37f64..8e53b7d 100644
--- a/libsoup/soup-session-sync.h
+++ b/libsoup/soup-session-sync.h
@@ -33,11 +33,16 @@ typedef struct {
        void (*_libsoup_reserved4) (void);
 } SoupSessionSyncClass;
 
-/* FIXME: when was this deprecated? */
+SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_42
 GType soup_session_sync_get_type (void);
 
 #ifndef SOUP_DISABLE_DEPRECATED
+SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_42
 SoupSession *soup_session_sync_new              (void);
+SOUP_AVAILABLE_IN_2_4
+SOUP_DEPRECATED_IN_2_42
 SoupSession *soup_session_sync_new_with_options (const char *optname1,
                                                 ...) G_GNUC_NULL_TERMINATED;
 #endif
diff --git a/libsoup/soup-session.h b/libsoup/soup-session.h
index 3fa4f3f..ebfbb71 100644
--- a/libsoup/soup-session.h
+++ b/libsoup/soup-session.h
@@ -59,6 +59,7 @@ typedef struct {
        void (*_libsoup_reserved4) (void);
 } SoupSessionClass;
 
+SOUP_AVAILABLE_IN_2_42
 GType soup_session_get_type (void);
 
 #define SOUP_SESSION_LOCAL_ADDRESS          "local-address"
diff --git a/libsoup/soup-value-utils.h b/libsoup/soup-value-utils.h
index 2a50abc..7910bef 100644
--- a/libsoup/soup-value-utils.h
+++ b/libsoup/soup-value-utils.h
@@ -29,59 +29,74 @@ G_STMT_START {                                                              \
        g_free (getv_error);                                            \
 } G_STMT_END
 
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 GHashTable  *soup_value_hash_new            (void);
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 GHashTable  *soup_value_hash_new_with_vals  (const char  *first_key,
                                             ...) G_GNUC_NULL_TERMINATED;
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 void         soup_value_hash_insert_value   (GHashTable  *hash,
                                             const char  *key,
                                             GValue      *value);
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 void         soup_value_hash_insert         (GHashTable  *hash,
                                             const char  *key,
                                             GType        type,
                                             ...);
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 void         soup_value_hash_insert_vals    (GHashTable  *hash,
                                             const char  *first_key,
                                             ...) G_GNUC_NULL_TERMINATED;
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 gboolean     soup_value_hash_lookup         (GHashTable  *hash,
                                             const char  *key,
                                             GType        type,
                                             ...);
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 gboolean     soup_value_hash_lookup_vals    (GHashTable  *hash,
                                             const char  *first_key,
                                             ...) G_GNUC_NULL_TERMINATED;
 
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 GValueArray *soup_value_array_from_args     (va_list      args);
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 gboolean     soup_value_array_to_args       (GValueArray *array,
                                             va_list      args);
 
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 GValueArray *soup_value_array_new           (void);
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 GValueArray *soup_value_array_new_with_vals (GType        first_type,
                                             ...) G_GNUC_NULL_TERMINATED;
 
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 void         soup_value_array_insert        (GValueArray *array,
                                             guint        index_,
                                             GType        type,
                                             ...);
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 void         soup_value_array_append        (GValueArray *array,
                                             GType        type,
                                             ...);
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 void         soup_value_array_append_vals   (GValueArray *array,
                                             GType        first_type,
                                             ...) G_GNUC_NULL_TERMINATED;
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 gboolean     soup_value_array_get_nth       (GValueArray *array,
                                             guint        index_,
@@ -89,6 +104,7 @@ gboolean     soup_value_array_get_nth       (GValueArray *array,
                                             ...);
 
 
+SOUP_AVAILABLE_IN_2_4
 SOUP_DEPRECATED_IN_2_52
 GType        soup_byte_array_get_type       (void);
 #define SOUP_TYPE_BYTE_ARRAY (soup_byte_array_get_type ())
diff --git a/libsoup/soup-version.h.in b/libsoup/soup-version.h.in
index b233540..97d0fd3 100644
--- a/libsoup/soup-version.h.in
+++ b/libsoup/soup-version.h.in
@@ -8,6 +8,10 @@
 #ifndef SOUP_VERSION_H
 #define SOUP_VERSION_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 
 G_BEGIN_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]