ext/glib2/rbglib_maincontext.c in glib2-3.3.8 vs ext/glib2/rbglib_maincontext.c in glib2-3.3.9

@@ -267,11 +267,11 @@
     struct mc_query_body_args *args = (struct mc_query_body_args *)value;
     gint i;
     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);
 }
 
 static VALUE
@@ -330,11 +330,11 @@
     ret = g_main_context_check(_SELF(self), NUM2INT(max_priority),
                                fds, n_fds);
     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;
 }
 */
@@ -351,11 +351,11 @@
 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_)));
 }
 
 static VALUE
 rg_set_poll_func(VALUE self)
@@ -372,18 +372,18 @@
 */
 
 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;
 }
 
 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;
 }
 
 #ifdef HAVE_G_MAIN_DEPTH
 static VALUE