gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtktreedragdest.c

@@ -1,19 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtktreedragdest.c -
-
-  $Author: mutoh $
-
-  $Date: 2003/07/11 19:39:08 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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 "global.h"
 
 void
-Init_gtk_treedragdest()
+Init_gtk_treedragdest(VALUE mGtk)
 {
     G_DEF_INTERFACE(GTK_TYPE_TREE_DRAG_DEST, "TreeDragDest", mGtk);
 }

data/ext/gtk2/rbgtktreedragsource.c

@@ -1,19 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtktreedragsource.c -
-
-  $Author: mutoh $
-
-  $Date: 2003/07/11 19:39:08 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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 "global.h"
 
 void
-Init_gtk_treedragsource()
+Init_gtk_treedragsource(VALUE mGtk)
 {
     G_DEF_INTERFACE(GTK_TYPE_TREE_DRAG_SOURCE, "TreeDragSource", mGtk);
 }

data/ext/gtk2/rbgtktreeiter.c

@@ -1,17 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtktreeiter.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:10 $
-
-  Copyright (C) 2002-2004 Ruby-GNOME2 Project Team
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2004 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 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 "global.h"
 
+#define RG_TARGET_NAMESPACE cTreeIter
 #define _SELF(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 
 void
@@ -22,7 +33,7 @@ rbgtk_register_treeiter_set_value_func(GType gtype, rbgtkiter_set_value_func fun
 }
 
 static VALUE
-treeiter_first(VALUE self)
+rg_first_bang(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -32,7 +43,7 @@ treeiter_first(VALUE self)
 }
 
 static VALUE
-treeiter_next(VALUE self)
+rg_next_bang(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -46,9 +57,9 @@ treeiter_next(VALUE self)
 }
 
 static VALUE
-treeiter_get_value(VALUE self, VALUE column)
+rg_get_value(VALUE self, VALUE column)
 {
-    GValue value = {0, };
+    GValue value = G_VALUE_INIT;
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
     VALUE ret = Qnil;
@@ -62,7 +73,7 @@ treeiter_get_value(VALUE self, VALUE column)
 }
 
 static VALUE
-treeiter_children(VALUE self)
+rg_first_child(VALUE self)
 {
     GtkTreeIter child;
     GtkTreeIter* iter = _SELF(self);
@@ -73,7 +84,7 @@ treeiter_children(VALUE self)
 }
 
 static VALUE
-treeiter_get_path(VALUE self)
+rg_path(VALUE self)
 {
     VALUE retval = Qnil;
     GtkTreeIter* iter = _SELF(self);
@@ -85,7 +96,7 @@ treeiter_get_path(VALUE self)
 }
 
 static VALUE
-treeiter_has_child(VALUE self)
+rg_has_child_p(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -93,7 +104,7 @@ treeiter_has_child(VALUE self)
 }
 
 static VALUE
-treeiter_n_children(VALUE self)
+rg_n_children(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -101,7 +112,7 @@ treeiter_n_children(VALUE self)
 }
 
 static VALUE
-treeiter_nth_child(VALUE self, VALUE n)
+rg_nth_child(VALUE self, VALUE n)
 {
     GtkTreeIter child;
     GtkTreeIter* iter = _SELF(self);
@@ -112,7 +123,7 @@ treeiter_nth_child(VALUE self, VALUE n)
 }
 
 static VALUE
-treeiter_parent(VALUE self)
+rg_parent(VALUE self)
 {
     GtkTreeIter parent;
     GtkTreeIter* iter = _SELF(self);
@@ -123,7 +134,7 @@ treeiter_parent(VALUE self)
 }
 
 static VALUE
-treeiter_set_value(VALUE self, VALUE column, VALUE value)
+rg_set_value(VALUE self, VALUE column, VALUE value)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -131,7 +142,7 @@ treeiter_set_value(VALUE self, VALUE column, VALUE value)
     VALUE obj = rb_hash_aref(treeiter_set_value_table, INT2NUM(G_TYPE_FROM_INSTANCE(model)));
     rbgtkiter_set_value_func func;
     GType gtype = gtk_tree_model_get_column_type(model, NUM2INT(column));
-    GValue gval = {0,};
+    GValue gval = G_VALUE_INIT;
 
     if (NIL_P(obj))
         rb_raise(rb_eTypeError, "Gtk::TreeModel is invalid.");
@@ -147,14 +158,14 @@ treeiter_set_value(VALUE self, VALUE column, VALUE value)
 }
 
 static VALUE
-treeiter_set_value_eql(VALUE self, VALUE column, VALUE value)
+rg_operator_treeiter_set_value_eql(VALUE self, VALUE column, VALUE value)
 {
-    treeiter_set_value(self, column, value);
+    rg_set_value(self, column, value);
     return value;
 }
 
 static VALUE
-treeiter_eql(VALUE self, VALUE other)
+rg_operator_treeiter_eql(VALUE self, VALUE other)
 {
     gint i, num1, num2;
     GtkTreeIter* iter1 = _SELF(self);
@@ -189,12 +200,12 @@ treeiter_eql(VALUE self, VALUE other)
     }
 
     for (i = 0; i < num1; i++){
-        GValue gval1 = {0,};
-        GValue gval2 = {0,};
+        GValue gval1 = G_VALUE_INIT;
+        GValue gval2 = G_VALUE_INIT;
         VALUE ret1, ret2;
         gtk_tree_model_get_value(model1, iter1, i, &gval1);
         gtk_tree_model_get_value(model2, iter2, i, &gval2);
-        
+
         ret1 = GVAL2RVAL(&gval1);
         ret2 = GVAL2RVAL(&gval2);
         g_value_unset(&gval1);
@@ -207,7 +218,7 @@ treeiter_eql(VALUE self, VALUE other)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-treeiter_to_string(VALUE self)
+rg_to_str(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -220,25 +231,25 @@ treeiter_to_string(VALUE self)
 #endif
 
 void 
-Init_gtk_treeiter()
+Init_gtk_treeiter(VALUE mGtk)
 {
-    VALUE gTreeIter = G_DEF_CLASS(GTK_TYPE_TREE_ITER, "TreeIter", mGtk);
-
-    rb_define_method(gTreeIter, "first!", treeiter_first, 0);
-    rb_define_method(gTreeIter, "next!", treeiter_next, 0);
-    rb_define_method(gTreeIter, "get_value", treeiter_get_value, 1);
-    rb_define_alias(gTreeIter, "[]", "get_value");
-    rb_define_method(gTreeIter, "first_child", treeiter_children, 0);
-    rb_define_method(gTreeIter, "path", treeiter_get_path, 0);
-    rb_define_method(gTreeIter, "has_child?", treeiter_has_child, 0);
-    rb_define_method(gTreeIter, "n_children", treeiter_n_children, 0);
-    rb_define_method(gTreeIter, "nth_child", treeiter_nth_child, 1);
-    rb_define_method(gTreeIter, "parent", treeiter_parent, 0);
-    rb_define_method(gTreeIter, "set_value", treeiter_set_value, 2);
-    rb_define_method(gTreeIter, "[]=", treeiter_set_value_eql, 2);
-    rb_define_method(gTreeIter, "==", treeiter_eql, 1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TREE_ITER, "TreeIter", mGtk);
+
+    RG_DEF_METHOD_BANG(first, 0);
+    RG_DEF_METHOD_BANG(next, 0);
+    RG_DEF_METHOD(get_value, 1);
+    RG_DEF_ALIAS("[]", "get_value");
+    RG_DEF_METHOD(first_child, 0);
+    RG_DEF_METHOD(path, 0);
+    RG_DEF_METHOD_P(has_child, 0);
+    RG_DEF_METHOD(n_children, 0);
+    RG_DEF_METHOD(nth_child, 1);
+    RG_DEF_METHOD(parent, 0);
+    RG_DEF_METHOD(set_value, 2);
+    RG_DEF_METHOD_OPERATOR("[]=", treeiter_set_value_eql, 2);
+    RG_DEF_METHOD_OPERATOR("==", treeiter_eql, 1);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gTreeIter, "to_str", treeiter_to_string, 0);
-    rb_define_alias(gTreeIter, "to_s", "to_str");
+    RG_DEF_METHOD(to_str, 0);
+    RG_DEF_ALIAS("to_s", "to_str");
 #endif
 }

data/ext/gtk2/rbgtktreemodel.c

@@ -1,39 +1,50 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtktreemodel.c -
-
-  $Author: mutoh $
-  $Date: 2005/11/06 04:44:24 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 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 "global.h"
 
+#define RG_TARGET_NAMESPACE mTreeModel
 #define _SELF(s) (GTK_TREE_MODEL(RVAL2GOBJ(s)))
 
 static VALUE
-treemodel_get_flags(VALUE self)
+rg_flags(VALUE self)
 {
     return GFLAGS2RVAL(gtk_tree_model_get_flags(_SELF(self)), GTK_TYPE_TREE_MODEL_FLAGS);
 }
 
 static VALUE
-treemodel_get_n_columns(VALUE self)
+rg_n_columns(VALUE self)
 {
     return INT2NUM(gtk_tree_model_get_n_columns(_SELF(self)));
 }
 
 static VALUE
-treemodel_get_column_type(VALUE self, VALUE index)
+rg_get_column_type(VALUE self, VALUE index)
 {
     return GTYPE2CLASS(gtk_tree_model_get_column_type(_SELF(self), 
                                                       NUM2INT(index)));
 }
 
 static VALUE
-treemodel_get_iter_first(VALUE self)
+rg_iter_first(VALUE self)
 {
     VALUE val = Qnil;
     GtkTreeIter iter;
@@ -45,12 +56,12 @@ treemodel_get_iter_first(VALUE self)
         val = GTKTREEITER2RVAL(&iter);
         G_CHILD_ADD(self, val);
     }
-    
+
     return val;
 }
 
 static VALUE
-treemodel_get_iter(VALUE self, VALUE path)
+rg_get_iter(VALUE self, VALUE path)
 {
     VALUE val = Qnil;
     GtkTreeIter iter;
@@ -70,14 +81,14 @@ treemodel_get_iter(VALUE self, VALUE path)
         val = GTKTREEITER2RVAL(&iter);
         G_CHILD_ADD(self, val);
     }
-    
+
     return val;
 }
 
 static VALUE
-treemodel_get_value(VALUE self, VALUE iter, VALUE column)
+rg_get_value(VALUE self, VALUE iter, VALUE column)
 {
-    GValue value = {0, };
+    GValue value = G_VALUE_INIT;
     VALUE ret = Qnil;
     gtk_tree_model_get_value(_SELF(self), RVAL2GTKTREEITER(iter), NUM2INT(column), &value);
     if (G_VALUE_TYPE(&value) != G_TYPE_INVALID){
@@ -101,7 +112,10 @@ void        gtk_tree_model_get_valist (GtkTreeModel *tree_model,
 */
 
 static gboolean
-treemodel_foreach_func(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer func)
+treemodel_foreach_func(GtkTreeModel *model,
+                       GtkTreePath *path,
+                       GtkTreeIter *iter,
+                       G_GNUC_UNUSED gpointer func)
 {
     iter->user_data3 = model;
     rb_yield(rb_ary_new3(3, GOBJ2RVAL(model), GTKTREEPATH2RVAL(path), GTKTREEITER2RVAL(iter)));
@@ -109,7 +123,7 @@ treemodel_foreach_func(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter
 }
 
 static VALUE
-treemodel_foreach(VALUE self)
+rg_each(VALUE self)
 {
     gtk_tree_model_foreach(_SELF(self), 
                            (GtkTreeModelForeachFunc)treemodel_foreach_func, 
@@ -118,71 +132,77 @@ treemodel_foreach(VALUE self)
 }
 
 static VALUE
-treemodel_row_changed(VALUE self, VALUE path, VALUE iter)
+rg_row_changed(VALUE self, VALUE path, VALUE iter)
 {
     gtk_tree_model_row_changed(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
 static VALUE
-treemodel_row_inserted(VALUE self, VALUE path, VALUE iter)
+rg_row_inserted(VALUE self, VALUE path, VALUE iter)
 {
     gtk_tree_model_row_inserted(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
 static VALUE
-treemodel_row_has_child_toggled(VALUE self, VALUE path, VALUE iter)
+rg_row_has_child_toggled(VALUE self, VALUE path, VALUE iter)
 {
     gtk_tree_model_row_has_child_toggled(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
 static VALUE
-treemodel_row_deleted(VALUE self, VALUE path)
+rg_row_deleted(VALUE self, VALUE path)
 {
     gtk_tree_model_row_deleted(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 
 static VALUE
-treemodel_rows_reordered(VALUE self, VALUE path, VALUE iter, VALUE new_orders)
+rg_rows_reordered(VALUE self, VALUE rbpath, VALUE rbiter, VALUE rbnew_order)
 {
-    gint i, len;
-    gint* orders;
-
-    Check_Type(new_orders, T_ARRAY);
+    GtkTreeModel *proxy = _SELF(self);
+    GtkTreePath *path = RVAL2GTKTREEPATH(rbpath);
+    GtkTreeIter *iter = RVAL2GTKTREEITER(rbiter);
+    gint columns = gtk_tree_model_get_n_columns(proxy);
+    long n;
+    gint *new_order = RVAL2GINTS(rbnew_order, n);
 
-    len = RARRAY_LEN(new_orders);
-    orders = ALLOCA_N(gint, len);
+    if (n != columns) {
+        g_free(new_order);
 
-    for (i = 0; i < len; i++) {
-        orders[i] = RARRAY_PTR(new_orders)[i];
+        rb_raise(rb_eArgError,
+                 "new order array must contain same number of elements as the number of columns in the store: %ld != %d",
+                 n, columns);
     }
-  
-    gtk_tree_model_rows_reordered(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter), orders);
+
+    gtk_tree_model_rows_reordered(proxy, path, iter, new_order);
+
+    g_free(new_order);
+
     return self;
 }
 
 static VALUE
-treemodel_iter_is_valid(VALUE self, VALUE iter)
+rg_iter_is_valid_p(G_GNUC_UNUSED VALUE self, G_GNUC_UNUSED VALUE iter)
 {
     return Qtrue;
 }
 
 static VALUE
-signal_func(guint num, const GValue *values)
+signal_func(G_GNUC_UNUSED guint num, const GValue *values)
 {
     GtkTreeModel* model = g_value_get_object(&values[0]);
     GtkTreePath* path = g_value_get_boxed(&values[1]);
     GtkTreeIter* iter = g_value_get_boxed(&values[2]);
     iter->user_data3 = model;
-    
+
     return rb_ary_new3(3, GOBJ2RVAL(model), GTKTREEPATH2RVAL(path), GTKTREEITER2RVAL(iter));
 }
 
 static VALUE
-signal_rows_reordered_func(guint num, const GValue *values)
+signal_rows_reordered_func(G_GNUC_UNUSED guint num, const GValue *values)
 {
     GtkTreeModel* model = g_value_get_object(&values[0]);
     GtkTreePath* path = g_value_get_boxed(&values[1]);
@@ -202,34 +222,32 @@ signal_rows_reordered_func(guint num, const GValue *values)
 }
 
 void 
-Init_gtk_treemodel()
-{
-    VALUE mTreeModel = G_DEF_INTERFACE(GTK_TYPE_TREE_MODEL, "TreeModel", mGtk);
-
-    rb_define_method(mTreeModel, "flags", treemodel_get_flags, 0);
-    rb_define_method(mTreeModel, "n_columns", treemodel_get_n_columns, 0);
-    rb_define_method(mTreeModel, "get_column_type", treemodel_get_column_type, 1);
-    rb_define_method(mTreeModel, "iter_first", treemodel_get_iter_first, 0);
-    rb_define_method(mTreeModel, "get_iter", treemodel_get_iter, 1);
-    rb_define_method(mTreeModel, "get_value", treemodel_get_value, 2);
-    rb_define_method(mTreeModel, "each", treemodel_foreach, 0);
-    rb_define_method(mTreeModel, "row_changed", treemodel_row_changed, 2);
-    rb_define_method(mTreeModel, "row_inserted", treemodel_row_inserted, 2);
-    rb_define_method(mTreeModel, "row_has_child_toggled", treemodel_row_has_child_toggled, 2);
-    rb_define_method(mTreeModel, "row_deleted", treemodel_row_deleted, 1);
-    rb_define_method(mTreeModel, "rows_reordered", treemodel_rows_reordered, 3);
-    rb_define_method(mTreeModel, "iter_is_valid?", treemodel_iter_is_valid, 1);
+Init_gtk_treemodel(VALUE mGtk)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GTK_TYPE_TREE_MODEL, "TreeModel", mGtk);
+
+    RG_DEF_METHOD(flags, 0);
+    RG_DEF_METHOD(n_columns, 0);
+    RG_DEF_METHOD(get_column_type, 1);
+    RG_DEF_METHOD(iter_first, 0);
+    RG_DEF_METHOD(get_iter, 1);
+    RG_DEF_METHOD(get_value, 2);
+    RG_DEF_METHOD(each, 0);
+    RG_DEF_METHOD(row_changed, 2);
+    RG_DEF_METHOD(row_inserted, 2);
+    RG_DEF_METHOD(row_has_child_toggled, 2);
+    RG_DEF_METHOD(row_deleted, 1);
+    RG_DEF_METHOD(rows_reordered, 3);
+    RG_DEF_METHOD_P(iter_is_valid, 1);
 
     /* GtkTreeModelFlags */
-    G_DEF_CLASS(GTK_TYPE_TREE_MODEL_FLAGS, "Flags", mTreeModel);
-    G_DEF_CONSTANTS(mTreeModel, GTK_TYPE_TREE_MODEL_FLAGS, "GTK_TREE_MODEL_");
+    G_DEF_CLASS(GTK_TYPE_TREE_MODEL_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_TREE_MODEL_FLAGS, "GTK_TREE_MODEL_");
 
-    G_DEF_SIGNAL_FUNC(mTreeModel, "row_changed", (GValToRValSignalFunc)signal_func);
-    G_DEF_SIGNAL_FUNC(mTreeModel, "row_inserted", (GValToRValSignalFunc)signal_func);
-    G_DEF_SIGNAL_FUNC(mTreeModel, "row_has_child_toggled", (GValToRValSignalFunc)signal_func);
-    G_DEF_SIGNAL_FUNC(mTreeModel, "rows_reordered", (GValToRValSignalFunc)signal_rows_reordered_func);
+    G_DEF_SIGNAL_FUNC(RG_TARGET_NAMESPACE, "row_changed", (GValToRValSignalFunc)signal_func);
+    G_DEF_SIGNAL_FUNC(RG_TARGET_NAMESPACE, "row_inserted", (GValToRValSignalFunc)signal_func);
+    G_DEF_SIGNAL_FUNC(RG_TARGET_NAMESPACE, "row_has_child_toggled", (GValToRValSignalFunc)signal_func);
+    G_DEF_SIGNAL_FUNC(RG_TARGET_NAMESPACE, "rows_reordered", (GValToRValSignalFunc)signal_rows_reordered_func);
 
-    G_DEF_SETTERS(mTreeModel);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }
-
-