gtksourceview2 1.0.3 → 1.1.0

data/ext/gtksourceview2/rbgtksourcebuffer.c

@@ -1,16 +1,29 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtksourcebuffer.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:02:28 $
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004,2005 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  Geoff Youngs, based on gtktextview.c by 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
+ */
 
-  Copyright (C) 2004,2005 Ruby-GNOME2 Project Team
-  Copyright (C) 2003 Geoff Youngs, based on gtktextview.c by Masao Mutoh
-************************************************/
 #include "rbgtksourcemain.h"
 
+#define RG_TARGET_NAMESPACE cSourceBuffer
+
 /* Class: Gtk::SourceBuffer
  * Text buffer object for Gtk::SourceView.
  */
@@ -33,60 +46,33 @@
  * Returns: a newly created Gtk::SourceBuffer object.
  */
 static VALUE
-sourcebuffer_new(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
-	VALUE val;
-
-	rb_scan_args (argc, argv, "01", &val);
-	if (NIL_P (val)) {
-		G_INITIALIZE (self, gtk_source_buffer_new (NULL));
-	} else
-	    if (rb_obj_is_kind_of
-		(val, GTYPE2CLASS (GTK_TYPE_TEXT_TAG_TABLE))) {
-		G_INITIALIZE (self,
-			      gtk_source_buffer_new (GTK_TEXT_TAG_TABLE
-						     (RVAL2GOBJ (val))));
-	} else
-	    if (rb_obj_is_kind_of
-		(val, GTYPE2CLASS (GTK_TYPE_SOURCE_LANGUAGE))) {
-		G_INITIALIZE (self,
-			      gtk_source_buffer_new_with_language
-			      (GTK_SOURCE_LANGUAGE (RVAL2GOBJ (val))));
-	} else {
-		rb_raise (rb_eArgError,
-			  "invalid argument %s (expect nil, Gtk::TextTagTable or Gtk::SourceLanguage)",
-			  rb_class2name (CLASS_OF (val)));
-	}
-	return Qnil;
+    VALUE val;
+
+    rb_scan_args (argc, argv, "01", &val);
+    if (NIL_P (val)) {
+        G_INITIALIZE (self, gtk_source_buffer_new (NULL));
+    } else
+        if (rb_obj_is_kind_of
+        (val, GTYPE2CLASS (GTK_TYPE_TEXT_TAG_TABLE))) {
+        G_INITIALIZE (self,
+                  gtk_source_buffer_new (GTK_TEXT_TAG_TABLE
+                             (RVAL2GOBJ (val))));
+    } else
+        if (rb_obj_is_kind_of
+        (val, GTYPE2CLASS (GTK_TYPE_SOURCE_LANGUAGE))) {
+        G_INITIALIZE (self,
+                  gtk_source_buffer_new_with_language
+                  (GTK_SOURCE_LANGUAGE (RVAL2GOBJ (val))));
+    } else {
+        rb_raise (rb_eArgError,
+              "invalid argument %s (expect nil, Gtk::TextTagTable or Gtk::SourceLanguage)",
+              rb_class2name (CLASS_OF (val)));
+    }
+    return Qnil;
 }
 
-/* Defined as properties.
-void                gtk_source_buffer_set_highlight_syntax
-                                                        (GtkSourceBuffer *buffer,
-                                                         gboolean highlight);
-gboolean            gtk_source_buffer_get_highlight_syntax
-                                                        (GtkSourceBuffer *buffer);
-void                gtk_source_buffer_set_language      (GtkSourceBuffer *buffer,
-                                                         GtkSourceLanguage *language);
-GtkSourceLanguage*  gtk_source_buffer_get_language      (GtkSourceBuffer *buffer);
-void                gtk_source_buffer_set_highlight_matching_brackets
-                                                        (GtkSourceBuffer *buffer,
-                                                         gboolean highlight);
-gboolean            gtk_source_buffer_get_highlight_matching_brackets
-                                                        (GtkSourceBuffer *buffer);
-void                gtk_source_buffer_set_style_scheme  (GtkSourceBuffer *buffer,
-                                                         GtkSourceStyleScheme *scheme);
-GtkSourceStyleScheme* gtk_source_buffer_get_style_scheme
-                                                        (GtkSourceBuffer *buffer);
-gint                gtk_source_buffer_get_max_undo_levels
-                                                        (GtkSourceBuffer *buffer);
-void                gtk_source_buffer_set_max_undo_levels
-                                                        (GtkSourceBuffer *buffer,
-                                                         gint max_undo_levels);
-gboolean            gtk_source_buffer_can_redo          (GtkSourceBuffer *buffer);
-gboolean            gtk_source_buffer_can_undo          (GtkSourceBuffer *buffer);
-*/
-
 /*
  * Method: redo!
  *
@@ -96,10 +82,10 @@ gboolean            gtk_source_buffer_can_undo          (GtkSourceBuffer *buffer
  * Returns: self.
  */
 static VALUE
-sourcebuffer_redo(VALUE self)
+rg_redo_bang(VALUE self)
 {
-	gtk_source_buffer_redo (_SELF (self));
-	return self;
+    gtk_source_buffer_redo (_SELF (self));
+    return self;
 }
 
 /*
@@ -116,10 +102,10 @@ sourcebuffer_redo(VALUE self)
  * Returns: self.
  */
 static VALUE
-sourcebuffer_undo(VALUE self)
+rg_undo_bang(VALUE self)
 {
-	gtk_source_buffer_undo (_SELF (self));
-	return self;
+    gtk_source_buffer_undo (_SELF (self));
+    return self;
 }
 
 /*
@@ -138,14 +124,14 @@ sourcebuffer_undo(VALUE self)
  * Returns: self
  */
 static VALUE
-sourcebuffer_begin_not_undoable_action(VALUE self)
+rg_begin_not_undoable_action(VALUE self)
 {
     gtk_source_buffer_begin_not_undoable_action (_SELF (self));
 
     if (rb_block_given_p()) {
-	VALUE block = rb_block_proc ();
-	rb_funcall (block, rb_intern ("call"), 0);
-	gtk_source_buffer_end_not_undoable_action (_SELF (self));
+        VALUE block = rb_block_proc ();
+        rb_funcall (block, rb_intern ("call"), 0);
+        gtk_source_buffer_end_not_undoable_action (_SELF (self));
     }
     return self;
 }
@@ -160,13 +146,12 @@ sourcebuffer_begin_not_undoable_action(VALUE self)
  * Returns: self
  */
 static VALUE
-sourcebuffer_end_not_undoable_action(VALUE self)
+rg_end_not_undoable_action(VALUE self)
 {
     gtk_source_buffer_end_not_undoable_action (_SELF (self));
     return self;
 }
 
-
 /*
  * Method: not_undoable_action { ... }
  *
@@ -182,15 +167,15 @@ sourcebuffer_end_not_undoable_action(VALUE self)
  * Returns: the return value of the provided block.
  */
 static VALUE
-sourcebuffer_not_undoable_action(VALUE self)
+rg_not_undoable_action(VALUE self)
 {
-	VALUE block, ret;
+    VALUE block, ret;
 
-	block = rb_block_proc ();
-	gtk_source_buffer_begin_not_undoable_action (_SELF (self));
-	ret = rb_funcall (block, rb_intern ("call"), 0);
-	gtk_source_buffer_end_not_undoable_action (_SELF (self));
-	return ret;
+    block = rb_block_proc ();
+    gtk_source_buffer_begin_not_undoable_action (_SELF (self));
+    ret = rb_funcall (block, rb_intern ("call"), 0);
+    gtk_source_buffer_end_not_undoable_action (_SELF (self));
+    return ret;
 }
 
 #ifdef HAVE_GTK_SOURCE_MARK_GET_TYPE
@@ -224,23 +209,23 @@ sourcebuffer_not_undoable_action(VALUE self)
  * Returns: a new Gtk::SourceMark object, owned by the buffer.
  */
 static VALUE
-sourcebuffer_create_source_mark(int argc, VALUE *argv, VALUE self)
+rg_create_source_mark(int argc, VALUE *argv, VALUE self)
 {
-	VALUE name, category, where;
+    VALUE name, category, where;
 
-	if (argc == 2)
-		rb_scan_args (argc, argv, "21", &where, &category, &name);
-	else
-		rb_scan_args (argc, argv, "30", &name, &category, &where);
+    if (argc == 2)
+        rb_scan_args (argc, argv, "21", &where, &category, &name);
+    else
+        rb_scan_args (argc, argv, "30", &name, &category, &where);
 
-	return GOBJ2RVAL (gtk_source_buffer_create_source_mark (_SELF (self),
-							   RVAL2CSTR (name),
-							   RVAL2CSTR (category),
-							   RVAL2ITR (where)));
+    return GOBJ2RVAL (gtk_source_buffer_create_source_mark (_SELF (self),
+                               RVAL2CSTR (name),
+                               RVAL2CSTR (category),
+                               RVAL2ITR (where)));
 }
 
 static VALUE
-sourcebuffer_get_source_marks_at_line(int argc, VALUE *argv, VALUE self)
+rg_get_source_marks_at_line(int argc, VALUE *argv, VALUE self)
 {
     GSList *list, *p;
     VALUE line, category;
@@ -264,7 +249,7 @@ sourcebuffer_get_source_marks_at_line(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-sourcebuffer_get_source_marks_at_iter(int argc, VALUE *argv, VALUE self)
+rg_get_source_marks_at_iter(int argc, VALUE *argv, VALUE self)
 {
     GSList *list, *p;
     VALUE iter, category;
@@ -288,7 +273,7 @@ sourcebuffer_get_source_marks_at_iter(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-sourcebuffer_remove_source_marks(int argc, VALUE *argv, VALUE self)
+rg_remove_source_marks(int argc, VALUE *argv, VALUE self)
 {
     VALUE start, end, category;
 
@@ -303,7 +288,7 @@ sourcebuffer_remove_source_marks(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-sourcebuffer_forward_iter_to_source_mark(int argc, VALUE *argv, VALUE self)
+rg_forward_iter_to_source_mark(int argc, VALUE *argv, VALUE self)
 {
     VALUE iter, category;
 
@@ -316,7 +301,7 @@ sourcebuffer_forward_iter_to_source_mark(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-sourcebuffer_backward_iter_to_source_mark(int argc, VALUE *argv, VALUE self)
+rg_backward_iter_to_source_mark(int argc, VALUE *argv, VALUE self)
 {
     VALUE iter, category;
 
@@ -331,7 +316,7 @@ sourcebuffer_backward_iter_to_source_mark(int argc, VALUE *argv, VALUE self)
 #endif /* HAVE_GTK_SOURCE_MARK_GET_TYPE */
 
 static VALUE
-sourcebuffer_ensure_highlight(VALUE self, VALUE start, VALUE end)
+rg_ensure_highlight(VALUE self, VALUE start, VALUE end)
 {
     gtk_source_buffer_ensure_highlight (_SELF (self), RVAL2ITR (start), RVAL2ITR (end));
 
@@ -339,37 +324,27 @@ sourcebuffer_ensure_highlight(VALUE self, VALUE start, VALUE end)
 }
 
 void
-Init_gtk_sourcebuffer ()
+Init_gtk_sourcebuffer (VALUE mGtk)
 {
-	VALUE cbuffer =
-	    G_DEF_CLASS (GTK_TYPE_SOURCE_BUFFER, "SourceBuffer", mGtk);
-
-	rb_define_method (cbuffer, "initialize", sourcebuffer_new, -1);
-	rb_define_method (cbuffer, "redo!", sourcebuffer_redo, 0);
-	rb_define_method (cbuffer, "undo!", sourcebuffer_undo, 0);
-	rb_define_method (cbuffer, "begin_not_undoable_action",
-			          sourcebuffer_begin_not_undoable_action, 0);
-	rb_define_method (cbuffer, "end_not_undoable_action",
-			          sourcebuffer_end_not_undoable_action, 0);
-	rb_define_method (cbuffer, "not_undoable_action",
-			          sourcebuffer_not_undoable_action, 0);
-	rb_define_alias (cbuffer, "non_undoable_action", "not_undoable_action");
+    VALUE RG_TARGET_NAMESPACE =
+        G_DEF_CLASS (GTK_TYPE_SOURCE_BUFFER, "SourceBuffer", mGtk);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD_BANG(redo, 0);
+    RG_DEF_METHOD_BANG(undo, 0);
+    RG_DEF_METHOD(begin_not_undoable_action, 0);
+    RG_DEF_METHOD(end_not_undoable_action, 0);
+    RG_DEF_METHOD(not_undoable_action, 0);
+    RG_DEF_ALIAS("non_undoable_action", "not_undoable_action");
 #ifdef HAVE_GTK_SOURCE_MARK_GET_TYPE
-    rb_define_method (cbuffer, "create_source_mark",
-                      sourcebuffer_create_source_mark, -1);
-    rb_define_method (cbuffer, "get_source_marks_at_line",
-                      sourcebuffer_get_source_marks_at_line, -1);
-    rb_define_method (cbuffer, "get_source_marks_at_iter",
-                      sourcebuffer_get_source_marks_at_iter, -1);
-    rb_define_method (cbuffer, "remove_source_marks",
-                      sourcebuffer_remove_source_marks, -1);
-    rb_define_method (cbuffer, "forward_iter_to_source_mark",
-                      sourcebuffer_forward_iter_to_source_mark, -1);
-    rb_define_method (cbuffer, "backward_iter_to_source_mark",
-                      sourcebuffer_backward_iter_to_source_mark, -1);
+    RG_DEF_METHOD(create_source_mark, -1);
+    RG_DEF_METHOD(get_source_marks_at_line, -1);
+    RG_DEF_METHOD(get_source_marks_at_iter, -1);
+    RG_DEF_METHOD(remove_source_marks, -1);
+    RG_DEF_METHOD(forward_iter_to_source_mark, -1);
+    RG_DEF_METHOD(backward_iter_to_source_mark, -1);
 #endif
-    rb_define_method (cbuffer, "ensure_highlight",
-                      sourcebuffer_ensure_highlight, 2);
+    RG_DEF_METHOD(ensure_highlight, 2);
 
-	G_DEF_SETTERS (cbuffer);
+    G_DEF_SETTERS (RG_TARGET_NAMESPACE);
 }

data/ext/gtksourceview2/rbgtksourceiter.c

@@ -1,15 +1,27 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtksourceiter.c -
-
-  $Author: mutoh $
-  $Date: 2005/01/03 15:33:56 $
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Ruby-GNOME2 Project Team
+ *
+ *  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
+ */
 
-  Copyright (C) 2004 Ruby-GNOME2 Project Team
-************************************************/
 #include "rbgtksourcemain.h"
 
+#define RG_TARGET_NAMESPACE cTextIter
 #define _SELF(s) ((GtkTextIter*)RVAL2BOXED(s, GTK_TYPE_TEXT_ITER))
 #define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TEXT_ITER))
 
@@ -20,35 +32,35 @@
  * Returns: locations of start and end of match.
  */
 static VALUE
-forward_search(int argc, VALUE *argv, VALUE self)
+rg_forward_search(int argc, VALUE *argv, VALUE self)
 {
-	GtkTextIter m_start, m_end;
-	VALUE str, flags, limit;
-	VALUE ret = Qnil;
+    GtkTextIter m_start, m_end;
+    VALUE str, flags, limit;
+    VALUE ret = Qnil;
 
-	rb_scan_args (argc, argv, "21", &str, &flags, &limit);
+    rb_scan_args (argc, argv, "21", &str, &flags, &limit);
 
-	if (rb_obj_is_kind_of
-	    (flags, GTYPE2CLASS (GTK_TYPE_SOURCE_SEARCH_FLAGS))) {
-		if (gtk_source_iter_forward_search
-		    (_SELF (self), RVAL2CSTR (str),
-		     RVAL2GFLAGS (flags, GTK_TYPE_SOURCE_SEARCH_FLAGS),
-		     &m_start, &m_end, NIL_P (limit) ? NULL : _SELF (limit)))
-			ret =
-			    rb_ary_new3 (2, ITR2RVAL (&m_start),
-					 ITR2RVAL (&m_end));
-	} else
-	    if (rb_obj_is_kind_of
-		(flags, GTYPE2CLASS (GTK_TYPE_TEXT_SEARCH_FLAGS))) {
-		if (gtk_text_iter_forward_search
-		    (_SELF (self), RVAL2CSTR (str),
-		     RVAL2GFLAGS (flags, GTK_TYPE_TEXT_SEARCH_FLAGS), &m_start,
-		     &m_end, NIL_P (limit) ? NULL : _SELF (limit)))
-			ret =
-			    rb_ary_new3 (2, ITR2RVAL (&m_start),
-					 ITR2RVAL (&m_end));
-	}
-	return ret;
+    if (rb_obj_is_kind_of
+        (flags, GTYPE2CLASS (GTK_TYPE_SOURCE_SEARCH_FLAGS))) {
+        if (gtk_source_iter_forward_search
+            (_SELF (self), RVAL2CSTR (str),
+             RVAL2GFLAGS (flags, GTK_TYPE_SOURCE_SEARCH_FLAGS),
+             &m_start, &m_end, NIL_P (limit) ? NULL : _SELF (limit)))
+            ret =
+                rb_ary_new3 (2, ITR2RVAL (&m_start),
+                     ITR2RVAL (&m_end));
+    } else
+        if (rb_obj_is_kind_of
+        (flags, GTYPE2CLASS (GTK_TYPE_TEXT_SEARCH_FLAGS))) {
+        if (gtk_text_iter_forward_search
+            (_SELF (self), RVAL2CSTR (str),
+             RVAL2GFLAGS (flags, GTK_TYPE_TEXT_SEARCH_FLAGS), &m_start,
+             &m_end, NIL_P (limit) ? NULL : _SELF (limit)))
+            ret =
+                rb_ary_new3 (2, ITR2RVAL (&m_start),
+                     ITR2RVAL (&m_end));
+    }
+    return ret;
 }
 
 /* Method: backward_search(str, flags, limit)
@@ -58,47 +70,47 @@ forward_search(int argc, VALUE *argv, VALUE self)
  * Returns: locations of start and end of match.
  */
 static VALUE
-backward_search(int argc, VALUE *argv, VALUE self)
+rg_backward_search(int argc, VALUE *argv, VALUE self)
 {
-	GtkTextIter m_start, m_end;
-	VALUE str, flags, limit;
-	VALUE ret = Qnil;
+    GtkTextIter m_start, m_end;
+    VALUE str, flags, limit;
+    VALUE ret = Qnil;
 
-	rb_scan_args (argc, argv, "21", &str, &flags, &limit);
-	if (rb_obj_is_kind_of
-	    (flags, GTYPE2CLASS (GTK_TYPE_SOURCE_SEARCH_FLAGS))) {
-		if (gtk_source_iter_backward_search
-		    (_SELF (self), RVAL2CSTR (str),
-		     RVAL2GFLAGS (flags, GTK_TYPE_SOURCE_SEARCH_FLAGS),
-		     &m_start, &m_end, NIL_P (limit) ? NULL : _SELF (limit)))
-			ret =
-			    rb_ary_new3 (2, ITR2RVAL (&m_start),
-					 ITR2RVAL (&m_end));
-	} else
-	    if (rb_obj_is_kind_of
-		(flags, GTYPE2CLASS (GTK_TYPE_TEXT_SEARCH_FLAGS))) {
-		if (gtk_text_iter_backward_search
-		    (_SELF (self), RVAL2CSTR (str),
-		     RVAL2GFLAGS (flags, GTK_TYPE_TEXT_SEARCH_FLAGS), &m_start,
-		     &m_end, NIL_P (limit) ? NULL : _SELF (limit)))
-			ret =
-			    rb_ary_new3 (2, ITR2RVAL (&m_start),
-					 ITR2RVAL (&m_end));
-	}
-	return ret;
+    rb_scan_args (argc, argv, "21", &str, &flags, &limit);
+    if (rb_obj_is_kind_of
+        (flags, GTYPE2CLASS (GTK_TYPE_SOURCE_SEARCH_FLAGS))) {
+        if (gtk_source_iter_backward_search
+            (_SELF (self), RVAL2CSTR (str),
+             RVAL2GFLAGS (flags, GTK_TYPE_SOURCE_SEARCH_FLAGS),
+             &m_start, &m_end, NIL_P (limit) ? NULL : _SELF (limit)))
+            ret =
+                rb_ary_new3 (2, ITR2RVAL (&m_start),
+                     ITR2RVAL (&m_end));
+    } else
+        if (rb_obj_is_kind_of
+        (flags, GTYPE2CLASS (GTK_TYPE_TEXT_SEARCH_FLAGS))) {
+        if (gtk_text_iter_backward_search
+            (_SELF (self), RVAL2CSTR (str),
+             RVAL2GFLAGS (flags, GTK_TYPE_TEXT_SEARCH_FLAGS), &m_start,
+             &m_end, NIL_P (limit) ? NULL : _SELF (limit)))
+            ret =
+                rb_ary_new3 (2, ITR2RVAL (&m_start),
+                     ITR2RVAL (&m_end));
+    }
+    return ret;
 }
 
 void
-Init_gtk_sourceiter ()
+Init_gtk_sourceiter (VALUE mGtk)
 {
-	VALUE cTextIter = GTYPE2CLASS (GTK_TYPE_TEXT_ITER);
+    VALUE RG_TARGET_NAMESPACE = GTYPE2CLASS (GTK_TYPE_TEXT_ITER);
 
-	/*
-	 * They are override original Gtk::TextIter#[for|back]ward_search
-	 */
-	rb_define_method (cTextIter, "forward_search", forward_search, -1);
-	rb_define_method (cTextIter, "backward_search", backward_search, -1);
+    /*
+     * They are override original Gtk::TextIter#[for|back]ward_search
+     */
+    RG_DEF_METHOD(forward_search, -1);
+    RG_DEF_METHOD(backward_search, -1);
 
-	G_DEF_CLASS(GTK_TYPE_SOURCE_SEARCH_FLAGS, "SourceSearchFlags", cTextIter);
-	G_DEF_CONSTANTS(cTextIter, GTK_TYPE_SOURCE_SEARCH_FLAGS, "GTK_");
+    G_DEF_CLASS(GTK_TYPE_SOURCE_SEARCH_FLAGS, "SourceSearchFlags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_SOURCE_SEARCH_FLAGS, "GTK_");
 }

data/ext/gtksourceview2/rbgtksourcelanguage.c

@@ -1,49 +1,54 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtksourcelanguage.c -
-
-  $Author: mutoh $
-  $Date: 2005/10/02 18:40:34 $
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  Geoff Youngs, based on gtktextview.c by 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
+ */
 
-  Copyright (C) 2004 Ruby-GNOME2 Project Team
-  Copyright (C) 2003 Geoff Youngs, based on gtktextview.c by Masao Mutoh
-************************************************/
 #include "rbgtksourcemain.h"
 
 /* Class: Gtk::SourceLanguage
  * Source language.
  */
 
+#define RG_TARGET_NAMESPACE cSourceLanguage
 #define _SELF(self) (GTK_SOURCE_LANGUAGE(RVAL2GOBJ(self)))
 
-/* Defined as properties.
-const gchar*        gtk_source_language_get_id          (GtkSourceLanguage *language);
-const gchar*        gtk_source_language_get_name        (GtkSourceLanguage *language);
-const gchar*        gtk_source_language_get_section     (GtkSourceLanguage *language);
-gboolean            gtk_source_language_get_hidden      (GtkSourceLanguage *language);
-*/
-
 /* Method: get_metadata(name)
  * name: the metadata property name (string)
  * Returns: the localized metadata for the given name.
  */
 static VALUE
-sourcelanguage_get_metadata(VALUE self, VALUE name)
+rg_get_metadata(VALUE self, VALUE name)
 {
-	return
-		CSTR2RVAL (gtk_source_language_get_metadata
-			(_SELF (self), RVAL2CSTR(name)));
+    return
+        CSTR2RVAL (gtk_source_language_get_metadata
+            (_SELF (self), RVAL2CSTR(name)));
 }
 
 /* Method: mime_types
  * Returns: a list of mime types for the given language, as an array of strings.
  */
 static VALUE
-sourcelanguage_get_mime_types(VALUE self)
+rg_mime_types(VALUE self)
 {
-	VALUE ary;
- 	char **types = gtk_source_language_get_mime_types (_SELF (self));
+    VALUE ary;
+    char **types = gtk_source_language_get_mime_types (_SELF (self));
     if (!types)
         return Qnil;
 
@@ -59,10 +64,10 @@ sourcelanguage_get_mime_types(VALUE self)
  * Returns: a list of globs for the given language, as an array of strings.
  */
 static VALUE
-sourcelanguage_get_globs(VALUE self)
+rg_globs(VALUE self)
 {
-	VALUE ary;
- 	char **globs = gtk_source_language_get_globs (_SELF (self));
+    VALUE ary;
+    char **globs = gtk_source_language_get_globs (_SELF (self));
     if (!globs)
         return Qnil;
 
@@ -79,21 +84,21 @@ sourcelanguage_get_globs(VALUE self)
  * Returns: the localized style name of the given id.
  */
 static VALUE
-sourcelanguage_get_style_name(VALUE self, VALUE style_id)
+rg_get_style_name(VALUE self, VALUE style_id)
 {
-	return
-		CSTR2RVAL (gtk_source_language_get_style_name
-			(_SELF (self), RVAL2CSTR(style_id)));
+    return
+        CSTR2RVAL (gtk_source_language_get_style_name
+            (_SELF (self), RVAL2CSTR(style_id)));
 }
 
 /* Method: style_id
  * Returns: the styles defined by the language.
  */
 static VALUE
-sourcelanguage_get_style_ids(VALUE self)
+rg_style_ids(VALUE self)
 {
-	VALUE ary;
- 	gchar **ids = gtk_source_language_get_style_ids (_SELF (self));
+    VALUE ary;
+    gchar **ids = gtk_source_language_get_style_ids (_SELF (self));
     if (!ids)
         return Qnil;
 
@@ -106,16 +111,16 @@ sourcelanguage_get_style_ids(VALUE self)
 }
 
 void
-Init_gtk_sourcelanguage ()
+Init_gtk_sourcelanguage (VALUE mGtk)
 {
-	VALUE clang =
-	    G_DEF_CLASS (GTK_TYPE_SOURCE_LANGUAGE, "SourceLanguage", mGtk);
+    VALUE RG_TARGET_NAMESPACE =
+        G_DEF_CLASS (GTK_TYPE_SOURCE_LANGUAGE, "SourceLanguage", mGtk);
 
-	rb_define_method (clang, "get_metadata", sourcelanguage_get_metadata, 1);
-	rb_define_method (clang, "mime_types", sourcelanguage_get_mime_types, 0);
-	rb_define_method (clang, "globs", sourcelanguage_get_globs, 0);
-	rb_define_method (clang, "get_style_name", sourcelanguage_get_style_name, 1);
-	rb_define_method (clang, "style_ids", sourcelanguage_get_style_ids, 0);
+    RG_DEF_METHOD(get_metadata, 1);
+    RG_DEF_METHOD(mime_types, 0);
+    RG_DEF_METHOD(globs, 0);
+    RG_DEF_METHOD(get_style_name, 1);
+    RG_DEF_METHOD(style_ids, 0);
 
-	G_DEF_SETTERS (clang);
+    G_DEF_SETTERS (RG_TARGET_NAMESPACE);
 }