atk 1.0.0 → 1.0.1

data/ChangeLog

@@ -1,3 +1,18 @@
+2011-09-16  Nikolai Weibull  <now@bitwi.se>
+
+	* lib/atk.rb: Remove unused variable.
+
+2011-09-12  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/atk/rbatkrelation.c: Fix initialization.
+	* ext/atk/*.c: Remove methods that implement methods already
+	implemented with properties.
+
+2011-09-09  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/atk/*.c: Fix all warnings generated with gcc 4.4.5.
+	* ext/atk/*.c: Fix all RVAL2CSTR calls.
+
 2011-02-26  Kouhei Sutou  <kou@cozmixng.org>
 
 	* ext/atk/extconf.rb: remove needless add_distcleanfile.

data/ext/atk/rbatk.h

@@ -26,6 +26,8 @@
 #  define RUBY_ATK_VAR extern
 #endif
                                                                                 
+#define RVAL2ATKOBJECT(s) ATK_OBJECT(RVAL2GOBJ(s))
+
 extern void Init_atk_inits();
 extern GType atk_text_rectangle_get_type(void);
 extern GType atk_text_range_get_type(void);

data/ext/atk/rbatkdocument.c

@@ -33,15 +33,15 @@ static VALUE
 rbatk_document_get_attribute_value(VALUE self, VALUE name)
 {
     return CSTR2RVAL(atk_document_get_attribute_value(_SELF(self), 
-                                                      (const gchar*)RVAL2CSTR(name)));
+                                                      RVAL2CSTR(name)));
 }
 
 static VALUE
 rbatk_document_set_attribute_value(VALUE self, VALUE name, VALUE value)
 {
     gboolean ret = atk_document_set_attribute_value(_SELF(self),
-                                                    (const gchar*)RVAL2CSTR(name),
-                                                    (const gchar*)RVAL2CSTR(value));
+                                                    RVAL2CSTR(name),
+                                                    RVAL2CSTR(value));
 
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set attribute value: %s, %s", 
                         RVAL2CSTR(name), RVAL2CSTR(value));

data/ext/atk/rbatkhyperlink.c

@@ -24,18 +24,6 @@ rbatk_hl_get_object(VALUE self, VALUE i)
     return GOBJ2RVAL(atk_hyperlink_get_object(_SELF(self), NUM2INT(i)));
 }
 
-static VALUE
-rbatk_hl_get_end_index(VALUE self)
-{
-    return INT2NUM(atk_hyperlink_get_end_index(_SELF(self)));
-}
-
-static VALUE
-rbatk_hl_get_start_index(VALUE self)
-{
-    return INT2NUM(atk_hyperlink_get_start_index(_SELF(self)));
-}
-
 static VALUE
 rbatk_hl_is_valid(VALUE self)
 {
@@ -56,14 +44,6 @@ rbatk_hl_get_n_anchors(VALUE self)
     return INT2NUM(atk_hyperlink_get_n_anchors(_SELF(self)));
 }
 
-#ifdef HAVE_ATK_HYPERLINK_IS_SELECTED_LINK
-static VALUE
-rbatk_hl_is_selected_link(VALUE self)
-{
-    return CBOOL2RVAL(atk_hyperlink_is_selected_link(_SELF(self)));
-}
-#endif
-
 void
 Init_atk_hyperlink()
 {
@@ -71,14 +51,9 @@ Init_atk_hyperlink()
 
     rb_define_method(hl, "get_uri", rbatk_hl_get_uri, 1);
     rb_define_method(hl, "get_object", rbatk_hl_get_object, 1);
-    rb_define_method(hl, "end_index", rbatk_hl_get_end_index, 0);
-    rb_define_method(hl, "start_index", rbatk_hl_get_start_index, 0);
     rb_define_method(hl, "valid?", rbatk_hl_is_valid, 0);
 #ifdef HAVE_ATK_HYPERLINK_IS_INLINE
     rb_define_method(hl, "inline?", rbatk_hl_is_inline, 0);
 #endif
     rb_define_method(hl, "n_anchors", rbatk_hl_get_n_anchors, 0);
-#ifdef HAVE_ATK_HYPERLINK_IS_SELECTED_LINK
-    rb_define_method(hl, "selected_link?", rbatk_hl_is_selected_link, 0);
-#endif
 }

data/ext/atk/rbatkinits.c

@@ -24,7 +24,8 @@ extern void   Init_atk_text_range();
 extern void   Init_atk_text_rectangle();
 extern void   Init_atk_util();
 extern void   Init_atk_value();
-void Init_atk_inits()
+void
+Init_atk_inits()
 {
    Init_atk_action();
    Init_atk_component();

data/ext/atk/rbatkobject.c

@@ -11,7 +11,7 @@
 
 #include "rbatk.h"
 
-#define _SELF(s) (ATK_OBJECT(RVAL2GOBJ(s)))
+#define _SELF(s) RVAL2ATKOBJECT(s)
 
 /* How can I implement this? Since 1.10
 AtkObject*  atk_implementor_ref_accessible  (AtkImplementor *implementor);

data/ext/atk/rbatkrelation.c

@@ -33,42 +33,23 @@ rbatkrelation_s_for_name(VALUE self, VALUE name)
 static VALUE
 rbatkrel_initialize(VALUE self, VALUE targets, VALUE relationship)
 {
-    gint i;
-    gint len = RARRAY_LEN(targets);
-    AtkObject* objects = g_new(AtkObject, len);
+    VALUE ary = rb_ary_to_ary(targets);
+    long i;
+    long len = RARRAY_LEN(ary);
+    AtkObject **objects = g_new(AtkObject *, len);
 
-    for (i = 0; i < len; i++) {
-        objects = (AtkObject*)RARRAY_PTR(targets)[i];
-        objects++;
-    }
+    for (i = 0; i < len; i++)
+        objects[i] = RVAL2ATKOBJECT(RARRAY_PTR(targets)[i]);
 
-    G_INITIALIZE(self, atk_relation_new(&objects, len, 
+    G_INITIALIZE(self, atk_relation_new(objects,
+                                        len, 
                                         RVAL2GENUM(relationship, ATK_TYPE_RELATION_TYPE)));
+
     g_free(objects);
 
     return Qnil;
 }
 
-static VALUE
-rbatkrel_get_relation_type(VALUE self)
-{
-    return GENUM2RVAL(atk_relation_get_relation_type(_SELF(self)), ATK_TYPE_RELATION_TYPE);
-}
-
-static VALUE
-rbatkrel_get_target(VALUE self)
-{
-    gint i;
-    GPtrArray* garray = atk_relation_get_target(_SELF(self));
-    VALUE ary = rb_ary_new();
-
-    for (i = 0; i < garray->len; i++){
-        rb_ary_push(ary, GOBJ2RVAL((AtkObject*)g_ptr_array_index(garray, i)));
-    }
-    g_ptr_array_free(garray, TRUE);
-    return ary;
-}
-
 #if ATK_CHECK_VERSION(1,9,0)
 static VALUE
 rbatkrel_add_target(VALUE self, VALUE obj)
@@ -85,8 +66,6 @@ Init_atk_relation()
     VALUE type;
     rb_define_singleton_method(rel, "type_register", rbatkrel_s_type_register, 1);
     rb_define_method(rel, "initialize", rbatkrel_initialize, 2);
-    rb_define_method(rel, "relation_type", rbatkrel_get_relation_type, 0);
-    rb_define_method(rel, "target", rbatkrel_get_target, 0);
 #if ATK_CHECK_VERSION(1,9,0)
     rb_define_method(rel, "add_target", rbatkrel_add_target, 1);
 #endif

data/ext/atk/rbatktable.c

@@ -228,7 +228,6 @@ Init_atk_table()
 {
     VALUE mTable = G_DEF_INTERFACE(ATK_TYPE_TABLE, "Table", mAtk);
 
-    rb_define_method(mTable, "set_caption", rbatk_table_set_caption, 1);
     rb_define_method(mTable, "ref_at", rbatk_table_ref_at, 2);
     rb_define_method(mTable, "get_index_at", rbatk_table_get_index_at, 2);
     rb_define_method(mTable, "get_column_at_index", rbatk_table_get_column_at_index, 1);

data/ext/atk/rbatkutil.c

@@ -105,7 +105,6 @@ Init_atk_util()
 #endif
     rb_define_singleton_method(util, "toolkit_name", rbatk_get_toolkit_name, 0);
     rb_define_singleton_method(util, "toolkit_version", rbatk_get_toolkit_version, 0);
-    rb_define_singleton_method(util, "toolkit_version", rbatk_get_toolkit_version, 0);
 
     /* AtkCoordType */
     coord = G_DEF_CLASS(ATK_TYPE_COORD_TYPE, "CoordType", util);

data/lib/atk.rb

@@ -5,7 +5,7 @@ vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_environment_path(vendor_bin_dir)
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/atk.so"
 rescue LoadError
   require 'atk.so'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: atk
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 Z
+date: 2011-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: glib2
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 description: Ruby/ATK is a Ruby binding of ATK-1.0.x.