gtk2 1.2.0-x86-mingw32 → 1.2.1-x86-mingw32

data/ext/gtk2/rbgtkliststore.c

@@ -73,7 +73,6 @@ rg_set_value(VALUE self, VALUE iter, VALUE column, VALUE value)
 
     rbgobj_rvalue_to_gvalue(value, &gval);
 
-    G_CHILD_ADD(self, iter);
     G_CHILD_ADD(iter, value);
 
     gtk_list_store_set_value(_SELF(self), RVAL2GTKTREEITER(iter), NUM2INT(column), &gval);
@@ -157,8 +156,6 @@ rg_set_values(VALUE self, VALUE iter, VALUE values)
     g_values = ALLOCA_N(GValue, length);
     MEMZERO(g_values, GValue, length);
 
-    G_CHILD_ADD(self, iter);
-
     store = _SELF(self);
     model = GTK_TREE_MODEL(store);
     if (RVAL2CBOOL(rb_obj_is_kind_of(values, rb_cHash))) {
@@ -288,8 +285,6 @@ rg_insert(int argc, VALUE *argv, VALUE self)
 
     result = GTKTREEITER2RVAL(&args.iter);
 
-    G_CHILD_ADD(self, result);
-
     return result;
 }
 
@@ -303,7 +298,6 @@ rg_insert_before(VALUE self, VALUE sibling)
     iter.user_data3 = model;
 
     ret = GTKTREEITER2RVAL(&iter);
-    G_CHILD_ADD(self, ret);
     return ret;
 }
 
@@ -317,7 +311,6 @@ rg_insert_after(VALUE self, VALUE sibling)
     iter.user_data3 = model;
 
     ret = GTKTREEITER2RVAL(&iter);
-    G_CHILD_ADD(self, ret);
     return ret;
 }
 
@@ -331,7 +324,6 @@ rg_prepend(VALUE self)
     iter.user_data3 = model;
 
     ret = GTKTREEITER2RVAL(&iter);
-    G_CHILD_ADD(self, ret);
     return ret;
 }
 
@@ -345,7 +337,6 @@ rg_append(VALUE self)
     iter.user_data3 = model;
 
     ret = GTKTREEITER2RVAL(&iter);
-    G_CHILD_ADD(self, ret);
     return ret;
 }
 

data/ext/gtk2/rbgtktreemodel.c

@@ -54,7 +54,6 @@ rg_iter_first(VALUE self)
 
     if (ret) {
         val = GTKTREEITER2RVAL(&iter);
-        G_CHILD_ADD(self, val);
     }
 
     return val;
@@ -71,7 +70,6 @@ rg_iter_root(VALUE self)
 
     if (ret) {
         val = GTKTREEITER2RVAL(&iter);
-        G_CHILD_ADD(self, val);
     }
 
     return val;
@@ -85,7 +83,6 @@ rg_iter_next(VALUE self, VALUE iter)
 
     if (ret) {
         val = GTKTREEITER2RVAL(&iter);
-        G_CHILD_ADD(self, val);
     }
 
     return val;
@@ -110,7 +107,6 @@ rg_get_iter(VALUE self, VALUE path)
 
     if (ret) {
         val = GTKTREEITER2RVAL(&iter);
-        G_CHILD_ADD(self, val);
     }
 
     return val;

data/test/test_gtk_list_store.rb

@@ -62,4 +62,31 @@ class TestGtkListStore < Test::Unit::TestCase
     end
     assert_equal([2, 'she'], [iter[ID], iter[NAME]])
   end
+
+  def test_iter_gc
+    n_iterators = count_objects(Gtk::TreeIter)
+    50.times do |i|
+      iter = @store.append
+      iter[ID] = i
+      iter[NAME] = i.to_s
+    end
+    100.times do
+      @store.iter_first
+    end
+    iter = @store.iter_first
+    while @store.remove(iter); end
+    iter = nil
+    assert_equal(0, @store.to_enum(:each).to_a.size)
+    GC.start
+    assert_equal(n_iterators, count_objects(Gtk::TreeIter))
+  end
+
+  private
+  def count_objects(klass)
+    n_objects = ObjectSpace.each_object(Gtk::TreeIter) do
+      # do nothing
+    end
+    n_objects
+  end
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gtk2
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: x86-mingw32
 authors: 
 - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-24 00:00:00 Z
+date: 2013-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: atk
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id003
 description: Ruby/GTK2 is a Ruby binding of GTK+-2.x.