glib2 3.3.8 → 3.3.9

data/ext/glib2/rbglib_maincontext.c

@@ -269,7 +269,7 @@ mc_query_body(VALUE value)
     VALUE ary = rb_ary_new();
 
     for (i = 0; i < args->n_fds; i++)
-        rb_ary_push(ary, BOXED2RVAL(&args->fds[i], G_TYPE_POLL_FD));
+        rb_ary_push(ary, GPOLLFD2RVAL(&args->fds[i]));
 
     return rb_assoc_new(INT2NUM(args->timeout_), ary);
 }
@@ -332,7 +332,7 @@ rg_check(VALUE self, VALUE max_priority)
     printf("ret = %d\n", ret);
     ary = rb_ary_new();
     for (i = 0; i < ret; i++)
-        rb_ary_push(ary, BOXED2RVAL(&fds[i], G_TYPE_POLL_FD));
+        rb_ary_push(ary, GPOLLFD2RVAL(&fds[i]));
 
     g_free(fds);    
     return ary;
@@ -353,7 +353,7 @@ poll_func(GPollFD *ufds, guint nfsd, gint timeout_)
     VALUE func = rb_ivar_get(self, id_poll_func);
     if (NIL_P(func)) return -1;
 
-    return INT2NUM(rb_funcall(func, 3, BOXED2RVAL(ufds, G_TYPE_POLL_FD),
+    return INT2NUM(rb_funcall(func, 3, GPOLLFD2RVAL(ufds),
                               UINT2NUM(nfsd), INT2NUM(timeout_)));
 }
 
@@ -374,7 +374,7 @@ GPollFunc   g_main_context_get_poll_func    (GMainContext *context);
 static VALUE
 rg_add_poll(VALUE self, VALUE fd, VALUE priority)
 {
-    g_main_context_add_poll(_SELF(self), RVAL2BOXED(fd, G_TYPE_POLL_FD),
+    g_main_context_add_poll(_SELF(self), RVAL2GPOLLFD(fd),
                             NUM2INT(priority));
     return self;
 }
@@ -382,7 +382,7 @@ rg_add_poll(VALUE self, VALUE fd, VALUE priority)
 static VALUE
 rg_remove_poll(VALUE self, VALUE fd)
 {
-    g_main_context_remove_poll(_SELF(self), RVAL2BOXED(fd, G_TYPE_POLL_FD));
+    g_main_context_remove_poll(_SELF(self), RVAL2GPOLLFD(fd));
     return self;
 }
 

data/ext/glib2/rbglib_messages.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
  *  Copyright (C) 2002-2005 Masao Mutoh
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
@@ -49,7 +49,11 @@ logmessage(GLogLevelFlags level)
 }
 
 static VALUE
-rbg_printerr(VALUE message, G_GNUC_UNUSED VALUE user_data)
+rbg_printerr(VALUE message,
+             G_GNUC_UNUSED VALUE user_data,
+             G_GNUC_UNUSED int argc,
+             G_GNUC_UNUSED const VALUE *argv,
+             G_GNUC_UNUSED VALUE block)
 {
     g_printerr("\tfrom %.*s\n",
                (int)RSTRING_LEN(message),

data/ext/glib2/rbglib_pollfd.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
  *  Copyright (C) 2005  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 
 #include "rbgprivate.h"
 
-/*****************************************/
+#if !GLIB_CHECK_VERSION(2, 36, 0)
 static GPollFD*
 pollfd_copy(const GPollFD* pollfd)
 {
@@ -34,7 +34,7 @@ pollfd_copy(const GPollFD* pollfd)
 }
 
 GType
-g_poll_fd_get_type(void)
+g_pollfd_get_type(void)
 {
   static GType our_type = 0;
   if (our_type == 0)
@@ -43,10 +43,10 @@ g_poll_fd_get_type(void)
                     (GBoxedFreeFunc)g_free);
   return our_type;
 }
-/*****************************************/
+#endif
 
 #define RG_TARGET_NAMESPACE cPollFD
-#define _SELF(s) ((GPollFD*)RVAL2BOXED(s, G_TYPE_POLL_FD))
+#define _SELF(s) ((GPollFD*)RVAL2BOXED(s, G_TYPE_POLLFD))
 
 static VALUE
 rg_initialize(VALUE self, VALUE fd, VALUE events, VALUE revents)
@@ -56,7 +56,7 @@ rg_initialize(VALUE self, VALUE fd, VALUE events, VALUE revents)
     gfd.events = NUM2INT(events);
     gfd.revents = NUM2INT(revents);
 
-    G_INITIALIZE(self, g_boxed_copy(G_TYPE_POLL_FD, &gfd));
+    G_INITIALIZE(self, g_boxed_copy(G_TYPE_POLLFD, &gfd));
     return Qnil;
 }
 
@@ -99,7 +99,7 @@ rg_revents(VALUE self)
 void
 Init_glib_poll_fd(void)
 {
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_POLL_FD, "PollFD", mGLib); 
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_POLLFD, "PollFD", mGLib);
 
     RG_DEF_METHOD(initialize, 3);
 

data/ext/glib2/rbglib_source.c

@@ -178,14 +178,14 @@ rg_set_ready_time(VALUE self, VALUE ready_time)
 static VALUE
 rg_add_poll(VALUE self, VALUE fd)
 {
-    g_source_add_poll(_SELF(self), RVAL2BOXED(fd, G_TYPE_POLL_FD));
+    g_source_add_poll(_SELF(self), RVAL2GPOLLFD(fd));
     return self;
 }
 
 static VALUE
 rg_remove_poll(VALUE self, VALUE fd)
 {
-    g_source_remove_poll(_SELF(self), RVAL2BOXED(fd, G_TYPE_POLL_FD));
+    g_source_remove_poll(_SELF(self), RVAL2GPOLLFD(fd));
     return self;
 }
 

data/ext/glib2/rbgobj_boxed.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -57,8 +57,6 @@ static const rb_data_type_t rg_glib_boxed_type = {
     {
         boxed_mark,
         boxed_free,
-        NULL,
-        {0},
     },
     NULL,
     NULL,

data/ext/glib2/rbgobj_enums.c

@@ -111,8 +111,6 @@ static const rb_data_type_t rg_glib_enum_type = {
     {
         NULL,
         enum_free,
-        NULL,
-        {0},
     },
     NULL,
     NULL,

data/ext/glib2/rbgobj_flags.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2004-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004-2019  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -80,8 +80,6 @@ static const rb_data_type_t rg_glib_flags_type = {
     {
         NULL,
         flags_free,
-        NULL,
-        {0},
     },
     NULL,
     NULL,
@@ -371,7 +369,8 @@ flags_compare_get_flags_body(VALUE user_data)
 }
 
 static VALUE
-flags_compare_get_flags_rescue(VALUE user_data)
+flags_compare_get_flags_rescue(VALUE user_data,
+                               G_GNUC_UNUSED VALUE error)
 {
     compare_data *data = (compare_data *)user_data;
 
@@ -467,7 +466,7 @@ rg_operator_flags_lt(VALUE self, VALUE rhs)
 }
 
 static VALUE
-rg_operator_flags_not(VALUE self, G_GNUC_UNUSED VALUE rhs)
+rg_operator_flags_not(VALUE self)
 {
     flags_holder* p = flags_get_holder(self);
     return rbgobj_make_flags((~ p->value) & p->gclass->mask,

data/ext/glib2/rbgobj_object.c

@@ -1,7 +1,7 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002-2004  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2002-2004  Ruby-GNOME Project Team
  *  Copyright (C) 2002-2003  Masahiro Sakai
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
@@ -31,6 +31,12 @@ VALUE RG_TARGET_NAMESPACE;
 static VALUE eNoPropertyError;
 static GQuark RUBY_GOBJECT_OBJ_KEY;
 
+gboolean
+rbg_is_object(VALUE object)
+{
+    return RVAL2CBOOL(rb_obj_is_kind_of(object, RG_TARGET_NAMESPACE));
+}
+
 /* deperecated */
 void
 rbgobj_add_abstract_but_create_instance_class(G_GNUC_UNUSED GType gtype)
@@ -100,8 +106,6 @@ static const rb_data_type_t rg_glib_object_type = {
     {
         holder_mark,
         holder_free,
-        NULL,
-        {0},
     },
     NULL,
     NULL,
@@ -317,8 +321,14 @@ struct param_setup_arg {
 };
 
 static VALUE
-_params_setup(VALUE arg, struct param_setup_arg *param_setup_arg)
+_params_setup(VALUE arg,
+              VALUE rb_param_setup_arg,
+              G_GNUC_UNUSED int argc,
+              G_GNUC_UNUSED const VALUE *argv,
+              G_GNUC_UNUSED VALUE block)
 {
+    struct param_setup_arg *param_setup_arg =
+        (struct param_setup_arg *)rb_param_setup_arg;
     guint index;
     VALUE name, val;
     GParamSpec* pspec;
@@ -352,16 +362,18 @@ _params_setup(VALUE arg, struct param_setup_arg *param_setup_arg)
 }
 
 static VALUE
-gobj_new_body(struct param_setup_arg* arg)
+gobj_new_body(VALUE rb_arg)
 {
+    struct param_setup_arg *arg = (struct param_setup_arg *)rb_arg;
     rb_iterate(rb_each, (VALUE)arg->params_hash, _params_setup, (VALUE)arg);
     return (VALUE)g_object_newv(G_TYPE_FROM_CLASS(arg->gclass),
                                 arg->param_size, arg->params);
 }
 
 static VALUE
-gobj_new_ensure(struct param_setup_arg* arg)
+gobj_new_ensure(VALUE rb_arg)
 {
+    struct param_setup_arg *arg = (struct param_setup_arg *)rb_arg;
     guint i;
     g_type_class_unref(arg->gclass);
     for (i = 0; i < arg->param_size; i++) {

data/ext/glib2/rbgobj_param.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -58,8 +58,6 @@ static const rb_data_type_t rg_glib_param_type = {
     {
         pspec_mark,
         pspec_free,
-        NULL,
-        {0},
     },
     NULL,
     NULL,
@@ -228,8 +226,9 @@ struct validate_arg{
 };
 
 static VALUE
-value_validate_body(struct validate_arg* arg)
+value_validate_body(VALUE rb_arg)
 {
+    struct validate_arg *arg = (struct validate_arg *)rb_arg;
     VALUE ret;
     gboolean b;
 
@@ -240,8 +239,9 @@ value_validate_body(struct validate_arg* arg)
 }
 
 static VALUE
-value_validate_ensure(struct validate_arg* arg)
+value_validate_ensure(VALUE rb_arg)
 {
+    struct validate_arg *arg = (struct validate_arg *)rb_arg;
     g_value_unset(arg->value);
     return Qnil;
 }
@@ -332,16 +332,22 @@ rg_ref_count(VALUE self)
     param_is_##flag(VALUE self) \
     { \
         GParamSpec* pspec = G_PARAM_SPEC(rbgobj_get_param_spec(self)); \
-        return CBOOL2RVAL(pspec->flags & flag); \
+        return CBOOL2RVAL((pspec->flags & flag) == flag); \
     }
 
 param_is_flag(G_PARAM_READABLE)
 param_is_flag(G_PARAM_WRITABLE)
+param_is_flag(G_PARAM_READWRITE)
 param_is_flag(G_PARAM_CONSTRUCT)
 param_is_flag(G_PARAM_CONSTRUCT_ONLY)
 param_is_flag(G_PARAM_LAX_VALIDATION)
-param_is_flag(G_PARAM_PRIVATE)
-param_is_flag(G_PARAM_READWRITE)
+param_is_flag(G_PARAM_STATIC_NAME)
+param_is_flag(G_PARAM_STATIC_NICK)
+param_is_flag(G_PARAM_STATIC_BLURB)
+#if GLIB_CHECK_VERSION(2, 42, 0)
+param_is_flag(G_PARAM_EXPLICIT_NOTIFY)
+#endif
+param_is_flag(G_PARAM_DEPRECATED)
 
 /**********************************************************************/
 
@@ -352,15 +358,34 @@ Init_gobject_gparam(void)
     RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_PARAM, "Param", mGLib);
 
     /* GParamFlags */
-    rb_define_const(RG_TARGET_NAMESPACE, "READABLE",       INT2FIX(G_PARAM_READABLE));
-    rb_define_const(RG_TARGET_NAMESPACE, "WRITABLE",       INT2FIX(G_PARAM_WRITABLE));
-    rb_define_const(RG_TARGET_NAMESPACE, "CONSTRUCT",      INT2FIX(G_PARAM_CONSTRUCT));
-    rb_define_const(RG_TARGET_NAMESPACE, "CONSTRUCT_ONLY", INT2FIX(G_PARAM_CONSTRUCT_ONLY));
-    rb_define_const(RG_TARGET_NAMESPACE, "LAX_VALIDATION", INT2FIX(G_PARAM_LAX_VALIDATION));
-    rb_define_const(RG_TARGET_NAMESPACE, "PRIVATE",        INT2FIX(G_PARAM_PRIVATE));
-    rb_define_const(RG_TARGET_NAMESPACE, "READWRITE",      INT2FIX(G_PARAM_READWRITE));
-    rb_define_const(RG_TARGET_NAMESPACE, "MASK",           INT2FIX(G_PARAM_MASK));
-    rb_define_const(RG_TARGET_NAMESPACE, "USER_SHIFT",     INT2FIX(G_PARAM_USER_SHIFT));
+    rb_define_const(RG_TARGET_NAMESPACE, "READABLE",
+                    INT2FIX(G_PARAM_READABLE));
+    rb_define_const(RG_TARGET_NAMESPACE, "WRITABLE",
+                    INT2FIX(G_PARAM_WRITABLE));
+    rb_define_const(RG_TARGET_NAMESPACE, "READWRITE",
+                    INT2FIX(G_PARAM_READWRITE));
+    rb_define_const(RG_TARGET_NAMESPACE, "CONSTRUCT",
+                    INT2FIX(G_PARAM_CONSTRUCT));
+    rb_define_const(RG_TARGET_NAMESPACE, "CONSTRUCT_ONLY",
+                    INT2FIX(G_PARAM_CONSTRUCT_ONLY));
+    rb_define_const(RG_TARGET_NAMESPACE, "LAX_VALIDATION",
+                    INT2FIX(G_PARAM_LAX_VALIDATION));
+    rb_define_const(RG_TARGET_NAMESPACE, "STATIC_NAME",
+                    INT2FIX(G_PARAM_STATIC_NAME));
+    rb_define_const(RG_TARGET_NAMESPACE, "STATIC_NICK",
+                    INT2FIX(G_PARAM_STATIC_NICK));
+    rb_define_const(RG_TARGET_NAMESPACE, "STATIC_BLURB",
+                    INT2FIX(G_PARAM_STATIC_BLURB));
+#if GLIB_CHECK_VERSION(2, 42, 0)
+    rb_define_const(RG_TARGET_NAMESPACE, "EXPLICIT_NOTIFY",
+                    INT2FIX(G_PARAM_EXPLICIT_NOTIFY));
+#endif
+    rb_define_const(RG_TARGET_NAMESPACE, "DEPRECATED",
+                    INT2FIX(G_PARAM_DEPRECATED));
+    rb_define_const(RG_TARGET_NAMESPACE, "MASK",
+                    INT2FIX(G_PARAM_MASK));
+    rb_define_const(RG_TARGET_NAMESPACE, "USER_SHIFT",
+                    INT2FIX(G_PARAM_USER_SHIFT));
 
     rb_define_alloc_func(RG_TARGET_NAMESPACE, pspec_s_allocate);
 
@@ -389,11 +414,28 @@ Init_gobject_gparam(void)
     /* for debugging */
     RG_DEF_METHOD(ref_count, 0);
 
-    rbg_define_method(RG_TARGET_NAMESPACE, "readable?",       param_is_G_PARAM_READABLE, 0);
-    rbg_define_method(RG_TARGET_NAMESPACE, "writable?",       param_is_G_PARAM_WRITABLE, 0);
-    rbg_define_method(RG_TARGET_NAMESPACE, "construct?",      param_is_G_PARAM_CONSTRUCT, 0);
-    rbg_define_method(RG_TARGET_NAMESPACE, "construct_only?", param_is_G_PARAM_CONSTRUCT_ONLY, 0);
-    rbg_define_method(RG_TARGET_NAMESPACE, "lax_validation?", param_is_G_PARAM_LAX_VALIDATION, 0);
-    rbg_define_method(RG_TARGET_NAMESPACE, "private?",        param_is_G_PARAM_PRIVATE, 0);
-    rbg_define_method(RG_TARGET_NAMESPACE, "readwrite?",      param_is_G_PARAM_READWRITE, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "readable?",
+                      param_is_G_PARAM_READABLE, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "writable?",
+                      param_is_G_PARAM_WRITABLE, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "readwrite?",
+                      param_is_G_PARAM_READWRITE, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "construct?",
+                      param_is_G_PARAM_CONSTRUCT, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "construct_only?",
+                      param_is_G_PARAM_CONSTRUCT_ONLY, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "lax_validation?",
+                      param_is_G_PARAM_LAX_VALIDATION, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "static_name?",
+                      param_is_G_PARAM_STATIC_NAME, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "static_nick?",
+                      param_is_G_PARAM_STATIC_NICK, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "static_blurb?",
+                      param_is_G_PARAM_STATIC_BLURB, 0);
+#if GLIB_CHECK_VERSION(2, 42, 0)
+    rbg_define_method(RG_TARGET_NAMESPACE, "explicit_notify?",
+                      param_is_G_PARAM_EXPLICIT_NOTIFY, 0);
+#endif
+    rbg_define_method(RG_TARGET_NAMESPACE, "deprecated?",
+                      param_is_G_PARAM_DEPRECATED, 0);
 }

data/ext/glib2/rbgobj_signal.c

@@ -1,7 +1,7 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011-2019  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002-2004  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2002-2004  Ruby-GNOME Project Team
  *  Copyright (C) 2002,2003  Masahiro Sakai
  *
  *  This library is free software; you can redistribute it and/or
@@ -36,8 +36,6 @@ static const rb_data_type_t rg_glib_signal_type = {
     {
         NULL,
         NULL,
-        NULL,
-        {0},
     },
     NULL,
     NULL,
@@ -158,11 +156,11 @@ rbg_rval2gtypes_body(VALUE value)
 }
 
 static G_GNUC_NORETURN VALUE
-rbg_rval2gtypes_rescue(VALUE value)
+rbg_rval2gtypes_rescue(VALUE value, VALUE error)
 {
     g_free(((struct rval2gtypes_args *)value)->result);
 
-    rb_exc_raise(rb_errinfo());
+    rb_exc_raise(error);
 }
 
 static GType *
@@ -446,8 +444,9 @@ struct emit_arg {
 };
 
 static VALUE
-emit_body(struct emit_arg* arg)
+emit_body(VALUE rb_arg)
 {
+    struct emit_arg *arg = (struct emit_arg *)rb_arg;
     GValue param = G_VALUE_INIT;
 
     g_value_init(&param, G_TYPE_FROM_INSTANCE(RVAL2GOBJ(arg->self)));
@@ -491,8 +490,9 @@ emit_body(struct emit_arg* arg)
 }
 
 static VALUE
-emit_ensure(struct emit_arg* arg)
+emit_ensure(VALUE rb_arg)
 {
+    struct emit_arg *arg = (struct emit_arg *)rb_arg;
     g_value_array_free(arg->instance_and_params);
     return Qnil;
 }
@@ -625,8 +625,9 @@ guint    g_signal_handlers_disconnect_matched (gpointer         instance,
 #endif
 
 static VALUE
-chain_from_overridden_body(struct emit_arg* arg)
+chain_from_overridden_body(VALUE rb_arg)
 {
+    struct emit_arg *arg = (struct emit_arg *)rb_arg;
     g_value_init(arg->instance_and_params->values,
                  G_TYPE_FROM_INSTANCE(RVAL2GOBJ(arg->self)));
     rbgobj_rvalue_to_gvalue(arg->self, arg->instance_and_params->values);