gtk2 1.1.4 → 1.1.5

data/Rakefile

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 
-require './../glib2/lib/gnome2-raketask'
+$LOAD_PATH.unshift("./../glib2/lib")
+require 'gnome2-raketask'
 
 package = GNOME2Package.new do |_package|
   _package.summary = "Ruby/GTK2 is a Ruby binding of GTK+-2.x."

data/ext/gtk2/rbgtk.c

@@ -514,6 +514,42 @@ rg_m_check_version_p(G_GNUC_UNUSED VALUE self, VALUE major, VALUE minor, VALUE m
     return CBOOL2RVAL(ret == NULL);
 }
 
+#if GTK_CHECK_VERSION(2,14,0)
+static VALUE
+rg_m_show_uri(G_GNUC_UNUSED VALUE self, VALUE rb_uri_or_options)
+{
+    VALUE rb_screen = Qnil;
+    VALUE rb_uri = Qnil;
+    VALUE rb_timestamp = Qnil;
+    GdkScreen *screen = NULL;
+    const gchar *uri = NULL;
+    guint32 timestamp = GDK_CURRENT_TIME;
+    GError *error = NULL;
+
+    if (TYPE(rb_uri_or_options) == T_HASH) {
+        rbg_scan_options(rb_uri_or_options,
+                         "screen", &rb_screen,
+                         "uri", &rb_uri,
+                         "timestamp", &rb_timestamp,
+                         NULL);
+    } else {
+        rb_uri = rb_uri_or_options;
+    }
+
+    screen = RVAL2GOBJ(rb_screen);
+    uri = StringValueCStr(rb_uri);
+    if (!NIL_P(rb_timestamp)) {
+        timestamp = NUM2UINT(rb_timestamp);
+    }
+
+    if (!gtk_show_uri(screen, uri, timestamp, &error)) {
+        RAISE_GERROR(error);
+    }
+
+    return self;
+}
+#endif
+
 /*
  * Init
  */
@@ -567,5 +603,9 @@ Init_gtk_gtk(void)
     RG_DEF_MODFUNC(check_version, 3);
     RG_DEF_MODFUNC_P(check_version, 3);
 
+#if GTK_CHECK_VERSION(2,14,0)
+    RG_DEF_MODFUNC(show_uri, 1);
+#endif
+
     rb_define_const(RG_TARGET_NAMESPACE, "PRIORITY_RESIZE", INT2FIX(GTK_PRIORITY_RESIZE));
 }

data/ext/gtk2/rbgtktreestore.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2012  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2006 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -306,16 +306,17 @@ rg_reorder(VALUE self, VALUE rbparent, VALUE rbnew_order)
 {
     GtkTreeStore *store = _SELF(self);
     GtkTreeIter *parent = RVAL2GTKTREEITER(rbparent);
-    gint columns = gtk_tree_model_get_n_columns(GTK_TREE_MODEL(store));
+    gint n_children = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store),
+                                                     parent);
     long n;
     gint *new_order = RVAL2GINTS(rbnew_order, n);
 
-    if (n != columns) {
+    if (n != n_children) {
         g_free(new_order);
 
         rb_raise(rb_eArgError,
-                 "new order array must contain same number of elements as the number of columns in the store: %ld != %d",
-                 n, columns);
+                 "new order array must contain the same number of elements as the number of children in the parent: %ld != %d",
+                 n, n_children);
     }
 
     gtk_tree_store_reorder(store, parent, new_order);

metadata

@@ -1,79 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gtk2
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.1.5
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 4
-  version: 1.1.4
 platform: ruby
-authors: 
+authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: atk
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
-        version: 1.1.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pango
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
-        version: 1.1.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+- !ruby/object:Gem::Dependency
+  name: pango
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: gdk_pixbuf2
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
-        version: 1.1.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+- !ruby/object:Gem::Dependency
+  name: gdk_pixbuf2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 description: Ruby/GTK2 is a Ruby binding of GTK+-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
-
-extensions: 
+extensions:
 - ext/gtk2/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - Rakefile
 - extconf.rb
@@ -540,38 +532,26 @@ files:
 - test/test_gdk.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 61
-      segments: 
-      - 1
-      - 8
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.5
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby/GTK2 is a Ruby binding of GTK+-2.x.
 test_files: []
-