8228368: avoid incompatible pointer to integer conversion initializing gint in gtk2_interface
Reviewed-by: prr
This commit is contained in:
parent
39b7b5bbf9
commit
781b790f18
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -2451,14 +2451,14 @@ static jobject get_string_property(JNIEnv *env, GtkSettings* settings, const gch
|
|||||||
|
|
||||||
static jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
|
static jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
|
||||||
{
|
{
|
||||||
gint intval = NULL;
|
gint intval = 0;
|
||||||
(*fp_g_object_get)(settings, key, &intval, NULL);
|
(*fp_g_object_get)(settings, key, &intval, NULL);
|
||||||
return create_Integer(env, intval);
|
return create_Integer(env, intval);
|
||||||
}
|
}
|
||||||
|
|
||||||
static jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
|
static jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
|
||||||
{
|
{
|
||||||
gint intval = NULL;
|
gint intval = 0;
|
||||||
(*fp_g_object_get)(settings, key, &intval, NULL);
|
(*fp_g_object_get)(settings, key, &intval, NULL);
|
||||||
return create_Boolean(env, intval);
|
return create_Boolean(env, intval);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user