gio2 0.90.5 → 0.90.6

data/ChangeLog

@@ -1,3 +1,44 @@
+2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile, ext/gio2/extconf.rb: share depended packages
+	vendor/local/.
+
+2011-01-29  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gio2/gunixsocketaddress.c (Init_gunixsocketaddress): disable
+	G_TYPE_UNIX_SOCKET_ADDRESS_TYPE on GIO 2.24 because it was appeared
+	in GIO 2.26.
+
+	* ext/gio2/gdatainputstream.c: disable read_upto related methods
+	with GIO 2.24 because GIO 2.24 has those definition in *.c but no those
+	declarations in *.h.
+
+2011-01-22  Masaaki Aoyagi
+
+	* Rakefile: change to use gnome2-raketask.rb.
+
+2011-01-16  Nikolai Weibull
+
+	* ext/gio2/gfileattribute.c: Split into files for each separate class
+	and update names to match the rules of Ruby-GNOME2.
+	* ext/gio2/*: Remove methods for getting and setting properties that
+	are automatically generated.
+	* lib/gio2.rb: Make GLib::UnixFDList Enumerable.
+	* ext/gio2/*: Don’t use rb_undef_alloc_func.  We would like to remove
+	.new from these classes, but I don’t know of a way of doing so.  Using
+	rb_undef_alloc_func is incorrect, as it will make subclasses
+	unallocatable.
+	* ext/gio2/*: Fix some TODOs.
+
+2010-11-12  Nikolai Weibull
+
+	* *: Fix two compilation issues introduced in yesterdays bugfixing.
+	* *: Update various other small things.
+
+2010-11-11  Nikolai Weibull
+
+	* *: Fix various minor bugs.
+
 2010-10-23  Kouhei Sutou  <kou@clear-code.com>
 
 	* Rakefile: remove needless cairo dependency.

data/Rakefile

@@ -1,75 +1,14 @@
 # -*- ruby -*-
 
-require 'pathname'
-require 'find'
-require 'rubygems'
-require 'rake/extensiontask'
+require './../glib2/lib/gnome2-raketask'
 
-@top_dir = Pathname(__FILE__).dirname.parent.expand_path
-@rb_glib2_dir = @top_dir + "glib2"
-
-task :default => :build
-
-def version
-  @version ||= ENV["VERSION"] || guess_version
-end
-
-def guess_version
-  versions = {}
-  rbglib_h_path = @rb_glib2_dir + "ext" + "glib2" + "rbglib.h"
-  rbglib_h_path.open do |rbglib_h|
-    rbglib_h.each_line do |line|
-      if /#define\s+RBGLIB_([A-Z]+)_VERSION\s+(\d+)/ =~ line
-        versions[$1.downcase] = $2.to_i
-      end
-    end
-  end
-  ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
-end
-
-package_name = "gio2"
-
-spec = Gem::Specification.new do |s|
-  s.name = package_name
-  s.summary = "Ruby/GIO2 is a Ruby binding of gio-2.x."
-  s.description = "Ruby/GIO2 is a Ruby binding of gio-2.x."
-  s.author = "The Ruby-GNOME2 Proejct Team"
-  s.email = "ruby-gnome2-devel-en@lists.sourceforge.net"
-  s.homepage = "http://ruby-gnome2.sourceforge.jp/"
-  s.version = version
-  s.platform = Gem::Platform::RUBY
-  compatible_version = version.split(/\./)[0, 3].join(".")
-  s.add_dependency("glib2", ">= #{compatible_version}")
-  s.extensions = FileList["ext/#{package_name}/extconf.rb"]
-  s.require_paths = ["lib"]
-  s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
-                     "lib/**/*.rb", "ext/**/*"]
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
+package = GNOME2Package.new do |_package|
+  _package.summary = "Ruby/GIO2 is a Ruby binding of gio-2.x."
+  _package.description = "Ruby/GIO2 is a Ruby binding of gio-2.x."
+  _package.dependency.gem.runtime = ["glib2"]
+  _package.win32.packages = []
+  _package.win32.dependencies = []
+  _package.post_install_message = "This library is experimental."
 end
+package.define_tasks
 
-Rake::ExtensionTask.new(package_name, spec) do |ext|
-  ext.cross_compile = true
-  ext.cross_compiling do |spec|
-    if /mingw|mswin/ =~ spec.platform.to_s
-      win32_dir = File.join("vendor", "local")
-      win32_files = []
-      Find.find(win32_dir) do |file|
-        next if /\.zip\z/ =~ file
-        win32_files << file
-      end
-      spec.files += win32_files
-    end
-  end
-end
-
-namespace :win32 do
-  desc "download Windows binaries"
-  task :download do
-    $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
-    require 'gnome2-win32-binary-downloader'
-    GNOME2Win32BinaryDownloader.download(:packages => ["glib"],
-                                         :dependencies => ["gettext-runtime"])
-  end
-end

data/ext/gio2/Makefile

@@ -0,0 +1,162 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = /home/kou/work/ruby/ruby-gnome2/gio2/ext/gio2
+topdir = /usr/lib/ruby/1.8/x86_64-linux
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+exec_prefix = $(prefix)
+prefix = $(DESTDIR)/usr
+sharedstatedir = $(prefix)/com
+mandir = $(prefix)/share/man
+psdir = $(docdir)
+oldincludedir = $(DESTDIR)/usr/include
+localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(prefix)/lib/ruby1.8
+sitedir = $(DESTDIR)/usr/local/lib/site_ruby
+htmldir = $(docdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+includedir = $(prefix)/include
+infodir = $(prefix)/share/info
+vendorlibdir = $(vendordir)/$(ruby_version)
+sysconfdir = $(DESTDIR)/etc
+libdir = $(exec_prefix)/lib
+sbindir = $(exec_prefix)/sbin
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
+pdfdir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
+sitearchdir = $(sitelibdir)/$(sitearch)
+datadir = $(datarootdir)
+localstatedir = $(DESTDIR)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags) -Wall -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread -finline-functions -fno-common -Wall -Waggregate-return -Wcast-align -Wextra -Wformat=2 -Winit-self -Winline -Wlarger-than-65500 -Wmissing-declarations -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpacked -Wp,-D_FORTIFY_SOURCE=2 -Wpointer-arith -Wswitch-default -Wswitch-enum -Wundef -Wunsafe-loop-optimizations -Wwrite-strings 
+INCFLAGS = -I. -I/home/kou/work/ruby/ruby-gnome2/glib2/ext/glib2 -I/home/kou/work/ruby/ruby-gnome2/glib2/ext/glib2 -I/home/kou/work/ruby/ruby-gnome2/glib2/ext/glib2 -I. -I/usr/lib/ruby/1.8/x86_64-linux -I/home/kou/work/ruby/ruby-gnome2/gio2/ext/gio2
+DEFS     = 
+CPPFLAGS = -DHAVE_RB_DEFINE_ALLOC_FUNC -DHAVE_RB_BLOCK_PROC -DHAVE_OBJECT_ALLOCATE -DHAVE_NODE_ATTRASGN -DHAVE_RB_EXEC_RECURSIVE -DRUBY_GIO2_COMPILATION -DHAVE_GIO_UNIX   
+CXXFLAGS = $(CFLAGS) 
+ldflags  = -L.  -rdynamic -Wl,-export-dynamic -pthread -pthread -pthread
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = $(CC) -shared
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby1.8
+RUBY_SO_NAME = ruby1.8
+arch = x86_64-linux
+sitearch = x86_64-linux
+ruby_version = 1.8
+ruby = /usr/bin/ruby1.8
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lgio-2.0 -lglib-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lgmodule-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lrt -lpthread -lrt -ldl -lcrypt -lm   -lc
+SRCS = gunixfdlist.c gasyncinitable.c gfilemonitor.c gappinfo.c gfileiostream.c ginetaddress.c gzlibdecompressor.c ginetsocketaddress.c gfileenumerator.c gfileattributeinfo.c gfileinfo.c gemblemedicon.c gseekable.c gmountoperation.c gresolver.c gsrvtarget.c gfileinputstream.c gbufferedinputstream.c gicon.c gfiledescriptorbased.c gnetworkservice.c gnetworkaddress.c gsocketconnectable.c gsocketcontrolmessage.c gdesktopappinfo.c gfilteroutputstream.c gvolumemonitor.c gioerror.c gmemoryoutputstream.c gfileattributematcher.c gcancellable.c gconverteroutputstream.c gioscheduler.c gsocketservice.c gconverter.c gfile.c gunixoutputstream.c gdatainputstream.c gfileattribute.c gdataoutputstream.c gcontenttype.c gio2.c gmount.c ginitable.c gasyncresult.c gunixconnection.c gsocketconnection.c gsocket.c gzlibcompressor.c gvfs.c gmemoryinputstream.c gsimpleasyncresult.c gvolume.c goutputstream.c gsocketaddress.c gfileattributeinfolist.c gfilenamecompleter.c gdrive.c gtcpconnection.c gfileoutputstream.c giostream.c gunixfdmessage.c util.c gsocketlistener.c gfilterinputstream.c gthemedicon.c gloadableicon.c gapplaunchcontext.c gunixmounts.c gunixsocketaddress.c gcharsetconverter.c gsocketclient.c giomodule.c ginputstream.c gbufferedoutputstream.c gfileicon.c gunixinputstream.c gemblem.c gconverterinputstream.c gthreadedsocketservice.c
+OBJS = gunixfdlist.o gasyncinitable.o gfilemonitor.o gappinfo.o gfileiostream.o ginetaddress.o gzlibdecompressor.o ginetsocketaddress.o gfileenumerator.o gfileattributeinfo.o gfileinfo.o gemblemedicon.o gseekable.o gmountoperation.o gresolver.o gsrvtarget.o gfileinputstream.o gbufferedinputstream.o gicon.o gfiledescriptorbased.o gnetworkservice.o gnetworkaddress.o gsocketconnectable.o gsocketcontrolmessage.o gdesktopappinfo.o gfilteroutputstream.o gvolumemonitor.o gioerror.o gmemoryoutputstream.o gfileattributematcher.o gcancellable.o gconverteroutputstream.o gioscheduler.o gsocketservice.o gconverter.o gfile.o gunixoutputstream.o gdatainputstream.o gfileattribute.o gdataoutputstream.o gcontenttype.o gio2.o gmount.o ginitable.o gasyncresult.o gunixconnection.o gsocketconnection.o gsocket.o gzlibcompressor.o gvfs.o gmemoryinputstream.o gsimpleasyncresult.o gvolume.o goutputstream.o gsocketaddress.o gfileattributeinfolist.o gfilenamecompleter.o gdrive.o gtcpconnection.o gfileoutputstream.o giostream.o gunixfdmessage.o util.o gsocketlistener.o gfilterinputstream.o gthemedicon.o gloadableicon.o gapplaunchcontext.o gunixmounts.o gunixsocketaddress.o gcharsetconverter.o gsocketclient.o giomodule.o ginputstream.o gbufferedoutputstream.o gfileicon.o gunixinputstream.o gemblem.o gconverterinputstream.o gthreadedsocketservice.o
+TARGET = gio2
+DLLIB = $(TARGET).so
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).so $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+###
+install:
+	if test -n "$(pkgconfigdir)"; then			\
+	  $(MAKEDIRS) $(pkgconfigdir);				\
+	  $(INSTALL_DATA) ruby-gio2.pc $(pkgconfigdir);		\
+	fi

data/ext/gio2/extconf.rb

@@ -24,6 +24,15 @@ package_id = "gio-2.0"
 
 require 'mkmf-gnome2'
 
+["glib2"].each do |package|
+  directory = "#{package}#{version_suffix}"
+  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+  add_depend_package(package, "#{directory}/ext/#{package}",
+                     top_dir.to_s,
+                     :top_build_dir => top_build_dir.to_s,
+                     :target_build_dir => build_dir)
+end
+
 win32 = setup_win32(module_name, base_dir)
 
 defines = '-DRUBY_GIO2_COMPILATION'
@@ -36,15 +45,6 @@ PKGConfig.have_package('gobject-2.0') or exit 1
 
 have_func('rb_exec_recursive')
 
-["glib2"].each do |package|
-  directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
-  add_depend_package(package, "#{directory}/ext/#{package}",
-                     top_dir.to_s,
-                     :top_build_dir => top_build_dir.to_s,
-                     :target_build_dir => build_dir)
-end
-
 def try_compiler_option(opt, &block)
   checking_for "#{opt} option to compiler" do
     $CFLAGS += " #{opt}" if try_compile '', opt, &block

data/ext/gio2/gasyncinitable.c

@@ -239,6 +239,5 @@ Init_gasyncinitable(VALUE glib)
         rb_define_method(asyncinitable, "init_async", asyncinitable_init_async, -1);
         rb_define_method(asyncinitable, "init_finish", asyncinitable_init_finish, 1);
         rb_define_method(asyncinitable, "initialize", asyncinitable_initialize, -1);
-        /* TODO: Ruby name? */
         rb_define_method(asyncinitable, "initialize_finish", asyncinitable_initialize_finish, 1);
 }

data/ext/gio2/gbufferedinputstream.c

@@ -39,20 +39,6 @@ bufferedinputstream_initialize(int argc, VALUE *argv, VALUE self)
         return Qnil;
 }
 
-static VALUE
-bufferedinputstream_get_buffer_size(VALUE self)
-{
-        return GSIZE2RVAL(g_buffered_input_stream_get_buffer_size(_SELF(self)));
-}
-
-static VALUE
-bufferedinputstream_set_buffer_size(VALUE self, VALUE size)
-{
-        g_buffered_input_stream_set_buffer_size(_SELF(self), RVAL2GSIZE(size));
-
-        return self;
-}
-
 static VALUE
 bufferedinputstream_get_available(VALUE self)
 {
@@ -80,8 +66,6 @@ bufferedinputstream_peek(VALUE self, VALUE rboffset, VALUE rbcount)
                                                           RSTRING_PTR(result),
                                                           offset,
                                                           count);
-        if (bytes_peeked == (gsize)-1)
-                rb_raise(rb_eIOError, "cannot peek"); /* TODO: Better class and message */
 
         rb_str_set_len(result, bytes_peeked);
         rb_str_resize(result, bytes_peeked);
@@ -171,9 +155,6 @@ Init_gbufferedinputstream(VALUE glib)
         VALUE bufferedinputstream = G_DEF_CLASS(G_TYPE_BUFFERED_INPUT_STREAM, "BufferedInputStream", glib);
 
         rb_define_method(bufferedinputstream, "initialize", bufferedinputstream_initialize, -1);
-        rb_define_method(bufferedinputstream, "buffer_size", bufferedinputstream_get_buffer_size, 0);
-        rb_define_method(bufferedinputstream, "set_buffer_size", bufferedinputstream_set_buffer_size, 1);
-        G_DEF_SETTER(bufferedinputstream, "buffer_size");
         rb_define_method(bufferedinputstream, "available", bufferedinputstream_get_available, 0);
         rb_define_method(bufferedinputstream, "peek_buffer", bufferedinputstream_peek_buffer, 0);
         rb_define_method(bufferedinputstream, "peek", bufferedinputstream_peek, 2);

data/ext/gio2/gbufferedoutputstream.c

@@ -39,44 +39,10 @@ bufferedoutputstream_initialize(int argc, VALUE *argv, VALUE self)
         return Qnil;
 }
 
-static VALUE
-bufferedoutputstream_get_buffer_size(VALUE self)
-{
-        return GSIZE2RVAL(g_buffered_output_stream_get_buffer_size(_SELF(self)));
-}
-
-static VALUE
-bufferedoutputstream_set_buffer_size(VALUE self, VALUE size)
-{
-        g_buffered_output_stream_set_buffer_size(_SELF(self), RVAL2GSIZE(size));
-
-        return self;
-}
-
-static VALUE
-bufferedoutputstream_get_auto_grow(VALUE self)
-{
-        return CBOOL2RVAL(g_buffered_output_stream_get_auto_grow(_SELF(self)));
-}
-
-static VALUE
-bufferedoutputstream_set_auto_grow(VALUE self, VALUE grow)
-{
-        g_buffered_output_stream_set_auto_grow(_SELF(self), RVAL2CBOOL(grow));
-
-        return self;
-}
-
 void
 Init_gbufferedoutputstream(VALUE glib)
 {
         VALUE bufferedoutputstream = G_DEF_CLASS(G_TYPE_BUFFERED_OUTPUT_STREAM, "BufferedOutputStream", glib);
 
         rb_define_method(bufferedoutputstream, "initialize", bufferedoutputstream_initialize, -1);
-        rb_define_method(bufferedoutputstream, "buffer_size", bufferedoutputstream_get_buffer_size, 0);
-        rb_define_method(bufferedoutputstream, "set_buffer_size", bufferedoutputstream_set_buffer_size, 1);
-        G_DEF_SETTER(bufferedoutputstream, "buffer_size");
-        rb_define_method(bufferedoutputstream, "auto_grow", bufferedoutputstream_get_auto_grow, 0);
-        rb_define_method(bufferedoutputstream, "set_auto_grow", bufferedoutputstream_set_auto_grow, 1);
-        G_DEF_SETTER(bufferedoutputstream, "auto_grow");
 }

data/ext/gio2/gcharsetconverter.c

@@ -39,20 +39,6 @@ charsetconverter_initialize(VALUE self, VALUE to, VALUE from)
         return Qnil;
 }
 
-static VALUE
-charsetconverter_set_use_fallback(VALUE self, VALUE use_fallback)
-{
-        g_charset_converter_set_use_fallback(_SELF(self), RVAL2CBOOL(use_fallback));
-
-        return self;
-}
-
-static VALUE
-charsetconverter_get_use_fallback(VALUE self)
-{
-        return CBOOL2RVAL(g_charset_converter_get_use_fallback(_SELF(self)));
-}
-
 static VALUE
 charsetconverter_get_num_fallbacks(VALUE self)
 {
@@ -65,8 +51,5 @@ Init_gcharsetconverter(VALUE glib)
         VALUE charsetconverter = G_DEF_CLASS(G_TYPE_CHARSET_CONVERTER, "CharsetConverter", glib);
 
         rb_define_method(charsetconverter, "initialize", charsetconverter_initialize, 2);
-        rb_define_method(charsetconverter, "set_use_fallback", charsetconverter_set_use_fallback, 1);
-        G_DEF_SETTER(charsetconverter, "use_fallback");
-        rb_define_method(charsetconverter, "use_fallback?", charsetconverter_get_use_fallback, 0);
         rb_define_method(charsetconverter, "num_fallbacks", charsetconverter_get_num_fallbacks, 0);
 }

data/ext/gio2/gcontenttype.c

@@ -75,7 +75,6 @@ contenttype_guess(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
               rbdata;
         const char *filename;
         const guchar *data;
-        gsize data_size;
         gboolean result_uncertain;
         char *type;
 
@@ -87,16 +86,10 @@ contenttype_guess(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 
         filename = RVAL2CSTR_ACCEPT_NIL(rbfilename);
         data = (guchar *)RVAL2CSTR_ACCEPT_NIL(rbdata);
-        if (data != NULL) {
-                StringValue(rbdata);
-                data_size = RSTRING_LEN(rbdata);
-        } else {
-                data_size = 0;
-        }
 
         type = g_content_type_guess(filename,
                                     data,
-                                    data_size,
+                                    (gsize)((data != NULL) ? RSTRING_LEN(rbdata) : 0),
                                     &result_uncertain);
 
         return rb_assoc_new(CSTR2RVAL_FREE(type), CBOOL2RVAL(result_uncertain));

data/ext/gio2/gconverterinputstream.c

@@ -32,17 +32,10 @@ converterinputstream_initialize(VALUE self, VALUE base_stream, VALUE converter)
         return Qnil;
 }
 
-static VALUE
-converterinputstream_get_converter(VALUE self)
-{
-        return GOBJ2RVAL(g_converter_input_stream_get_converter(_SELF(self)));
-}
-
 void
 Init_gconverterinputstream(VALUE glib)
 {
         VALUE converterinputstream = G_DEF_CLASS(G_TYPE_CONVERTER_INPUT_STREAM, "ConverterInputStream", glib);
 
         rb_define_method(converterinputstream, "initialize", converterinputstream_initialize, 2);
-        rb_define_method(converterinputstream, "converter", converterinputstream_get_converter, 0);
 }

data/ext/gio2/gconverteroutputstream.c

@@ -32,17 +32,10 @@ converteroutputstream_initialize(VALUE self, VALUE base_stream, VALUE converter)
         return Qnil;
 }
 
-static VALUE
-converteroutputstream_get_converter(VALUE self)
-{
-        return GOBJ2RVAL(g_converter_output_stream_get_converter(_SELF(self)));
-}
-
 void
 Init_gconverteroutputstream(VALUE glib)
 {
         VALUE converteroutputstream = G_DEF_CLASS(G_TYPE_CONVERTER_OUTPUT_STREAM, "ConverterOutputStream", glib);
 
         rb_define_method(converteroutputstream, "initialize", converteroutputstream_initialize, 2);
-        rb_define_method(converteroutputstream, "converter", converteroutputstream_get_converter, 0);
 }