gtk3 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 008001edd9893b2eb3f2fd9e4560107ab9580b29
+  data.tar.gz: 6c1603cd67b6d32fafb039ffd303a3d4304dfd80
+SHA512:
+  metadata.gz: 2af2b63fc528e416299d78f2d0784d52911a8da25364df68213aa0f6f00ae409a0c5bc8e32230a90d98d837b4b3f5a30f8d796dd41df55b61045a1258f7ab9bf
+  data.tar.gz: 34f398f7001a7489697320fc2ba78027caf8915cb9fc857571ca135fcaec516bcee0702778c7898247a220d9106e43a5fb251c61629bd92c20d7b08b633d5632

data/Rakefile

@@ -16,6 +16,5 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   ]
   package.windows.packages = []
   package.windows.dependencies = []
-  package.required_ruby_version = ">= 1.9.2"
 end
 package_task.define

data/ext/gtk3/extconf.rb

@@ -54,7 +54,10 @@ rcairo_source_dir_names.each do |rcairo_source_dir_name|
     break
   end
 end
-check_cairo(rcairo_options)
+
+unless check_cairo(rcairo_options)
+  exit(false)
+end
 
 setup_win32(module_name, base_dir)
 

data/ext/gtk3/rbgtk-action-group.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004-2006 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -325,6 +325,7 @@ rbg_rval2gtkradioactionentries_body(VALUE value)
             args->result[i].stock_id = RVAL2CSTR_ACCEPT_SYMBOL_ACCEPT_NIL(RARRAY_PTR(entry)[1]);
         case 1:
             args->result[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
+            break;
         default:
             rb_raise(rb_eArgError, "entry does not contain right number of entries %ld (1..6)", n);
         }

data/ext/gtk3/rbgtk-binding-set.c

@@ -126,15 +126,6 @@ rg_add_signal(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static VALUE
-rg_add_path(VALUE self, VALUE path_type, VALUE path_pattern, VALUE priority)
-{
-    gtk_binding_set_add_path(_SELF(self), RVAL2GTKPATHTYPE(path_type),
-                             RVAL2CSTR(path_pattern),
-                             RVAL2GTKPATHPRIORITYTYPE(priority));
-    return self;
-}
-
 static VALUE
 rg_entry_remove(VALUE self, VALUE keyval, VALUE modifiers)
 {
@@ -158,7 +149,6 @@ Init_gtk_bindings(VALUE mGtk)
     RG_DEF_METHOD(activate, 3);
     RG_DEF_METHOD(add_signal, -1);
     RG_DEF_ALIAS("entry_add_signal", "add_signal");
-    RG_DEF_METHOD(add_path, 3);
     RG_DEF_METHOD(entry_remove, 2);
     RG_DEF_METHOD(entry_skip, 2);
 }

data/ext/gtk3/rbgtk-cell-renderer.c

@@ -25,14 +25,17 @@
 #define _SELF(s) (RVAL2GTKCELLRENDERER(s))
 
 static VALUE
-rg_get_size(VALUE self, VALUE widget, VALUE cell_area)
+rg_get_preferred_size(VALUE self, VALUE widget)
 {
-    GdkRectangle ret;
+    GtkRequisition minimum_size, natural_size;
 
-    gtk_cell_renderer_get_size(_SELF(self), RVAL2GTKWIDGET(widget),
-                               RVAL2GDKRECTANGLE(cell_area),
-                               &ret.x, &ret.y, &ret.width, &ret.height);
-    return GDKRECTANGLE2RVAL(&ret);
+    gtk_cell_renderer_get_preferred_size(_SELF(self),
+                                         RVAL2GTKWIDGET(widget),
+                                         &minimum_size, &natural_size);
+
+    return rb_ary_new3(2,
+                       GTKREQUISITION2RVAL(&minimum_size),
+                       GTKREQUISITION2RVAL(&natural_size));
 }
 
 /* TODO
@@ -101,7 +104,7 @@ Init_gtk_cellrenderer(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER, "CellRenderer", mGtk);
 
-    RG_DEF_METHOD(get_size, 2);
+    RG_DEF_METHOD(get_preferred_size, 1);
 /* TODO
     RG_DEF_METHOD(render, 6);
 */

data/ext/gtk3/rbgtk-cell-view.c

@@ -75,19 +75,6 @@ rg_displayed_row(VALUE self)
     return GTKTREEPATH2RVAL(gtk_cell_view_get_displayed_row(_SELF(self)));
 }
 
-static VALUE
-rg_get_size_of_row(VALUE self, VALUE path)
-{
-    GtkRequisition req;
-    gboolean ret = gtk_cell_view_get_size_of_row(_SELF(self),  
-                                                 RVAL2GTKTREEPATH(path),
-                                                 &req);
-    if (! ret)
-        rb_raise(rb_eRuntimeError, "Can't get the value");
-
-    return rb_ary_assoc(INT2NUM(req.width), INT2NUM(req.height));
-}
-
 /* Use Gtk::CellView#background_gdk(Gdk::Color) instead.
 void        gtk_cell_view_set_background_color
                                             (GtkCellView *cell_view,
@@ -105,5 +92,4 @@ Init_gtk_cellview(VALUE mGtk)
     RG_DEF_METHOD(initialize, -1);
     RG_DEF_METHOD(set_displayed_row, 1);
     RG_DEF_METHOD(displayed_row, 0);
-    RG_DEF_METHOD(get_size_of_row, 1);
 }

data/ext/gtk3/rbgtk-container.c

@@ -146,7 +146,7 @@ rg_child_type(VALUE self)
     return GTYPE2CLASS(gtk_container_child_type(_SELF(self)));
 }
 
-/* 
+/*
 void        gtk_container_child_get         (GtkContainer *container,
                                              GtkWidget *child,
                                              const gchar *first_prop_name,
@@ -229,7 +229,7 @@ rg_child_get_property(VALUE self, VALUE child, VALUE prop_name)
             }
         }
         g_value_init(&gval, G_PARAM_SPEC_VALUE_TYPE(pspec));
-        gtk_container_child_get_property(RVAL2GTKCONTAINER(self), 
+        gtk_container_child_get_property(RVAL2GTKCONTAINER(self),
                                          RVAL2GTKWIDGET(child),
                                          name , &gval);
         ret = getter ? getter(&gval) : GVAL2RVAL(&gval);
@@ -282,7 +282,7 @@ rg_child_set_property(VALUE self, VALUE child, VALUE prop_name, VALUE val)
 
         G_CHILD_ADD(child, val);
 
-        gtk_container_child_set_property(RVAL2GTKCONTAINER(self), 
+        gtk_container_child_set_property(RVAL2GTKCONTAINER(self),
                                          RVAL2GTKWIDGET(child), name, &gval);
 
         g_value_unset(&gval);
@@ -312,7 +312,7 @@ rg_add(int argc, VALUE *argv, VALUE self)
         ary = rb_funcall(properties, rb_intern("to_a"), 0);
 
         for (i = 0; i < RARRAY_LEN(ary); i++) {
-            rg_child_set_property(self, other, 
+            rg_child_set_property(self, other,
                        RARRAY_PTR(RARRAY_PTR(ary)[i])[0],
                        RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
         }
@@ -345,9 +345,13 @@ rg_propagate_expose(VALUE self, VALUE child, VALUE event)
 static VALUE
 rg_focus_chain(VALUE self)
 {
-    gboolean ret;
+    gboolean set_explicitly;
     GList *glist = NULL;
-    ret = gtk_container_get_focus_chain(_SELF(self), &glist);
+
+    set_explicitly = gtk_container_get_focus_chain(_SELF(self), &glist);
+    if (!set_explicitly) {
+        return Qnil;
+    }
     return GOBJGLIST2RVAL_FREE(glist, g_list_free, NULL);
 }
 
@@ -458,7 +462,7 @@ rg_s_install_child_property(int argc, VALUE *argv, VALUE self)
                  rb_class2name(self));
 
     gclass = GTK_CONTAINER_CLASS(g_type_class_ref(cinfo->gtype));
-    gtk_container_class_install_child_property(gclass, 
+    gtk_container_class_install_child_property(gclass,
                                                NIL_P(prop_id) ? 1 : NUM2UINT(prop_id),
                                                pspec);
 
@@ -663,7 +667,7 @@ rg_s_type_register(int argc, VALUE* argv, VALUE self)
         VALUE s = rb_funcall(self, rb_intern("name"), 0);
 
         if (strlen(StringValuePtr(s)) == 0)
-            rb_raise(rb_eTypeError, "can't determine type name");        
+            rb_raise(rb_eTypeError, "can't determine type name");
 
         type_name = rb_funcall(
             rb_eval_string("lambda{|x| x.gsub(/::/,'') }"),

data/ext/gtk3/rbgtk-file-chooser.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2005,2006 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004  Seiya Nishizawa, Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -289,10 +288,9 @@ rg_preview_file(VALUE self)
 static VALUE
 rg_select_file(VALUE self, VALUE file)
 {
-    gboolean result;
     GError *error = NULL;
 
-    result = gtk_file_chooser_select_file(_SELF(self), RVAL2GFILE(file), &error);
+    gtk_file_chooser_select_file(_SELF(self), RVAL2GFILE(file), &error);
     if (error)
         RAISE_GERROR(error);
 
@@ -315,10 +313,9 @@ rg_set_current_folder_file(VALUE self, VALUE file)
 static VALUE
 rg_set_file(VALUE self, VALUE file)
 {
-    gboolean result;
     GError *error = NULL;
 
-    result = gtk_file_chooser_set_file(_SELF(self), RVAL2GFILE(file), &error);
+    gtk_file_chooser_set_file(_SELF(self), RVAL2GFILE(file), &error);
     if (error)
         RAISE_GERROR(error);
 
@@ -376,7 +373,7 @@ Init_gtk_file_chooser(VALUE mGtk)
     RG_DEF_METHOD(unselect_file, 1);
 
     G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_ACTION, "Action", RG_TARGET_NAMESPACE);
-    G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError, 
+    G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError,
                 GTK_TYPE_FILE_CHOOSER_ERROR);
     G_DEF_CLASS(GTK_TYPE_FILE_CHOOSER_CONFIRMATION, "Confirmation", RG_TARGET_NAMESPACE);
 

data/ext/gtk3/rbgtk-icon-info.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2004  Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -100,7 +100,7 @@ rg_display_name(VALUE self)
 }
 
 void
-Init_gtk_iconinfo(VALUE mGtk)
+Init_gtk_icon_info(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ICON_INFO, "IconInfo", mGtk);
 

data/ext/gtk3/rbgtk-style-properties.c

@@ -43,19 +43,18 @@ static VALUE
 rg_get_property(VALUE self, VALUE property, VALUE state)
 {
     GValue value = G_VALUE_INIT;
-    gboolean result;
-    VALUE ret = Qnil;
-
-    result = gtk_style_properties_get_property(_SELF(self),
-                                               RVAL2CSTR(property),
-                                               RVAL2GTKSTATEFLAGS(state),
-                                               &value);
-    if (G_VALUE_TYPE(&value) != G_TYPE_INVALID){
-        ret = GVAL2RVAL(&value);
-        g_value_unset(&value);
-    } 
-
-    return ret;
+    gboolean exist;
+    VALUE rb_value = Qnil;
+
+    exist = gtk_style_properties_get_property(_SELF(self),
+                                              RVAL2CSTR(property),
+                                              RVAL2GTKSTATEFLAGS(state),
+                                              &value);
+    if (exist) {
+        rb_value = GVAL2RVAL_UNSET(&value);
+    }
+
+    return rb_value;
 }
 
 static VALUE

data/ext/gtk3/rbgtk-style-provider.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  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
@@ -41,20 +41,19 @@ static VALUE
 rg_get_style_property(VALUE self, VALUE path, VALUE state, VALUE pspec)
 {
     GValue value = G_VALUE_INIT;
-    gboolean result;
-    VALUE ret = Qnil;
+    gboolean exist;
+    VALUE property = Qnil;
 
-    result = gtk_style_provider_get_style_property(_SELF(self),
-                                                   RVAL2GTKWIDGETPATH(path),
-                                                   RVAL2GTKSTATEFLAGS(state),
-                                                   RVAL2GPARAMSPEC(pspec),
-                                                   &value);
-    if (G_VALUE_TYPE(&value) != G_TYPE_INVALID){
-        ret = GVAL2RVAL(&value);
-        g_value_unset(&value); /* TODO: needless? */
-    } 
+    exist = gtk_style_provider_get_style_property(_SELF(self),
+                                                  RVAL2GTKWIDGETPATH(path),
+                                                  RVAL2GTKSTATEFLAGS(state),
+                                                  RVAL2GPARAMSPEC(pspec),
+                                                  &value);
+    if (exist) {
+        property = GVAL2RVAL_UNSET(&value);
+    }
 
-    return ret;
+    return property;
 }
 
 void

data/ext/gtk3/rbgtk-widget.c

@@ -144,7 +144,7 @@ rg_remove_accelerator(VALUE self, VALUE accel, VALUE key, VALUE mod)
 static VALUE
 rg_set_accel_path(VALUE self, VALUE accel_path, VALUE accel_group)
 {
-    gtk_widget_set_accel_path(_SELF(self), RVAL2CSTR(accel_path), 
+    gtk_widget_set_accel_path(_SELF(self), RVAL2CSTR(accel_path),
                               RVAL2GTKACCELGROUP(accel_group));
     return self;
 }
@@ -202,7 +202,7 @@ rg_grab_default(VALUE self)
 static VALUE
 rg_set_parent_window(VALUE self, VALUE parent_window)
 {
-    gtk_widget_set_parent_window(_SELF(self), 
+    gtk_widget_set_parent_window(_SELF(self),
                                  RVAL2GDKWINDOW(parent_window));
     return self;
 }
@@ -238,15 +238,6 @@ rg_visual(VALUE self)
     return GOBJ2RVAL(gtk_widget_get_visual(_SELF(self)));
 }
 
-static VALUE
-rg_pointer(VALUE self)
-{
-    int x, y;
-
-    gtk_widget_get_pointer(_SELF(self), &x, &y);
-    return rb_assoc_new(INT2FIX(x), INT2FIX(y));
-}
-
 static VALUE
 rg_ancestor_p(VALUE self, VALUE ancestor)
 {
@@ -406,10 +397,10 @@ rg_s_install_style_property(VALUE self, VALUE spec)
     if (rb_block_given_p()){
         VALUE func = rb_block_proc();
         rb_hash_aset(style_prop_func_table, spec, func);
-        gtk_widget_class_install_style_property_parser(gclass, pspec, 
+        gtk_widget_class_install_style_property_parser(gclass, pspec,
                                                        (GtkRcPropertyParser)rc_property_parser);
     } else {
-        gtk_widget_class_install_style_property(gclass, pspec); 
+        gtk_widget_class_install_style_property(gclass, pspec);
     }
     return self;
 }
@@ -471,7 +462,7 @@ rg_s_style_properties(int argc, VALUE *argv, VALUE self)
 static VALUE
 rg_region_intersect(VALUE self, VALUE region)
 {
-    return CRREGION2RVAL(gtk_widget_region_intersect(_SELF(self), 
+    return CRREGION2RVAL(gtk_widget_region_intersect(_SELF(self),
                                                      RVAL2CRREGION(region)));
 }
 
@@ -796,7 +787,7 @@ static VALUE
 widget_signal_size_request(G_GNUC_UNUSED guint num, const GValue *values)
 {
     GtkRequisition* req = (GtkRequisition*)g_value_get_boxed(&values[1]);
-    return rb_ary_new3(2, GVAL2RVAL(&values[0]), 
+    return rb_ary_new3(2, GVAL2RVAL(&values[0]),
                        rb_ary_new3(2, INT2NUM(req->width), INT2NUM(req->height)));
 }
 static VALUE
@@ -1167,10 +1158,10 @@ rg_drag_dest_set(VALUE self, VALUE flags, VALUE targets, VALUE actions)
 static VALUE
 rg_drag_dest_set_proxy(VALUE self, VALUE proxy_window, VALUE protocol, VALUE use_coordinates)
 {
-    gtk_drag_dest_set_proxy(_SELF(self), 
+    gtk_drag_dest_set_proxy(_SELF(self),
                             RVAL2GDKWINDOW(proxy_window),
-                            RVAL2GDKDRAGPROTOCOL(protocol), 
-                            RVAL2CBOOL(use_coordinates)); 
+                            RVAL2GDKDRAGPROTOCOL(protocol),
+                            RVAL2CBOOL(use_coordinates));
     return self;
 }
 
@@ -1205,7 +1196,7 @@ rg_drag_dest_get_target_list(VALUE self)
 static VALUE
 rg_drag_dest_set_target_list(VALUE self, VALUE target_list)
 {
-    gtk_drag_dest_set_target_list(_SELF(self), 
+    gtk_drag_dest_set_target_list(_SELF(self),
                                   NIL_P(target_list) ? NULL : RVAL2GTKTARGETLIST(target_list));
 
     return self;
@@ -1282,7 +1273,7 @@ rg_drag_begin(VALUE self, VALUE target_list, VALUE actions, VALUE button, VALUE
 static VALUE
 rg_drag_threshold_p(VALUE self, VALUE start_x, VALUE start_y, VALUE current_x, VALUE current_y)
 {
-    return CBOOL2RVAL(gtk_drag_check_threshold(_SELF(self), 
+    return CBOOL2RVAL(gtk_drag_check_threshold(_SELF(self),
                                                NUM2INT(start_x), NUM2INT(start_y),
                                                NUM2INT(current_x), NUM2INT(current_y)));
 }
@@ -1422,7 +1413,6 @@ Init_gtk_widget(VALUE mGtk)
     RG_DEF_METHOD(toplevel, 0);
     RG_DEF_METHOD(get_ancestor, 1);
     RG_DEF_METHOD(visual, 0);
-    RG_DEF_METHOD(pointer, 0);
     RG_DEF_METHOD_P(ancestor, 1);
     RG_DEF_METHOD(translate_coordinates, 3);
     RG_DEF_METHOD(hide_on_delete, 0);

data/ext/gtk3/rbgtk.c

@@ -314,6 +314,40 @@ rg_s_check_version_p(G_GNUC_UNUSED VALUE self, VALUE major, VALUE minor, VALUE m
     return CBOOL2RVAL(ret == NULL);
 }
 
+static VALUE
+rg_s_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;
+}
+
 void
 Init_gtk(void)
 {
@@ -355,6 +389,7 @@ Init_gtk(void)
     RG_DEF_SMETHOD(propagate_event, 2);
     RG_DEF_SMETHOD(check_version, 3);
     RG_DEF_SMETHOD_P(check_version, 3);
+    RG_DEF_SMETHOD(show_uri, 1);
 
     rb_define_const(RG_TARGET_NAMESPACE, "PRIORITY_RESIZE", INT2FIX(GTK_PRIORITY_RESIZE));
 
@@ -442,7 +477,7 @@ Init_gtk(void)
     Init_gtk_handle_box(RG_TARGET_NAMESPACE);
     Init_gtk_hsv(RG_TARGET_NAMESPACE);
     Init_gtk_icon_factory(RG_TARGET_NAMESPACE);
-    Init_gtk_iconinfo(RG_TARGET_NAMESPACE);
+    Init_gtk_icon_info(RG_TARGET_NAMESPACE);
     Init_gtk_icon_set(RG_TARGET_NAMESPACE);
     Init_gtk_icon_size(RG_TARGET_NAMESPACE);
     Init_gtk_icon_source(RG_TARGET_NAMESPACE);