poppler 1.1.2 → 1.1.3

data/ext/poppler/extconf.rb

@@ -56,7 +56,6 @@ check_cairo(rcairo_options)
 setup_win32(module_name, base_dir)
 
 PKGConfig.have_package(package_id) or exit 1
-PKGConfig.have_package('poppler-cairo')
 
 unless have_macro("POPPLER_MAJOR_VERSION", ["poppler.h"])
   make_version_header("POPPLER", package_id, ".")

data/ext/poppler/rbpoppler-action.c

@@ -58,7 +58,7 @@ action_ ## type ## _ ## name (VALUE self)			\
 }
 
 #define DEFINE_ACCESSOR(prefix, target, name) \
-    rb_define_method(target, G_STRINGIFY(name), prefix ## _ ## name, 0);
+    rbg_define_method(target, G_STRINGIFY(name), prefix ## _ ## name, 0);
 
 #define DEFINE_ACTION_ACCESSOR(target, type, name) \
     DEFINE_ACCESSOR(action_ ## type, target, name)
@@ -165,7 +165,7 @@ Init_poppler_action(VALUE mPoppler)
     cAction = G_DEF_CLASS(POPPLER_TYPE_ACTION, "Action", mPoppler);
 
     cActionAny = rb_define_class_under(mPoppler, "ActionAny", cAction);
-    rb_define_method(cActionAny, "type", action_any_type, 0);
+    rbg_define_method(cActionAny, "type", action_any_type, 0);
     DEFINE_ACTION_ACCESSOR(cActionAny, any, title);
 
     cActionGotoDest = rb_define_class_under(mPoppler, "ActionGotoDest",
@@ -197,21 +197,12 @@ Init_poppler_action(VALUE mPoppler)
     actions[POPPLER_ACTION_NAMED] = cActionNamed;
     actions[POPPLER_ACTION_MOVIE] = cActionMovie;
 
-    G_DEF_SETTERS(cAction);
-    G_DEF_SETTERS(cActionAny);
-    G_DEF_SETTERS(cActionGotoDest);
-    G_DEF_SETTERS(cActionGotoRemote);
-    G_DEF_SETTERS(cActionLaunch);
-    G_DEF_SETTERS(cActionUri);
-    G_DEF_SETTERS(cActionNamed);
-    G_DEF_SETTERS(cActionMovie);
-
     G_DEF_CLASS(POPPLER_TYPE_ACTION_TYPE, "ActionType", mPoppler);
     G_DEF_CLASS(POPPLER_TYPE_DEST_TYPE, "DestType", mPoppler);
 
     cDest = G_DEF_CLASS(POPPLER_TYPE_DEST, "Dest", mPoppler);
 
-    rb_define_method(cDest, "type", dest_get_type, 0);
+    rbg_define_method(cDest, "type", dest_get_type, 0);
     DEFINE_DEST_ACCESSOR(cDest, page_num);
     DEFINE_DEST_ACCESSOR(cDest, left);
     DEFINE_DEST_ACCESSOR(cDest, bottom);
@@ -222,5 +213,4 @@ Init_poppler_action(VALUE mPoppler)
     DEFINE_DEST_ACCESSOR(cDest, change_left);
     DEFINE_DEST_ACCESSOR(cDest, change_top);
     DEFINE_DEST_ACCESSOR(cDest, change_zoom);
-    G_DEF_SETTERS(cDest);
 }

data/ext/poppler/rbpoppler-annotationcalloutline.c

@@ -94,37 +94,35 @@ Init_poppler_annotationcalloutline(VALUE mPoppler)
 
     RG_DEF_METHOD(initialize, 7);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "multiline?",
+    rbg_define_method(RG_TARGET_NAMESPACE, "multiline?",
                      annot_callout_line_get_multiline, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_multiline",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_multiline",
                      annot_callout_line_set_multiline, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "x1",
+    rbg_define_method(RG_TARGET_NAMESPACE, "x1",
                      annot_callout_line_get_x1, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_x1",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_x1",
                      annot_callout_line_set_x1, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "y1",
+    rbg_define_method(RG_TARGET_NAMESPACE, "y1",
                      annot_callout_line_get_y1, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_y1",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_y1",
                      annot_callout_line_set_y1, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "x2",
+    rbg_define_method(RG_TARGET_NAMESPACE, "x2",
                      annot_callout_line_get_x2, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_x2",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_x2",
                      annot_callout_line_set_x2, 2);
-    rb_define_method(RG_TARGET_NAMESPACE, "y2",
+    rbg_define_method(RG_TARGET_NAMESPACE, "y2",
                      annot_callout_line_get_y2, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_y2",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_y2",
                      annot_callout_line_set_y2, 2);
-    rb_define_method(RG_TARGET_NAMESPACE, "x3",
+    rbg_define_method(RG_TARGET_NAMESPACE, "x3",
                      annot_callout_line_get_x3, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_x3",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_x3",
                      annot_callout_line_set_x3, 3);
-    rb_define_method(RG_TARGET_NAMESPACE, "y3",
+    rbg_define_method(RG_TARGET_NAMESPACE, "y3",
                      annot_callout_line_get_y3, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_y3",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_y3",
                      annot_callout_line_set_y3, 3);
 
     RG_DEF_METHOD(to_a, 0);
     RG_DEF_METHOD(inspect, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-annotationmapping.c

@@ -64,12 +64,10 @@ Init_poppler_annotationmapping(VALUE mPoppler)
 
     RG_DEF_METHOD(initialize, -1);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "area", annot_mapping_get_area, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "annotation",
+    rbg_define_method(RG_TARGET_NAMESPACE, "area", annot_mapping_get_area, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "annotation",
                      annot_mapping_get_annotation, 0);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "set_area", annot_mapping_set_area, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_area", annot_mapping_set_area, 1);
     RG_DEF_METHOD(set_annotation, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-attachment.c

@@ -28,7 +28,7 @@ static ID id_call;
 
 static gboolean
 attachment_save_func(const gchar *buf, gsize count, gpointer data,
-                     GError **error)
+                     G_GNUC_UNUSED GError **error)
 {
     VALUE result;
     VALUE callback = (VALUE)data;
@@ -121,6 +121,4 @@ Init_poppler_attachment(VALUE mPoppler)
     RG_DEF_METHOD(mtime, 0);
     RG_DEF_METHOD(ctime, 0);
     RG_DEF_METHOD(checksum, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-buttonfield.c

@@ -53,6 +53,4 @@ Init_poppler_button_field(VALUE mPoppler, VALUE cFormField)
     RG_DEF_METHOD(type, 0);
     RG_DEF_METHOD_P(active, 0);
     RG_DEF_METHOD(set_active, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-choicefield.c

@@ -128,6 +128,4 @@ Init_poppler_choice_field(VALUE mPoppler, VALUE cFormField)
     RG_DEF_METHOD(toggle, 1);
     RG_DEF_METHOD(text, 0);
     RG_DEF_METHOD(set_text, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-color.c

@@ -108,15 +108,13 @@ Init_poppler_color(VALUE mPoppler)
     RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_COLOR, "Color", mPoppler);
 
     RG_DEF_METHOD(initialize, 3);
-    rb_define_method(RG_TARGET_NAMESPACE, "red", color_get_red, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "green", color_get_green, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "blue", color_get_blue, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_red", color_set_red, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_green", color_set_green, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_blue", color_set_blue, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "red", color_get_red, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "green", color_get_green, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "blue", color_get_blue, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_red", color_set_red, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_green", color_set_green, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_blue", color_set_blue, 1);
     RG_DEF_METHOD(to_a, 0);
     RG_DEF_METHOD(inspect, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }

data/ext/poppler/rbpoppler-document.c

@@ -221,6 +221,4 @@ Init_poppler_document(VALUE mPoppler)
 
     RG_DEF_METHOD(index_iter, 0);
     RG_DEF_METHOD(font_info, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-fontinfo.c

@@ -19,7 +19,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "rbpoppler.h"
+#include "rbpoppler-private.h"
 
 #define RG_TARGET_NAMESPACE cFontInfo
 
@@ -61,6 +61,5 @@ Init_poppler_fontinfo(VALUE mPoppler)
 #if POPPLER_CHECK_VERSION(0, 6, 0)
     RG_DEF_METHOD(initialize, 1);
     RG_DEF_METHOD(scan, 1);
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }

data/ext/poppler/rbpoppler-fontsiter.c

@@ -125,6 +125,4 @@ Init_poppler_fontsiter(VALUE mPoppler)
 
     RG_DEF_METHOD_P(valid, 0);
     RG_DEF_METHOD(each, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-form-field.c

@@ -88,8 +88,6 @@ Init_poppler_form_field(VALUE mPoppler)
     RG_DEF_METHOD(font_size, 0);
     RG_DEF_METHOD_P(read_only, 0);
 
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-
     Init_poppler_button_field(mPoppler, RG_TARGET_NAMESPACE);
     Init_poppler_text_field(mPoppler, RG_TARGET_NAMESPACE);
     Init_poppler_choice_field(mPoppler, RG_TARGET_NAMESPACE);

data/ext/poppler/rbpoppler-formfieldmapping.c

@@ -34,14 +34,12 @@ Init_poppler_formfieldmapping(VALUE mPoppler)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD_MAPPING,
                                     "FormFieldMapping", mPoppler);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "area", form_field_mapping_get_area, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "field", form_field_mapping_get_field,
+    rbg_define_method(RG_TARGET_NAMESPACE, "area", form_field_mapping_get_area, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "field", form_field_mapping_get_field,
                      0);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "set_area",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_area",
                      form_field_mapping_set_area, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_field",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_field",
                      form_field_mapping_set_field, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-imagemapping.c

@@ -41,15 +41,13 @@ Init_poppler_imagemapping(VALUE mPoppler)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_IMAGE_MAPPING,
                                 "ImageMapping", mPoppler);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "area", image_mapping_get_area, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "image_id", image_mapping_get_image_id, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "area", image_mapping_get_area, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "image_id", image_mapping_get_image_id, 0);
 #ifdef RB_POPPLER_CAIRO_AVAILABLE
     RG_DEF_METHOD(image, 0);
 #endif
 
-    rb_define_method(RG_TARGET_NAMESPACE, "set_area", image_mapping_set_area, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_image_id",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_area", image_mapping_set_area, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_image_id",
                      image_mapping_set_image_id, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-indexiter.c

@@ -59,6 +59,7 @@ rg_child(VALUE self)
     CHECK_IITER_IS_VALID(self);
     child = poppler_index_iter_get_child(RVAL2POPPLERINDEXITER(self));
     rb_child = POPPLERINDEXITER2RVAL(child);
+    rb_ivar_set(rb_child, id_valid, CBOOL2RVAL(child));
     poppler_index_iter_free(child);
     return rb_child;
 }
@@ -125,6 +126,4 @@ Init_poppler_indexiter(VALUE mPoppler)
 
     RG_DEF_METHOD_P(valid, 0);
     RG_DEF_METHOD(each, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-linkmapping.c

@@ -40,11 +40,9 @@ Init_poppler_linkmapping(VALUE mPoppler)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_LINK_MAPPING, "LinkMapping",
                                mPoppler);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "area", link_mapping_get_area, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "action", link_mapping_get_action, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "area", link_mapping_get_area, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "action", link_mapping_get_action, 0);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "set_area", link_mapping_set_area, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_action", link_mapping_set_action, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_area", link_mapping_set_area, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_action", link_mapping_set_action, 1);
 }

data/ext/poppler/rbpoppler-page.c

@@ -278,16 +278,16 @@ rg_get_text(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "02", &arg1, &arg2);
 
     page = SELF(self);
-    if (NIL_P(arg1)) {
-        rb_rect = arg2;
-    } else {
-        if (RTEST(rb_obj_is_kind_of(arg2, cRectangle))) {
-            rb_rect = arg2;
+    rb_rect = Qnil;
+    if (!NIL_P(arg1)) {
+        if (RTEST(rb_obj_is_kind_of(arg1, cRectangle))) {
+            rb_rect = arg1;
         } else {
-            rb_rect = Qnil;
-            if (!NIL_P(arg2)) {
-                style = RVAL2POPPLERSELECTIONSTYLE(arg2);
-            }
+            rb_raise(rb_eArgError, "wrong first arrument. selection rectangle is expected.");
+        }
+
+        if (!NIL_P(arg2)) {
+            style = RVAL2POPPLERSELECTIONSTYLE(arg2);
         }
     }
 
@@ -323,6 +323,31 @@ rg_get_text(int argc, VALUE *argv, VALUE self)
     return rb_text;
 }
 
+#if POPPLER_CHECK_VERSION(0, 16, 0)
+static VALUE
+rg_text_layout(VALUE self)
+{
+    PopplerRectangle *rectangles;
+    guint n_rectangles;
+
+    if (poppler_page_get_text_layout(SELF(self), &rectangles, &n_rectangles)) {
+        VALUE *rb_list, *p;
+        VALUE ary;
+        guint i;
+        rb_list = p = ALLOC_N(VALUE, n_rectangles);
+        for (i = 0; i < n_rectangles; i++, p++) {
+            *p = POPPLERRECTANGLE2RVAL(&rectangles[i]);
+        }
+        ary = rb_ary_new4(n_rectangles, rb_list);
+        free(rb_list);
+        free(rectangles);
+        return ary;
+    } else {
+        return Qnil;
+    }
+}
+#endif
+
 static VALUE
 rg_get_selection_region(VALUE self, VALUE scale, VALUE style, VALUE selection)
 {
@@ -418,6 +443,9 @@ Init_poppler_page(VALUE mPoppler)
     RG_DEF_METHOD(thumbnail_size, 0);
     RG_DEF_METHOD(find_text, 1);
     RG_DEF_METHOD(get_text, -1);
+#if POPPLER_CHECK_VERSION(0, 16, 0)
+    RG_DEF_METHOD(text_layout, 0);
+#endif
     RG_DEF_METHOD(get_selection_region, 3);
     RG_DEF_METHOD(link_mapping, 0);
     RG_DEF_METHOD(image_mapping, 0);
@@ -429,6 +457,4 @@ Init_poppler_page(VALUE mPoppler)
     RG_DEF_METHOD(annotation_mapping, 0);
     RG_DEF_METHOD(render_selection, -1);
     RG_DEF_METHOD(crop_box, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-pagetransition.c

@@ -37,26 +37,24 @@ Init_poppler_pagetransition(VALUE mPoppler)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION,
                                   "PageTransition", mPoppler);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "type", page_trans_get_type, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "alignment", page_trans_get_alignment, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "direction", page_trans_get_direction, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "duration", page_trans_get_duration, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "angle", page_trans_get_angle, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "scale", page_trans_get_scale, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "rectangular",
+    rbg_define_method(RG_TARGET_NAMESPACE, "type", page_trans_get_type, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "alignment", page_trans_get_alignment, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "direction", page_trans_get_direction, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "duration", page_trans_get_duration, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "angle", page_trans_get_angle, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "scale", page_trans_get_scale, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "rectangular",
                      page_trans_get_rectangular, 0);
 
-    rb_define_method(RG_TARGET_NAMESPACE, "set_type", page_trans_set_type, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_alignment",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_type", page_trans_set_type, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_alignment",
                      page_trans_set_alignment, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_direction",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_direction",
                      page_trans_set_direction, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_duration",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_duration",
                      page_trans_set_duration, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_angle", page_trans_set_angle, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_scale", page_trans_set_scale, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_rectangular",
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_angle", page_trans_set_angle, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_scale", page_trans_set_scale, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_rectangular",
                      page_trans_set_rectangular, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-psfile.c

@@ -64,6 +64,4 @@ Init_poppler_psfile(VALUE mPoppler)
     RG_DEF_METHOD(initialize, 4);
     RG_DEF_METHOD(set_paper_size, 2);
     RG_DEF_METHOD(set_duplex, 1);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-rectangle.c

@@ -79,16 +79,14 @@ Init_poppler_rectangle(VALUE mPoppler)
     RG_TARGET_NAMESPACE = G_DEF_CLASS(POPPLER_TYPE_RECTANGLE, "Rectangle", mPoppler);
 
     RG_DEF_METHOD(initialize, 4);
-    rb_define_method(RG_TARGET_NAMESPACE, "x1", rectangle_get_x1, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "y1", rectangle_get_y1, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "x2", rectangle_get_x2, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "y2", rectangle_get_y2, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_x1", rectangle_set_x1, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_y1", rectangle_set_y1, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_x2", rectangle_set_x2, 1);
-    rb_define_method(RG_TARGET_NAMESPACE, "set_y2", rectangle_set_y2, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "x1", rectangle_get_x1, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "y1", rectangle_get_y1, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "x2", rectangle_get_x2, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "y2", rectangle_get_y2, 0);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_x1", rectangle_set_x1, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_y1", rectangle_set_y1, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_x2", rectangle_set_x2, 1);
+    rbg_define_method(RG_TARGET_NAMESPACE, "set_y2", rectangle_set_y2, 1);
     RG_DEF_METHOD(to_a, 0);
     RG_DEF_METHOD(inspect, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler-textfield.c

@@ -88,6 +88,4 @@ Init_poppler_text_field(VALUE mPoppler, VALUE cFormField)
     RG_DEF_METHOD_P(scroll, 0);
     RG_DEF_METHOD_P(rich_text, 0);
     RG_DEF_METHOD_P(password, 0);
-
-    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/poppler/rbpoppler.c

@@ -26,19 +26,19 @@ extern void Init_poppler(void);
 #define RG_TARGET_NAMESPACE mPoppler
 
 static VALUE
-rg_m_backend(VALUE self)
+rg_s_backend(G_GNUC_UNUSED VALUE self)
 {
     return POPPLERBACKEND2RVAL(poppler_get_backend());
 }
 
 static VALUE
-rg_m_version(VALUE self)
+rg_s_version(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(poppler_get_version());
 }
 
 static VALUE
-rg_m_cairo_available_p(VALUE self)
+rg_s_cairo_available_p(G_GNUC_UNUSED VALUE self)
 {
 #ifdef RB_POPPLER_CAIRO_AVAILABLE
     return Qtrue;
@@ -91,9 +91,9 @@ Init_poppler(void)
 
     G_DEF_CLASS(POPPLER_TYPE_BACKEND, "Backend", RG_TARGET_NAMESPACE);
 
-    RG_DEF_MODFUNC(backend, 0);
-    RG_DEF_MODFUNC(version, 0);
-    RG_DEF_MODFUNC_P(cairo_available, 0);
+    RG_DEF_SMETHOD(backend, 0);
+    RG_DEF_SMETHOD(version, 0);
+    RG_DEF_SMETHOD_P(cairo_available, 0);
 
     Init_poppler_indexiter(RG_TARGET_NAMESPACE);
     Init_poppler_fontinfo(RG_TARGET_NAMESPACE);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: poppler
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: gtk2
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 1
-        - 2
-        version: 1.1.2
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id001
 description: Ruby/Poppler is a Ruby binding of poppler-glib.
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby/Poppler is a Ruby binding of poppler-glib.