glib2 1.0.3 → 1.1.0

data/ext/glib2/rbglib_win32.c

@@ -1,28 +1,39 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbglib_win32.c -
-
-  $Author: mutoh $
-  $Date: 2006/12/26 15:49:16 $
-
-  Copyright (C) 2006 Kouhei Sutou
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Kouhei Sutou
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "rbgprivate.h"
 #include "rbglib.h"
-#include <glib/gwin32.h>
 
 #ifdef G_OS_WIN32
+
+#define RG_TARGET_NAMESPACE mWin32
+
 static VALUE
-rbglib_m_win32_error_message(VALUE self, VALUE error)
+rg_m_error_message(VALUE self, VALUE error)
 {
     return CSTR2RVAL_FREE(g_win32_error_message(NUM2INT(error)));
 }
 
 static VALUE
-rbglib_m_win32_locale(VALUE self)
+rg_m_locale(VALUE self)
 {
     return CSTR2RVAL_FREE(g_win32_getlocale());
 }
@@ -30,36 +41,36 @@ rbglib_m_win32_locale(VALUE self)
 static VALUE
 rbglib_m_win32_locale_deprecated(VALUE self)
 {
-	rb_warn("GLib.win32_locale() is deprecated. Use GLib::Win32.locale instead");
-	return rbglib_m_win32_locale(self);
+    rb_warn("GLib.win32_locale() is deprecated. Use GLib::Win32.locale instead");
+    return rg_m_locale(self);
 }
 
 static VALUE
-rbglib_m_win32_get_package_installation_directory(VALUE self, VALUE package, VALUE dll_name)
+rg_m_get_package_installation_directory(VALUE self, VALUE package, VALUE dll_name)
 {
-	return CSTR2RVAL_FREE(g_win32_get_package_installation_directory(RVAL2CSTR(package), 
-	                                                            RVAL2CSTR(dll_name)));
+    return CSTR2RVAL_FREE(g_win32_get_package_installation_directory(RVAL2CSTR(package), 
+                                                                RVAL2CSTR(dll_name)));
 }
 
 static VALUE
-rbglib_m_get_package_installation_subdirectory(VALUE self, VALUE package, VALUE dll_name, VALUE subdir)
+rg_m_get_package_installation_subdirectory(VALUE self, VALUE package, VALUE dll_name, VALUE subdir)
 {
-	return CSTR2RVAL_FREE(g_win32_get_package_installation_subdirectory(RVAL2CSTR(package), 
-	                                                                RVAL2CSTR(dll_name),
-	                                                                RVAL2CSTR(subdir)));
+    return CSTR2RVAL_FREE(g_win32_get_package_installation_subdirectory(RVAL2CSTR(package), 
+                                                                    RVAL2CSTR(dll_name),
+                                                                    RVAL2CSTR(subdir)));
 }
 
 #if GLIB_CHECK_VERSION(2,6,0)
 static VALUE
-rbglib_m_get_windows_version(VALUE self)
+rg_m_version(VALUE self)
 {
-	return UINT2NUM(g_win32_get_windows_version());
+    return UINT2NUM(g_win32_get_windows_version());
 }
 #endif
 
 #if GLIB_CHECK_VERSION(2,8,0)
 static VALUE
-rbglib_m_win32_locale_filename_from_utf8(VALUE self, VALUE utf8_filename)
+rg_m_locale_filename_from_utf8(VALUE self, VALUE utf8_filename)
 {
     return CSTR2RVAL_FREE(g_win32_locale_filename_from_utf8(RVAL2CSTR(utf8_filename)));
 }
@@ -68,17 +79,17 @@ static VALUE
 rbglib_m_win32_locale_filename_from_utf8_deprecated(VALUE self,
                                                     VALUE utf8_filename)
 {
-	rb_warn("GLib.win32_locale_filename_from_utf8() is deprecated. Use GLib::Win32.locale_filename_from_utf8 instead");
-	return rbglib_m_win32_locale_filename_from_utf8(self, utf8_filename);
+    rb_warn("GLib.win32_locale_filename_from_utf8() is deprecated. Use GLib::Win32.locale_filename_from_utf8 instead");
+    return rg_m_locale_filename_from_utf8(self, utf8_filename);
 }
 
 #endif
 
 #  if GLIB_CHECK_VERSION(2, 16, 0)
 static VALUE
-rbglib_m_win32_get_package_installation_directory_of_module(int argc,
-							    VALUE *argv,
-							    VALUE self)
+rg_m_get_package_installation_directory_of_module(int argc,
+                                VALUE *argv,
+                                VALUE self)
 {
     VALUE rb_module;
     gchar *directory;
@@ -86,9 +97,9 @@ rbglib_m_win32_get_package_installation_directory_of_module(int argc,
 
     rb_scan_args(argc, argv, "01", &rb_module);
     if (NIL_P(rb_module))
-	hmodule = NULL;
+        hmodule = NULL;
     else
-	hmodule = GINT_TO_POINTER(NUM2INT(rb_module));
+        hmodule = GINT_TO_POINTER(NUM2INT(rb_module));
 
     directory = g_win32_get_package_installation_directory_of_module(hmodule);
     return CSTR2RVAL_FREE(directory);
@@ -97,33 +108,29 @@ rbglib_m_win32_get_package_installation_directory_of_module(int argc,
 #endif
 
 void
-Init_glib_win32()
+Init_glib_win32(void)
 {
 #ifdef G_OS_WIN32
     /* glib/gwin32.h */
-    VALUE mWin32 = rb_define_module_under(mGLib, "Win32");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "Win32");
 
-    rb_define_module_function(mWin32, "error_message", rbglib_m_win32_error_message, 1);
-    rb_define_module_function(mWin32, "locale", rbglib_m_win32_locale, 0);
-    rb_define_module_function(mWin32, "get_package_installation_directory", rbglib_m_win32_get_package_installation_directory, 2);
-    rb_define_module_function(mWin32, "get_package_installation_subdirectory", rbglib_m_get_package_installation_subdirectory, 3);
-    rb_define_module_function(mWin32, "version", rbglib_m_get_windows_version, 0);
+    RG_DEF_MODFUNC(error_message, 1);
+    RG_DEF_MODFUNC(locale, 0);
+    RG_DEF_MODFUNC(get_package_installation_directory, 2);
+    RG_DEF_MODFUNC(get_package_installation_subdirectory, 3);
+    RG_DEF_MODFUNC(version, 0);
     /* Deprecated */
     rb_define_module_function(mGLib, "win32_locale", rbglib_m_win32_locale_deprecated, 0);
 
 #  if GLIB_CHECK_VERSION(2,8,0)
-    rb_define_module_function(mWin32, "locale_filename_from_utf8",
-                              rbglib_m_win32_locale_filename_from_utf8, 1);
+    RG_DEF_MODFUNC(locale_filename_from_utf8, 1);
     /* Deprecated */
     rb_define_module_function(mGLib, "win32_locale_filename_from_utf8",
                               rbglib_m_win32_locale_filename_from_utf8_deprecated, 1);
 #  endif
 
 #  if GLIB_CHECK_VERSION(2, 16, 0)
-    rb_define_module_function(mWin32,
-			      "get_package_installation_directory_of_module",
-			      rbglib_m_win32_get_package_installation_directory_of_module,
-			      -1);
+    RG_DEF_MODFUNC(get_package_installation_directory_of_module, -1);
 #  endif
 #endif
 }

data/ext/glib2/rbglibdeprecated.c

@@ -0,0 +1,56 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003  Masahiro Sakai
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbgprivate.h"
+
+static VALUE
+rbg_filename_gslist_to_array_free_body(VALUE list)
+{
+    VALUE ary = rb_ary_new();
+    GSList *p;
+
+    for (p = (GSList *)list; p != NULL; p = g_slist_next(p))
+        rb_ary_push(ary, CSTRFILENAME2RVAL(p->data));
+
+    return ary;
+}
+
+static VALUE
+rbg_filename_gslist_to_array_free_ensure(VALUE val)
+{
+    GSList *list = (GSList *)val;
+    GSList *p;
+
+    for (p = list; p != NULL; p = g_slist_next(p))
+        g_free((gchar *)p->data);
+
+    g_slist_free(list);
+
+    return Qnil;
+}
+
+VALUE
+rbg_filename_gslist_to_array_free(GSList *list)
+{
+    return rb_ensure(rbg_filename_gslist_to_array_free_body, (VALUE)list,
+                     rbg_filename_gslist_to_array_free_ensure, (VALUE)list);
+}
+

data/ext/glib2/rbglibdeprecated.h

@@ -0,0 +1,34 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005  Ruby-GNOME2 Project
+ *  Copyright (C) 2002,2003  Masahiro Sakai
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#ifndef __RBGLIBDEPRECATED_H__
+#define __RBGLIBDEPRECATED_H__
+
+G_BEGIN_DECLS
+
+#define CSTRFILENAMEARRAY2RVAL_FREE(s) (rbg_filename_gslist_to_array_free(s))
+
+extern VALUE rbg_filename_gslist_to_array_free(GSList *list);
+
+G_END_DECLS
+
+#endif /* __RBGLIBDEPRECATED_H__ */

data/ext/glib2/rbgobj_boxed.c

@@ -1,19 +1,29 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_boxed.c -
-
-  $Author: sakai $
-  $Date: 2007/07/14 13:33:07 $
-  created at: Sat Jul 27 16:56:01 JST 2002
-
-  Copyright (C) 2002,2003  Masahiro Sakai
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003  Masahiro Sakai
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "rbgprivate.h"
 
-VALUE rbgobj_cBoxed;
+#define RG_TARGET_NAMESPACE rbgobj_cBoxed
+
+VALUE RG_TARGET_NAMESPACE;
 
 static void
 boxed_mark(boxed_holder *holder)
@@ -61,15 +71,15 @@ rbgobj_boxed_s_allocate(VALUE klass)
     return result;
 }
 
-static VALUE
-rbgobj_boxed_init(VALUE self)
+static G_GNUC_NORETURN VALUE
+rg_initialize(VALUE self)
 {
     rb_raise(rb_eTypeError, "can't initialize %s",
              rb_class2name(CLASS_OF(self)));
 }
 
 static VALUE
-rbgobj_boxed_inspect(VALUE self)
+rg_inspect(VALUE self)
 {
     boxed_holder* holder;
     gchar* s;
@@ -90,7 +100,7 @@ rbgobj_boxed_inspect(VALUE self)
 }
 
 static VALUE
-rbgobj_boxed_init_copy(VALUE self, VALUE orig)
+rg_initialize_copy(VALUE self, VALUE orig)
 {
     boxed_holder* holder1;
     boxed_holder* holder2;
@@ -98,7 +108,7 @@ rbgobj_boxed_init_copy(VALUE self, VALUE orig)
     if (self == orig) return self;
 
     if (!rb_obj_is_instance_of(orig, rb_obj_class(self))) {
-	rb_raise(rb_eTypeError, "wrong argument class");
+        rb_raise(rb_eTypeError, "wrong argument class");
     }
 
     Data_Get_Struct(self, boxed_holder, holder1);
@@ -160,12 +170,12 @@ rbgobj_make_boxed(gpointer p, GType gtype)
 
     if (!p)
         return Qnil;
-    
+
     cinfo = GTYPE2CINFO(gtype);
     result = rbgobj_boxed_s_allocate(cinfo->klass);
-    
+
     Data_Get_Struct(result, boxed_holder, holder);
-    
+
     if (cinfo->flags & RBGOBJ_BOXED_NOT_COPY){
         holder->boxed = p;
         holder->own   = FALSE;
@@ -219,21 +229,18 @@ boxed_from_ruby(VALUE from, GValue* to)
 /**********************************************************************/
 
 void
-Init_gobject_gboxed()
+Init_gobject_gboxed(void)
 {
-    VALUE gBoxed;
-
-    rbgobj_cBoxed = G_DEF_CLASS(G_TYPE_BOXED, "Boxed", mGLib);
-    gBoxed = rbgobj_cBoxed;
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_BOXED, "Boxed", mGLib);
 
     rbgobj_register_g2r_func(G_TYPE_BOXED, boxed_to_ruby);
     rbgobj_register_r2g_func(G_TYPE_BOXED, boxed_from_ruby);
 
-    rb_define_alloc_func(gBoxed, (VALUE(*)_((VALUE)))rbgobj_boxed_s_allocate);
-    rb_define_singleton_method(gBoxed, "gtype", generic_s_gtype, 0);
-    rb_define_method(gBoxed, "gtype", generic_gtype, 0);
-    rb_define_method(gBoxed, "initialize", rbgobj_boxed_init, 0);
-    rb_define_method(gBoxed, "inspect", rbgobj_boxed_inspect, 0);
-    rb_define_method(gBoxed, "initialize_copy", rbgobj_boxed_init_copy, 1);
-    rb_define_alias(gBoxed, "copy", "dup");
-}
+    rb_define_alloc_func(RG_TARGET_NAMESPACE, (VALUE(*)_((VALUE)))rbgobj_boxed_s_allocate);
+    rb_define_singleton_method(RG_TARGET_NAMESPACE, "gtype", generic_s_gtype, 0);
+    rb_define_method(RG_TARGET_NAMESPACE, "gtype", generic_gtype, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(inspect, 0);
+    RG_DEF_METHOD(initialize_copy, 1);
+    RG_DEF_ALIAS("copy", "dup");
+}

data/ext/glib2/rbgobj_closure.c

@@ -1,18 +1,29 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/**********************************************************************
-
-  rbgobj_closure.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:06 $
-
-  Copyright (C) 2002-2006  Ruby-GNOME2 Project
-  Copyright (C) 2002,2003  Masahiro Sakai
-
-**********************************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2006  Ruby-GNOME2 Project
+ *  Copyright (C) 2002,2003  Masahiro Sakai
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "rbgprivate.h"
 
+#define RG_TARGET_NAMESPACE cClosure
+
 static ID id_call, id_closures;
 static gboolean rclosure_initialized = FALSE;
 
@@ -148,15 +159,14 @@ rclosure_unref(GRClosure *rclosure)
         g_list_free(rclosure->objects);
         rclosure->objects = NULL;
         if (!NIL_P(rclosure->rb_holder)) {
-            RDATA(rclosure->rb_holder)->dmark = NULL;
-            RDATA(rclosure->rb_holder)->dfree = NULL;
+            DATA_PTR(rclosure->rb_holder) = NULL;
             rclosure->rb_holder = Qnil;
         }
     }
 }
 
 static void
-rclosure_invalidate(gpointer data, GClosure* closure)
+rclosure_invalidate(G_GNUC_UNUSED gpointer data, GClosure *closure)
 {
     GRClosure *rclosure = (GRClosure*)closure;
 
@@ -178,6 +188,9 @@ rclosure_invalidate(gpointer data, GClosure* closure)
 static void
 gr_closure_holder_mark(GRClosure *rclosure)
 {
+    if (!rclosure)
+        return;
+
     rb_gc_mark(rclosure->callback);
     rb_gc_mark(rclosure->extra_args);
 }
@@ -185,6 +198,9 @@ gr_closure_holder_mark(GRClosure *rclosure)
 static void
 gr_closure_holder_free(GRClosure *rclosure)
 {
+    if (!rclosure)
+        return;
+
     if (rclosure->count > 0) {
         rclosure->count = 1;
 
@@ -264,13 +280,13 @@ g_rclosure_set_tag(GClosure *closure, const gchar *tag)
 }
 
 static void
-rclosure_end_proc(VALUE _)
+rclosure_end_proc(G_GNUC_UNUSED VALUE _)
 {
     rclosure_initialized = FALSE;
 }
 
 static void
-Init_rclosure()
+init_rclosure(void)
 {
     id_call = rb_intern("call");
     id_closures = rb_intern("closures");
@@ -281,7 +297,7 @@ Init_rclosure()
 /**********************************************************************/
 
 static VALUE
-closure_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     GClosure* closure = g_rclosure_new(rb_block_proc(), Qnil, NULL);
     G_INITIALIZE(self, closure);
@@ -290,43 +306,38 @@ closure_initialize(VALUE self)
 }
 
 static VALUE
-closure_in_marshal(VALUE self)
+rg_in_marshal_p(VALUE self)
 {
     GClosure* closure = RVAL2BOXED(self, G_TYPE_CLOSURE);
     return CBOOL2RVAL(closure->in_marshal);
 }
 
 static VALUE
-closure_is_invalid(VALUE self)
+rg_invalid_p(VALUE self)
 {
     GClosure* closure = RVAL2BOXED(self, G_TYPE_CLOSURE);
     return CBOOL2RVAL(closure->is_invalid);
 }
 
 static VALUE
-closure_invalidate(VALUE self)
+rg_invalidate(VALUE self)
 {
     GClosure* closure = RVAL2BOXED(self, G_TYPE_CLOSURE);
     g_closure_invalidate(closure);
     return self;
 }
 
-static void
-Init_closure()
-{
-    VALUE cClosure = G_DEF_CLASS(G_TYPE_CLOSURE, "Closure", mGLib);
-    rb_define_method(cClosure, "initialize", closure_initialize, 0);
-    rb_define_method(cClosure, "in_marshal?", closure_in_marshal, 0);
-    rb_define_method(cClosure, "invalid?", closure_is_invalid, 0);
-    rb_define_method(cClosure, "invalidate", closure_invalidate, 0);
-}
-
 /**********************************************************************/
 
 void
-Init_gobject_gclosure()
+Init_gobject_gclosure(void)
 {
-    Init_rclosure();
-    Init_closure();
-}
+    init_rclosure();
 
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_CLOSURE, "Closure", mGLib);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD_P(in_marshal, 0);
+    RG_DEF_METHOD_P(invalid, 0);
+    RG_DEF_METHOD(invalidate, 0);
+}