diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2012-01-14 22:16:52 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2012-01-14 22:16:52 +0000 |
| commit | 31bac4804acba9795cd33d510725ea27a39aac23 (patch) | |
| tree | f42483d8c9edf246dce88f08faae72c9adba1ea4 | |
| parent | 16f9213dc29390a933b0142ea0a39d44a7a0ab02 (diff) | |
| download | json-glib-31bac4804acba9795cd33d510725ea27a39aac23.tar.gz | |
Remove JSON_DISABLE_DEPRECATED
We have deprecations warnings from the compiler, now.
| -rw-r--r-- | json-glib/Makefile.am | 2 | ||||
| -rw-r--r-- | json-glib/json-glib.symbols | 6 | ||||
| -rw-r--r-- | json-glib/json-gobject.h | 3 | ||||
| -rw-r--r-- | json-glib/json-types.h | 2 |
4 files changed, 1 insertions, 12 deletions
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am index 262e69e..ee658ee 100644 --- a/json-glib/Makefile.am +++ b/json-glib/Makefile.am @@ -103,7 +103,7 @@ Json_1_0_gir_NAMESPACE = Json Json_1_0_gir_VERSION = 1.0 Json_1_0_gir_LIBS = libjson-glib-1.0.la Json_1_0_gir_FILES = $(source_h) $(source_c) -Json_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(JSON_CFLAGS) -UJSON_DISABLE_DEPRECATED +Json_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS) $(JSON_CFLAGS) Json_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Json_1_0_gir_SCANNERFLAGS = --warn-all --pkg-export json-glib-1.0 --c-include "json-glib/json-glib.h" diff --git a/json-glib/json-glib.symbols b/json-glib/json-glib.symbols index 8727fa5..dff0791 100644 --- a/json-glib/json-glib.symbols +++ b/json-glib/json-glib.symbols @@ -46,9 +46,7 @@ json_builder_get_type json_builder_new
json_builder_reset
json_builder_set_member_name
-#ifndef JSON_DISABLE_DEPRECATED
json_construct_gobject
-#endif
json_generator_get_type
json_generator_new
json_generator_set_root
@@ -93,9 +91,7 @@ json_node_take_array json_node_take_object
json_node_type_get_type
json_node_type_name
-#ifndef JSON_DISABLE_DEPRECATED
json_object_add_member
-#endif
json_object_dup_member
json_object_foreach_member
json_object_get_array_member
@@ -169,7 +165,5 @@ json_serializable_default_deserialize_property json_serializable_default_serialize_property
json_serializable_deserialize_property
json_serializable_get_type
-#ifndef JSON_DISABLE_DEPRECATED
json_serialize_gobject
-#endif
json_serializable_serialize_property
diff --git a/json-glib/json-gobject.h b/json-glib/json-gobject.h index 791fc9b..c19c457 100644 --- a/json-glib/json-gobject.h +++ b/json-glib/json-gobject.h @@ -167,7 +167,6 @@ GObject * json_gobject_from_data (GType gtype, gchar * json_gobject_to_data (GObject *gobject, gsize *length); -#ifndef JSON_DISABLE_DEPRECATED JSON_DEPRECATED_FOR(json_gobject_from_data) GObject * json_construct_gobject (GType gtype, const gchar *data, @@ -176,8 +175,6 @@ GObject * json_construct_gobject (GType gtype, JSON_DEPRECATED_FOR(json_gobject_to_data) gchar * json_serialize_gobject (GObject *gobject, gsize *length) G_GNUC_MALLOC; -#endif /* JSON_DISABLE_DEPRECATED */ - G_END_DECLS diff --git a/json-glib/json-types.h b/json-glib/json-types.h index 709faf5..db9571e 100644 --- a/json-glib/json-types.h +++ b/json-glib/json-types.h @@ -233,12 +233,10 @@ JsonObject * json_object_new (void); JsonObject * json_object_ref (JsonObject *object); void json_object_unref (JsonObject *object); -#ifndef JSON_DISABLE_DEPRECATED JSON_DEPRECATED_FOR(json_object_set_member) void json_object_add_member (JsonObject *object, const gchar *member_name, JsonNode *node); -#endif void json_object_set_member (JsonObject *object, const gchar *member_name, |