gtk2 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8766d633f9cf8ae10270d80c39614435d47731e8
-  data.tar.gz: 85951de288b05a4fddaea6bad2b7661d3e576a2b
+  metadata.gz: 1bbad66db4dc62467dffc4b796ecc313c4a8d67e
+  data.tar.gz: 7eaebb9d25f79263729263ca4790f8a0eba435f6
 SHA512:
-  metadata.gz: a27385913d6caff16a69ad965126fcdff8e327ab3543a104abea1451653986cf1a1c0856b2b5fe42d65c39c184e82ad630426847464d6c0a425cea87eb9a5923
-  data.tar.gz: 57e13eedfa987015b4a18ee9db104e585da58b7b4aea1e1976044e75450c02591eaa5daa6cc54ca309f85d059cd6101d50882acb934a31e764707d4d6a678e61
+  metadata.gz: 2314f7bad7851a9f647e687e8419f195ff6e0a8724383e82a467d9e783e0304b4cb9182c6eb69f311ae3285c2ec1b32f1e515c483b2d2e89fc9ce99987bbaeda
+  data.tar.gz: 54e8d50f59d5d19fc8c63abcc78a3b1572a3d4c671015c5f63fb0051c91eb85a895f9f816256078e030baa15be37d12e36a2ecb7575efb38e0a087480bb35890

data/ext/gtk2/rbgdkproperty.c

@@ -245,12 +245,12 @@ rg_m_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
          ret = rb_ary_new();
 
          if(rtype != GDK_SELECTION_TYPE_ATOM){
-           for(j = 0; j < (rlen/sizeof(unsigned long)); j++){
-             rb_ary_push(ret, INT2FIX(((unsigned long*)rdat)[j]));
+           for(j = 0; j < (rlen/sizeof(glong)); j++){
+             rb_ary_push(ret, INT2FIX(((glong*)rdat)[j]));
            }
          } else {
-           for(j = 0; j < (rlen/sizeof(unsigned long)); j++){
-             rb_ary_push(ret, BOXED2RVAL((GdkAtom)((unsigned long*)rdat)[j], GDK_TYPE_ATOM));
+           for(j = 0; j < (rlen/sizeof(glong)); j++){
+             rb_ary_push(ret, BOXED2RVAL((GdkAtom)((glong*)rdat)[j], GDK_TYPE_ATOM));
            }
          }
         break;

data/ext/gtk2/rbgtk.c

@@ -208,10 +208,27 @@ gtk_init()
 gtk_exit()
 */
 
+static gboolean
+quit_loop(G_GNUC_UNUSED gpointer user_data)
+{
+    gtk_main_quit();
+    return G_SOURCE_REMOVE;
+}
+
 static VALUE
 rg_m_main(G_GNUC_UNUSED VALUE self)
 {
+    GSource *interrupt_source;
+
+    interrupt_source = rbg_interrupt_source_new();
+    g_source_set_callback(interrupt_source, quit_loop, NULL, NULL);
+    g_source_attach(interrupt_source, NULL);
     gtk_main();
+    g_source_destroy(interrupt_source);
+    g_source_unref(interrupt_source);
+
+    rb_thread_check_ints();
+
     return Qnil;
 }
 

data/ext/gtk2/rbgtkdialog.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
  *                          Hiroshi Igarashi
@@ -126,15 +125,35 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
+static gboolean
+destroy_dialog(gpointer user_data)
+{
+    GtkWidget *dialog = user_data;
+    gtk_widget_destroy(dialog);
+    return G_SOURCE_REMOVE;
+}
+
 static VALUE
 rg_run(VALUE self)
 {
-    if (rb_block_given_p()){
-        VALUE ret = INT2NUM(gtk_dialog_run(_SELF(self)));
-        rb_yield(ret);
-        return ret;
+    GtkDialog *dialog;
+    GSource *interrupt_source;
+    VALUE response;
+
+    dialog = _SELF(self);
+    interrupt_source = rbg_interrupt_source_new();
+    g_source_set_callback(interrupt_source, destroy_dialog, dialog, NULL);
+    g_source_attach(interrupt_source, NULL);
+    response = INT2NUM(gtk_dialog_run(dialog));
+    g_source_destroy(interrupt_source);
+    g_source_unref(interrupt_source);
+
+    rb_thread_check_ints();
+
+    if (rb_block_given_p()) {
+        return rb_yield(response);
     } else {
-        return INT2NUM(gtk_dialog_run(_SELF(self)));
+        return response;
     }
 }
 

data/ext/gtk2/rbgtkselectiondata.c

@@ -36,20 +36,19 @@ rbgtk_atom2selectiondata(VALUE type, VALUE size, VALUE src, GdkAtom *gtype,
     GdkAtom ntype = RVAL2ATOM(type);
 
     if(ntype == GDK_SELECTION_TYPE_INTEGER){
-        int *i;
-        i = ALLOC(int);
+        glong *i;
+        i = ALLOC(glong);
         *i = NUM2INT(src);
         dat = i;
-        fmt = sizeof(int) * 8;
+        fmt = 32;
         len = 1;
     } else if(ntype == GDK_SELECTION_TYPE_STRING) {
         dat = (void *)RVAL2CSTR(src);
+        fmt = 8;
         if (NIL_P(size)) {
-            fmt = sizeof(char) * 8;
             len = RSTRING_LEN(src);
         } else {
             len = NUM2UINT(size);
-            fmt = (RSTRING_LEN(src) / len) * 8;
         }
     } else if(ntype == compound_text){
         guchar* str = (guchar*)dat;

data/test/test_gdk_pixbuf.rb

@@ -0,0 +1,34 @@
+# Copyright (C) 2014  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestGdkPixbuf < Test::Unit::TestCase
+  def test_from_drawable
+    colormap = nil
+    gdk_window = Gdk::Window.default_root_window
+    src_x = 0
+    src_y = 0
+    width, height = gdk_window.size
+
+    assert_nothing_raised do
+      Gdk::Pixbuf.from_drawable(colormap,
+                                gdk_window,
+                                src_x,
+                                src_y,
+                                width,
+                                height)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atk
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 description: Ruby/GTK2 is a Ruby binding of GTK+-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -61,9 +61,6 @@ extra_rdoc_files: []
 files:
 - README
 - Rakefile
-- extconf.rb
-- lib/gtk2.rb
-- lib/gtk2/base.rb
 - ext/gtk2/depend
 - ext/gtk2/extconf.rb
 - ext/gtk2/global.h
@@ -315,6 +312,9 @@ files:
 - ext/gtk2/rbgtkwidget.c
 - ext/gtk2/rbgtkwindow.c
 - ext/gtk2/rbgtkwindowgroup.c
+- extconf.rb
+- lib/gtk2.rb
+- lib/gtk2/base.rb
 - sample/gtk-demo/README
 - sample/gtk-demo/alphatest.png
 - sample/gtk-demo/apple-red.png
@@ -509,6 +509,7 @@ files:
 - test/test_gdk_geometry.rb
 - test/test_gdk_keymap.rb
 - test/test_gdk_pango.rb
+- test/test_gdk_pixbuf.rb
 - test/test_gdk_rectangle.rb
 - test/test_gdk_selection_data.rb
 - test/test_gdk_window.rb
@@ -542,17 +543,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby/GTK2 is a Ruby binding of GTK+-2.x.