mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-26 14:06:15 +01:00
girepository: Remove redundant GLib version checks
Now that libgirepository is inside glib.git, it’s guaranteed access to all the latest APIs, so there’s no need for version checks. Signed-off-by: Philip Withnall <pwithnall@gnome.org> Helps: #3155
This commit is contained in:
parent
b32da06a7c
commit
7b029e564d
@ -269,10 +269,8 @@ dump_signals (GType type, GOutputStream *out)
|
|||||||
escaped_printf (out, " when=\"last\"");
|
escaped_printf (out, " when=\"last\"");
|
||||||
else if (query.signal_flags & G_SIGNAL_RUN_CLEANUP)
|
else if (query.signal_flags & G_SIGNAL_RUN_CLEANUP)
|
||||||
escaped_printf (out, " when=\"cleanup\"");
|
escaped_printf (out, " when=\"cleanup\"");
|
||||||
#if GLIB_CHECK_VERSION(2, 29, 15)
|
|
||||||
else if (query.signal_flags & G_SIGNAL_MUST_COLLECT)
|
else if (query.signal_flags & G_SIGNAL_MUST_COLLECT)
|
||||||
escaped_printf (out, " when=\"must-collect\"");
|
escaped_printf (out, " when=\"must-collect\"");
|
||||||
#endif
|
|
||||||
if (query.signal_flags & G_SIGNAL_NO_RECURSE)
|
if (query.signal_flags & G_SIGNAL_NO_RECURSE)
|
||||||
escaped_printf (out, " no-recurse=\"1\"");
|
escaped_printf (out, " no-recurse=\"1\"");
|
||||||
|
|
||||||
@ -332,10 +330,8 @@ dump_object_type (GType type, const char *symbol, GOutputStream *out)
|
|||||||
if (G_TYPE_IS_ABSTRACT (type))
|
if (G_TYPE_IS_ABSTRACT (type))
|
||||||
escaped_printf (out, " abstract=\"1\"");
|
escaped_printf (out, " abstract=\"1\"");
|
||||||
|
|
||||||
#if GLIB_CHECK_VERSION (2, 70, 0)
|
|
||||||
if (G_TYPE_IS_FINAL (type))
|
if (G_TYPE_IS_FINAL (type))
|
||||||
escaped_printf (out, " final=\"1\"");
|
escaped_printf (out, " final=\"1\"");
|
||||||
#endif
|
|
||||||
|
|
||||||
goutput_write (out, ">\n");
|
goutput_write (out, ">\n");
|
||||||
|
|
||||||
@ -450,10 +446,8 @@ dump_fundamental_type (GType type, const char *symbol, GOutputStream *out)
|
|||||||
if (G_TYPE_IS_ABSTRACT (type))
|
if (G_TYPE_IS_ABSTRACT (type))
|
||||||
escaped_printf (out, " abstract=\"1\"");
|
escaped_printf (out, " abstract=\"1\"");
|
||||||
|
|
||||||
#if GLIB_CHECK_VERSION (2, 70, 0)
|
|
||||||
if (G_TYPE_IS_FINAL (type))
|
if (G_TYPE_IS_FINAL (type))
|
||||||
escaped_printf (out, " final=\"1\"");
|
escaped_printf (out, " final=\"1\"");
|
||||||
#endif
|
|
||||||
|
|
||||||
if (G_TYPE_IS_INSTANTIATABLE (type))
|
if (G_TYPE_IS_INSTANTIATABLE (type))
|
||||||
escaped_printf (out, " instantiatable=\"1\"");
|
escaped_printf (out, " instantiatable=\"1\"");
|
||||||
|
@ -126,13 +126,9 @@ gi_constant_info_get_value (GIConstantInfo *info,
|
|||||||
{
|
{
|
||||||
if (blob->type.flags.pointer)
|
if (blob->type.flags.pointer)
|
||||||
{
|
{
|
||||||
#if GLIB_CHECK_VERSION (2, 67, 5)
|
|
||||||
gsize blob_size = blob->size;
|
gsize blob_size = blob->size;
|
||||||
|
|
||||||
value->v_pointer = g_memdup2 (&rinfo->typelib->data[blob->offset], blob_size);
|
value->v_pointer = g_memdup2 (&rinfo->typelib->data[blob->offset], blob_size);
|
||||||
#else
|
|
||||||
value->v_pointer = g_memdup (&rinfo->typelib->data[blob->offset], blob->size);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user