gio2 1.1.3 → 1.1.4

data/ext/gio2/rbgiosocket.c

@@ -24,6 +24,8 @@
 #define RG_TARGET_NAMESPACE cSocket
 #define _SELF(value) RVAL2GSOCKET(value)
 
+static ID id_call;
+
 static VALUE
 rg_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -261,16 +263,32 @@ rg_connected_p(VALUE self)
         return (g_socket_is_connected(_SELF(self)));
 }
 
+static gboolean
+source_func(GSocket *socket, GIOCondition condition, gpointer user_data)
+{
+        VALUE callback = GPOINTER_TO_UINT(user_data);
+        return RVAL2CBOOL(rb_funcall(callback, id_call, 2,
+                                     GOBJ2RVAL(socket),
+                                     GIOCONDITION2RVAL(condition)));
+}
+
 static VALUE
 rg_create_source(int argc, VALUE *argv, VALUE self)
 {
-        VALUE condition, cancellable;
-
-        rb_scan_args(argc, argv, "11", &condition, &cancellable);
-
-        return GOBJ2RVAL_UNREF(g_socket_create_source(_SELF(self),
-                                                      RVAL2GIOCONDITION(condition),
-                                                      RVAL2GCANCELLABLE(cancellable)));
+        VALUE condition, cancellable, callback;
+        GSource *source;
+
+        rb_scan_args(argc, argv, "11&", &condition, &cancellable, &callback);
+
+        source = g_socket_create_source(_SELF(self),
+                                        RVAL2GIOCONDITION(condition),
+                                        RVAL2GCANCELLABLE(cancellable));
+        G_RELATIVE(self, callback);
+        g_source_set_callback(source,
+                              (GSourceFunc)source_func,
+                              GUINT_TO_POINTER(callback),
+                              NULL);
+        return GSOURCE2RVAL(source);
 }
 
 static VALUE
@@ -333,6 +351,8 @@ Init_gsocket(VALUE mGio)
 {
         VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_SOCKET, "Socket", mGio);
 
+        id_call = rb_intern("call");
+
         G_DEF_CLASS(G_TYPE_SOCKET_FAMILY, "Family", RG_TARGET_NAMESPACE);
         G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, G_TYPE_SOCKET_FAMILY, "G_SOCKET_");
 
@@ -357,7 +377,7 @@ Init_gsocket(VALUE mGio)
         RG_DEF_METHOD(receive_from, -1);
         RG_DEF_METHOD(send, -1);
         RG_DEF_METHOD(send_to, -1);
-        RG_DEF_METHOD(close, -1);
+        RG_DEF_METHOD(close, 0);
         RG_DEF_METHOD_P(closed, 0);
         RG_DEF_METHOD(shutdown, 2);
         RG_DEF_METHOD_P(connected, 0);

data/ext/gio2/rbgiosocketclient.c

@@ -109,7 +109,7 @@ rg_connect_to_host(int argc, VALUE *argv, VALUE self)
         if (connection == NULL)
                 rbgio_raise_error(error);
 
-        return self;
+        return GOBJ2RVAL_UNREF(connection);
 }
 
 static VALUE
@@ -157,7 +157,7 @@ rg_connect_to_service(int argc, VALUE *argv, VALUE self)
         if (connection == NULL)
                 rbgio_raise_error(error);
 
-        return self;
+        return GOBJ2RVAL_UNREF(connection);
 }
 
 static VALUE

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gio2
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-08 00:00:00 Z
+date: 2012-07-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: glib2
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 27
         segments: 
         - 1
         - 1
-        - 3
-        version: 1.1.3
+        - 4
+        version: 1.1.4
   type: :runtime
   version_requirements: *id001
 description: Ruby/GIO2 is a Ruby binding of gio-2.x.
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby/GIO2 is a Ruby binding of gio-2.x.