glib2 1.0.3 → 1.1.0

data/ext/glib2/rbglib_mainloop.c

@@ -1,17 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbglib_mainloop.c -
-
-  $Author: ktou $
-  $Date: 2007/10/03 11:06:01 $
-
-  Copyright (C) 2005,2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005,2006 Masao Mutoh
+ *
+ *  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"
 
 /*****************************************/
+#if !GLIB_CHECK_VERSION(2,30,0)
 GType
 g_main_loop_get_type(void)
 {
@@ -22,14 +33,16 @@ g_main_loop_get_type(void)
                     (GBoxedFreeFunc)g_main_loop_unref);
   return our_type;
 }
+#endif
 /*****************************************/
 
+#define RG_TARGET_NAMESPACE cMainLoop
 #define _SELF(s) ((GMainLoop*)RVAL2BOXED(s, G_TYPE_MAIN_LOOP))
 
 /*****************************************/
 
 static VALUE
-ml_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE context, is_running;
     GMainLoop *loop;
@@ -45,39 +58,39 @@ ml_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ml_run(VALUE self)
+rg_run(VALUE self)
 {
     g_main_loop_run(_SELF(self));
     return self;
 }
 
 static VALUE
-ml_quit(VALUE self)
+rg_quit(VALUE self)
 {
     g_main_loop_quit(_SELF(self));
     return Qnil;
 }
 
 static VALUE
-ml_is_running(VALUE self)
+rg_running_p(VALUE self)
 {
     return CBOOL2RVAL(g_main_loop_is_running(_SELF(self)));
 }
 
 static VALUE
-ml_get_context(VALUE self)
+rg_context(VALUE self)
 {
     return BOXED2RVAL(g_main_loop_get_context(_SELF(self)), G_TYPE_MAIN_CONTEXT);
 }
 
 void
-Init_glib_main_loop()
+Init_glib_main_loop(void)
 {
-    VALUE ml = G_DEF_CLASS(G_TYPE_MAIN_LOOP, "MainLoop", mGLib);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_MAIN_LOOP, "MainLoop", mGLib);
 
-    rb_define_method(ml, "initialize", ml_initialize, -1);
-    rb_define_method(ml, "run", ml_run, 0);
-    rb_define_method(ml, "quit", ml_quit, 0);
-    rb_define_method(ml, "running?", ml_is_running, 0);
-    rb_define_method(ml, "context", ml_get_context, 0);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(run, 0);
+    RG_DEF_METHOD(quit, 0);
+    RG_DEF_METHOD_P(running, 0);
+    RG_DEF_METHOD(context, 0);
 }

data/ext/glib2/rbglib_messages.c

@@ -1,19 +1,26 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbglib_messages.c -
-
-  $Author: sakai $
-  $Date: 2007/07/07 14:03:35 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-
-  This file is devided from rbgtkmain.c.
-  rbgtkmain.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 Masao Mutoh
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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"
 
@@ -25,6 +32,8 @@
 #define rb_sourceline() (ruby_sourceline)
 #endif
 
+#define RG_TARGET_NAMESPACE mLog
+
 static VALUE rbglib_log_handler_procs;
 static ID id_call;
 static gboolean log_canceled;
@@ -64,78 +73,78 @@ rbglib_log_handler(const gchar *log_domain, GLogLevelFlags log_level, const gcha
 
 /* Use Internal only */
 static VALUE
-rbglib_m_log_cancel_handler(VALUE self)
+rg_m_cancel_handler(G_GNUC_UNUSED VALUE self)
 {
     log_canceled = TRUE;
     return Qnil;
 }
 
 static VALUE
-rbglib_m_log_set_handler(VALUE self, VALUE domain, VALUE levels)
+rg_m_set_handler(VALUE self, VALUE domain, VALUE levels)
 {
-    guint handler_id = g_log_set_handler(NIL_P(domain) ? NULL : RVAL2CSTR(domain),
+    guint handler_id = g_log_set_handler(RVAL2CSTR_ACCEPT_NIL(domain),
                                          NUM2INT(levels),
                                          (GLogFunc)rbglib_log_handler, (gpointer)self);
     return UINT2NUM(handler_id);
 }
 
 static VALUE
-rbglib_m_log_remove_handler(VALUE self, VALUE domain, VALUE handler_id)
+rg_m_remove_handler(VALUE self, VALUE domain, VALUE handler_id)
 {
-    g_log_remove_handler(NIL_P(domain) ? NULL : RVAL2CSTR(domain),
+    g_log_remove_handler(RVAL2CSTR_ACCEPT_NIL(domain),
                          NUM2UINT(handler_id));
     G_REMOVE_RELATIVE(self, handler_id, rbglib_log_handler_procs);
     return Qnil;
 }
 
 static VALUE
-rbglib_m_log_set_always_fatal(VALUE self, VALUE fatal_mask)
+rg_m_set_always_fatal(G_GNUC_UNUSED VALUE self, VALUE fatal_mask)
 {
     return INT2NUM(g_log_set_always_fatal(NUM2INT(fatal_mask)));
 }
 
 static VALUE
-rbglib_m_log_set_fatal_mask(VALUE self, VALUE domain, VALUE fatal_mask)
+rg_m_set_fatal_mask(G_GNUC_UNUSED VALUE self, VALUE domain, VALUE fatal_mask)
 {
-    return INT2NUM(g_log_set_fatal_mask(NIL_P(domain) ? NULL : RVAL2CSTR(domain),
+    return INT2NUM(g_log_set_fatal_mask(RVAL2CSTR_ACCEPT_NIL(domain),
                                         NUM2INT(fatal_mask)));
 }
 
 static VALUE
-rbglib_m_log(VALUE self, VALUE domain, VALUE level, VALUE str)
+rg_m_log(G_GNUC_UNUSED VALUE self, VALUE domain, VALUE level, VALUE str)
 {
-    g_log(NIL_P(domain) ? NULL : RVAL2CSTR(domain), NUM2INT(level), RVAL2CSTR(str), NULL);
+    g_log(RVAL2CSTR_ACCEPT_NIL(domain), NUM2INT(level), "%s", RVAL2CSTR(str));
     return Qnil;
 }
 
 void
-Init_glib_messages()
+Init_glib_messages(void)
 {
-    VALUE mGLog = rb_define_module_under(mGLib, "Log");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "Log");
 
     id_call = rb_intern("call");
     log_canceled = FALSE;
 
     rb_global_variable(&rbglib_log_handler_procs);
     rbglib_log_handler_procs = rb_hash_new();
-    rb_define_module_function(mGLog, "set_handler", rbglib_m_log_set_handler, 2);
-    rb_define_module_function(mGLog, "remove_handler", rbglib_m_log_remove_handler, 2);
-    rb_define_module_function(mGLog, "cancel_handler", rbglib_m_log_cancel_handler, 0);
-    rb_define_module_function(mGLog, "set_always_fatal", rbglib_m_log_set_always_fatal, 1);
-    rb_define_module_function(mGLog, "set_fatal_mask", rbglib_m_log_set_fatal_mask, 2);
-    rb_define_module_function(mGLog, "log", rbglib_m_log, 3);
+    RG_DEF_MODFUNC(set_handler, 2);
+    RG_DEF_MODFUNC(remove_handler, 2);
+    RG_DEF_MODFUNC(cancel_handler, 0);
+    RG_DEF_MODFUNC(set_always_fatal, 1);
+    RG_DEF_MODFUNC(set_fatal_mask, 2);
+    RG_DEF_MODFUNC(log, 3);
 
-    rb_define_const(mGLog, "FATAL_MASK", INT2NUM(G_LOG_FATAL_MASK));
-    rb_define_const(mGLog, "LEVEL_USER_SHIFT", INT2NUM(G_LOG_LEVEL_USER_SHIFT));
+    rb_define_const(RG_TARGET_NAMESPACE, "FATAL_MASK", INT2NUM(G_LOG_FATAL_MASK));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_USER_SHIFT", INT2NUM(G_LOG_LEVEL_USER_SHIFT));
 
     /* GLogLevelFlags */
-    rb_define_const(mGLog, "FLAG_RECURSION", INT2NUM(G_LOG_FLAG_RECURSION));
-    rb_define_const(mGLog, "FLAG_FATAL", INT2NUM(G_LOG_FLAG_FATAL));
-    rb_define_const(mGLog, "LEVEL_ERROR", INT2NUM(G_LOG_LEVEL_ERROR));
-    rb_define_const(mGLog, "LEVEL_CRITICAL", INT2NUM(G_LOG_LEVEL_CRITICAL));
-    rb_define_const(mGLog, "LEVEL_WARNING", INT2NUM(G_LOG_LEVEL_WARNING));
-    rb_define_const(mGLog, "LEVEL_MESSAGE", INT2NUM(G_LOG_LEVEL_MESSAGE));
-    rb_define_const(mGLog, "LEVEL_INFO", INT2NUM(G_LOG_LEVEL_INFO));
-    rb_define_const(mGLog, "LEVEL_DEBUG", INT2NUM(G_LOG_LEVEL_DEBUG));
-    rb_define_const(mGLog, "LEVEL_MASK", INT2NUM(G_LOG_LEVEL_MASK));
+    rb_define_const(RG_TARGET_NAMESPACE, "FLAG_RECURSION", INT2NUM(G_LOG_FLAG_RECURSION));
+    rb_define_const(RG_TARGET_NAMESPACE, "FLAG_FATAL", INT2NUM(G_LOG_FLAG_FATAL));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_ERROR", INT2NUM(G_LOG_LEVEL_ERROR));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_CRITICAL", INT2NUM(G_LOG_LEVEL_CRITICAL));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_WARNING", INT2NUM(G_LOG_LEVEL_WARNING));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_MESSAGE", INT2NUM(G_LOG_LEVEL_MESSAGE));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_INFO", INT2NUM(G_LOG_LEVEL_INFO));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_DEBUG", INT2NUM(G_LOG_LEVEL_DEBUG));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEVEL_MASK", INT2NUM(G_LOG_LEVEL_MASK));
 }

data/ext/glib2/rbglib_pollfd.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbglib_pollfd.c -
-
-  $Author: mutoh $
-  $Date: 2005/03/12 18:03:56 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005  Masao Mutoh
+ *
+ *  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"
 
@@ -35,10 +45,11 @@ g_poll_fd_get_type(void)
 }
 /*****************************************/
 
+#define RG_TARGET_NAMESPACE cPollFD
 #define _SELF(s) ((GPollFD*)RVAL2BOXED(s, G_TYPE_POLL_FD))
 
 static VALUE
-poll_initialize(VALUE self, VALUE fd, VALUE events, VALUE revents)
+rg_initialize(VALUE self, VALUE fd, VALUE events, VALUE revents)
 {
     GPollFD gfd;
     gfd.fd = NUM2INT(fd);
@@ -50,55 +61,55 @@ poll_initialize(VALUE self, VALUE fd, VALUE events, VALUE revents)
 }
 
 static VALUE
-poll_set_fd(VALUE self, VALUE fd)
+rg_set_fd(VALUE self, VALUE fd)
 {
     _SELF(self)->fd = fd;
     return self;
 }
 static VALUE
-poll_fd(VALUE self)
+rg_fd(VALUE self)
 {
     return INT2NUM(_SELF(self)->fd);
 }
 
 static VALUE
-poll_set_events(VALUE self, VALUE events)
+rg_set_events(VALUE self, VALUE events)
 {
     _SELF(self)->events = events;
     return self;
 }
 static VALUE
-poll_events(VALUE self)
+rg_events(VALUE self)
 {
     return INT2NUM(_SELF(self)->events);
 }
 
 static VALUE
-poll_set_revents(VALUE self, VALUE revents)
+rg_set_revents(VALUE self, VALUE revents)
 {
     _SELF(self)->revents = revents;
     return self;
 }
 static VALUE
-poll_revents(VALUE self)
+rg_revents(VALUE self)
 {
     return INT2NUM(_SELF(self)->revents);
 }
 
 void
-Init_glib_poll_fd()
+Init_glib_poll_fd(void)
 {
-    VALUE fd = G_DEF_CLASS(G_TYPE_POLL_FD, "PollFD", mGLib); 
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(G_TYPE_POLL_FD, "PollFD", mGLib); 
 
-    rb_define_method(fd, "initialize", poll_initialize, 3);
+    RG_DEF_METHOD(initialize, 3);
 
-    rb_define_method(fd, "set_fd", poll_set_fd, 1);
-    rb_define_method(fd, "fd", poll_fd, 0);
-    rb_define_method(fd, "set_events", poll_set_events, 1);
-    rb_define_method(fd, "events", poll_events, 0);
-    rb_define_method(fd, "set_revents", poll_set_revents, 1);
-    rb_define_method(fd, "revents", poll_revents, 0);
+    RG_DEF_METHOD(set_fd, 1);
+    RG_DEF_METHOD(fd, 0);
+    RG_DEF_METHOD(set_events, 1);
+    RG_DEF_METHOD(events, 0);
+    RG_DEF_METHOD(set_revents, 1);
+    RG_DEF_METHOD(revents, 0);
 
-    G_DEF_SETTERS(fd);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
 }

data/ext/glib2/rbglib_shell.c

@@ -1,18 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbglib_shell.c -
-
-  $Author: mutoh $
-  $Date: 2005/10/14 19:10:08 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005  Masao Mutoh
+ *
+ *  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 mShell
+
 static VALUE
-shell_parse(VALUE self, VALUE command_line)
+rg_m_parse(G_GNUC_UNUSED VALUE self, VALUE command_line)
 {
     gint argc;
     gchar **argv;
@@ -25,13 +37,13 @@ shell_parse(VALUE self, VALUE command_line)
 }
 
 static VALUE
-shell_quote(VALUE self, VALUE unquoted_string)
+rg_m_quote(G_GNUC_UNUSED VALUE self, VALUE unquoted_string)
 {
     return CSTR2RVAL_FREE(g_shell_quote(RVAL2CSTR(unquoted_string)));
 }
 
 static VALUE
-shell_unquote(VALUE self, VALUE quoted_string)
+rg_m_unquote(G_GNUC_UNUSED VALUE self, VALUE quoted_string)
 {
     GError *error = NULL;
     gchar *str = g_shell_unquote(RVAL2CSTR(quoted_string), &error);
@@ -42,16 +54,11 @@ shell_unquote(VALUE self, VALUE quoted_string)
 }
 
 void
-Init_glib_shell()
+Init_glib_shell(void)
 {
-    VALUE mShell = rb_define_module_under(mGLib, "Shell");
-    VALUE cShellError = G_DEF_ERROR2(G_SHELL_ERROR, "ShellError", mGLib, rb_eRuntimeError);
-
-    rb_define_module_function(mShell, "parse", shell_parse, 1);
-    rb_define_module_function(mShell, "quote", shell_quote, 1);
-    rb_define_module_function(mShell, "unquote", shell_unquote, 1);
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGLib, "Shell");
 
-    rb_define_const(cShellError, "BAD_QUOTING", INT2FIX(G_SHELL_ERROR_BAD_QUOTING));
-    rb_define_const(cShellError, "EMPTY_STRING", INT2FIX(G_SHELL_ERROR_EMPTY_STRING));
-    rb_define_const(cShellError, "FAILED", INT2FIX(G_SHELL_ERROR_FAILED));
+    RG_DEF_MODFUNC(parse, 1);
+    RG_DEF_MODFUNC(quote, 1);
+    RG_DEF_MODFUNC(unquote, 1);
 }