Merge branch '1.0'

Conflicts:
	configure.ac
	doc/conf.py

diff --combined configure.ac
index 783e264,44535ff..f7fe011
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.63])
- AC_INIT([jansson], [1.0+], [petri@digip.org])
 -AC_INIT([jansson], [1.0.1], [petri@digip.org])
++AC_INIT([jansson], [1.0.1+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  

diff --combined doc/conf.py
index 7629a03,0aaee33..bd88c6b
--- 1/doc/conf.py
--- 2/doc/conf.py
+++ b/doc/conf.py
@@@ -52,7 -52,7 +52,7 @@@ copyright = u'2009, Petri Lehtinen
  # The short X.Y version.
  version = '1.0'
  # The full version, including alpha/beta/rc tags.
- release = '1.0+'
 -release = '1.0.1'
++release = '1.0.1+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.

diff --combined src/Makefile.am
index 7446fc8,e6264d5..50b1e69
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -13,6 -13,6 +13,6 @@@ libjansson_la_SOURCES = 
        utf.h \
        util.h \
        value.c
- libjansson_la_LDFLAGS = -version-info 0:0:0
+ libjansson_la_LDFLAGS = -version-info 0:1:0
  
 -AM_CFLAGS = -Wall -Wextra -Werror -std=c99
 +AM_CFLAGS = -Wall -Wextra -Werror

diff --combined src/jansson.h
index 09af7bf,02b20f5..3aa10de
--- 1/src/jansson.h
--- 2/src/jansson.h
+++ b/src/jansson.h
@@@ -38,7 -38,7 +38,7 @@@ typedef struct 
  #define json_is_number(json)   (json_is_integer(json) || json_is_real(json))
  #define json_is_true(json)     (json && json_typeof(json) == JSON_TRUE)
  #define json_is_false(json)    (json && json_typeof(json) == JSON_FALSE)
- #define json_is_boolean(json)  (jsin_is_true(json) || json_is_false(json))
+ #define json_is_boolean(json)  (json_is_true(json) || json_is_false(json))
  #define json_is_null(json)     (json && json_typeof(json) == JSON_NULL)
  
  /* construction, destruction, reference counting */
@@@ -72,36 -72,17 +72,36 @@@ static inline void json_decref(json_t *
  /* getters, setters, manipulation */
  
  json_t *json_object_get(const json_t *object, const char *key);
 -int json_object_set(json_t *object, const char *key, json_t *value);
 +int json_object_set_new(json_t *object, const char *key, json_t *value);
  int json_object_del(json_t *object, const char *key);
  void *json_object_iter(json_t *object);
  void *json_object_iter_next(json_t *object, void *iter);
  const char *json_object_iter_key(void *iter);
  json_t *json_object_iter_value(void *iter);
  
 +static inline
 +int json_object_set(json_t *object, const char *key, json_t *value)
 +{
 +    return json_object_set_new(object, key, json_incref(value));
 +}
 +
  unsigned int json_array_size(const json_t *array);
  json_t *json_array_get(const json_t *array, unsigned int index);
 -int json_array_set(json_t *array, unsigned int index, json_t *value);
 -int json_array_append(json_t *array, json_t *value);
 +int json_array_set_new(json_t *array, unsigned int index, json_t *value);
 +int json_array_append_new(json_t *array, json_t *value);
 +
 +static inline
 +int json_array_set(json_t *array, unsigned int index, json_t *value)
 +{
 +    return json_array_set_new(array, index, json_incref(value));
 +}
 +
 +static inline
 +int json_array_append(json_t *array, json_t *value)
 +{
 +    return json_array_append_new(array, json_incref(value));
 +}
 +
  
  const char *json_string_value(const json_t *json);
  int json_integer_value(const json_t *json);