Merge 2.59.1 into tizen
authorAdrian Szyndela <adrian.s@samsung.com>
Fri, 17 Jan 2020 15:50:28 +0000 (16:50 +0100)
committerAdrian Szyndela <adrian.s@samsung.com>
Tue, 28 Jan 2020 12:25:48 +0000 (13:25 +0100)
Change-Id: I6fa78cd996ed65492067ba7d8dbdf6dd6e9f8fc0

1  2 
NEWS
docs/reference/glib/glib-sections.txt
gio/gdbusprivate.c
gio/gdbusprivate.h
gio/gdbusproxy.c
gio/gioenums.h
glib/gslice.c
glib/gtestutils.c
glib/gtestutils.h
glib/gvariant-parser.c

diff --cc NEWS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gio/gioenums.h
Simple merge
diff --cc glib/gslice.c
Simple merge
Simple merge
Simple merge
@@@ -1956,14 -1951,8 +1956,14 @@@ number_get_value (AST                 *
      case 'h':
        if (abs_val - negative > G_MAXINT32)
          return number_overflow (ast, type, error);
-       return g_variant_new_handle (negative ? -abs_val : abs_val);
+       return g_variant_new_handle (negative ? -((gint32) abs_val) : abs_val);
  
 +    case 'f':
 +      return g_variant_new_float (dbl_val);
 +
 +    case 'd':
 +      return g_variant_new_double (dbl_val);
 +
      default:
        return ast_type_error (ast, type, error);
      }