gtksourceview2 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7001c2212933572ff924fe932c8eca17152b26
-  data.tar.gz: 4fbcff2ce5f45779daae26995286ef3bed6a4c39
+  metadata.gz: d5363030a432f144766b287697adb7a992846c64
+  data.tar.gz: f261c5fce98aa7c4223cc1b8cbd6706ee48ab5d0
 SHA512:
-  metadata.gz: 3610edff4001417e8b3ba6cf3c52c8670fd7086f2e3f67d54d540818fc89c74ad3368b01df1a1790213f3af40724e453156292c3143161f44ecf58c4898e158e
-  data.tar.gz: bbeec69ee2d2a097a6ecabb7ccaa535030c4087f5ce93c286ccb551779a08b5dadb379ddf14a875890a3abe3e1d21af0f60642a54facfe1477fc7a1185bf239b
+  metadata.gz: 90bab1da34c3a2759da285d8c6f58b852324201905b3a66bae3803e86dc0f2737d40ac8711a537533645d8c40f161b5a80c9a2821feddc304d794afe31245f26
+  data.tar.gz: a3aea8664fa32390ff15b0a97c7af50308780153b9c15af81aea6f888aa3fe05fb202c7d9adeab1a64d678667fb22da535eb826c889a9faa9c437ca9606b01ae

data/ext/gtksourceview2/rbgtksourceiter.c

@@ -108,8 +108,8 @@ Init_gtk_sourceiter (VALUE mGtk)
     /*
      * They are override original Gtk::TextIter#[for|back]ward_search
      */
-    RG_DEF_METHOD(forward_search, -1);
-    RG_DEF_METHOD(backward_search, -1);
+    RG_REPLACE_ACTION(forward_search, -1);
+    RG_REPLACE_ACTION(backward_search, -1);
 
     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/rbgtksourcelanguagemanager.c

@@ -60,80 +60,6 @@ rg_s_default(VALUE self)
     return GOBJ2RVAL(slm);
 }
 
-/* Method: set_search_path(dirs)
- * dirs: language file directory path
- *
- * Sets the language files directories for the given language manager.
- *
- * Returns: self.
- */
-static VALUE
-rg_set_search_path(VALUE self, VALUE dirs)
-{
-    gchar** gdirs = (gchar**)NULL;
-    gint i;
-
-    if (! NIL_P(dirs)){
-        Check_Type(dirs, T_ARRAY);
-        i = RARRAY_LEN(dirs);
-        gdirs = ALLOCA_N(gchar*, i + 1);
-        for (i = 0; i < i; i++) {
-            if (TYPE(RARRAY_PTR(dirs)[i]) == T_STRING) {
-                gdirs[i] = RVAL2CSTR(RARRAY_PTR(dirs)[i]);
-            }
-            else {
-                gdirs[i] = "";
-            }
-        }
-        gdirs[i] = (gchar*)NULL;
-    }
-
-    gtk_source_language_manager_set_search_path (_SELF (self), gdirs);
-
-    return self;
-}
-
-/* Method: search_path
- * Returns: a list of language files directories (strings) for the given
- * language manager.
- */
-static VALUE
-rg_search_path(VALUE self)
-{
-    VALUE ary;
-    const gchar * const * dirs =
-            gtk_source_language_manager_get_search_path (_SELF (self));
-    if (!dirs)
-        return Qnil;
-
-    ary = rb_ary_new();
-    while (*dirs){
-        rb_ary_push(ary, CSTR2RVAL(*dirs));
-        dirs++;
-    }
-    return ary;
-}
-
-/* Method: language_ids
- * Returns: a list of languages ids for the given language manager
- */
-static VALUE
-rg_language_ids(VALUE self)
-{
-    VALUE ary;
-    const gchar * const * ids =
-            gtk_source_language_manager_get_language_ids (_SELF (self));
-    if (!ids)
-        return Qnil;
-
-    ary = rb_ary_new();
-    while (*ids){
-        rb_ary_push(ary, CSTR2RVAL(*ids));
-        ids++;
-    }
-    return ary;
-}
-
 /*
  * Method: get_language(id)
  * id: a language id (as a string).
@@ -181,9 +107,6 @@ Init_gtk_sourcelanguagemanager (VALUE mGtk)
              "SourceLanguageManager", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
-    RG_DEF_METHOD(set_search_path, 1);
-    RG_DEF_METHOD(search_path, 0);
-    RG_DEF_METHOD(language_ids, 0);
     RG_DEF_METHOD(get_language, 1);
 #ifdef HAVE_GTK_SOURCE_LANGUAGE_MANAGER_GUESS_LANGUAGE
     RG_DEF_METHOD(guess_language, 2);

data/ext/gtksourceview2/rbgtksourcestyleschememanager.c

@@ -60,38 +60,6 @@ rg_s_default(VALUE self)
     return GOBJ2RVAL(sssm);
 }
 
-/* Method: set_search_path(dirs)
- * dirs: style scheme file directory path
- *
- * Sets the style scheme files directories for the given style scheme manager.
- *
- * Returns: self.
- */
-static VALUE
-rg_set_search_path(VALUE self, VALUE dirs)
-{
-    gchar** gdirs = (gchar**)NULL;
-    gint i;
-
-    if (! NIL_P(dirs)){
-        Check_Type(dirs, T_ARRAY);
-        i = RARRAY_LEN(dirs);
-        gdirs = ALLOCA_N(gchar*, i + 1);
-        for (i = 0; i < i; i++) {
-            if (TYPE(RARRAY_PTR(dirs)[i]) == T_STRING) {
-                gdirs[i] = RVAL2CSTR(RARRAY_PTR(dirs)[i]);
-            }
-            else {
-                gdirs[i] = "";
-            }
-        }
-        gdirs[i] = (gchar*)NULL;
-    }
-
-    gtk_source_style_scheme_manager_set_search_path (_SELF (self), gdirs);
-    return self;
-}
-
 /* Method: append_search_path(path)
  * path: additional style scheme file directory path (string)
  *
@@ -120,47 +88,6 @@ rg_prepend_search_path(VALUE self, VALUE path)
     return self;
 }
 
-/* Method: get_search_path
- * Returns: a list of style scheme files directories (strings) for the given
- * style scheme manager.
- */
-static VALUE
-rg_search_path(VALUE self)
-{
-    VALUE ary;
-    const gchar * const * dirs =
-            gtk_source_style_scheme_manager_get_search_path (_SELF (self));
-    if (!dirs)
-        return Qnil;
-
-    ary = rb_ary_new();
-    while (*dirs){
-        rb_ary_push(ary, CSTR2RVAL(*dirs));
-        dirs++;
-    }
-    return ary;
-}
-
-/* Method: scheme_ids
- * Returns: a list of style scheme ids for the given style scheme manager
- */
-static VALUE
-rg_scheme_ids(VALUE self)
-{
-    VALUE ary;
-    const gchar * const * ids =
-            gtk_source_style_scheme_manager_get_scheme_ids (_SELF (self));
-    if (!ids)
-        return Qnil;
-
-    ary = rb_ary_new();
-    while (*ids){
-        rb_ary_push(ary, CSTR2RVAL(*ids));
-        ids++;
-    }
-    return ary;
-}
-
 /*
  * Method: scheme(scheme_id)
  * scheme_id: a style scheme id (as a string).
@@ -202,11 +129,8 @@ Init_gtk_sourcestyleschememanager (VALUE mGtk)
              "SourceStyleSchemeManager", mGtk);
 
     RG_DEF_METHOD(initialize, 0);
-    RG_DEF_METHOD(set_search_path, 1);
     RG_DEF_METHOD(append_search_path, 1);
     RG_DEF_METHOD(prepend_search_path, 1);
-    RG_DEF_METHOD(search_path, 0);
-    RG_DEF_METHOD(scheme_ids, 0);
     RG_DEF_METHOD(get_scheme, 1);
     RG_DEF_METHOD(force_rescan, 0);
     RG_DEF_SMETHOD(default, 0);

data/ext/gtksourceview2/rbgtksourceview.c

@@ -143,10 +143,15 @@ static VALUE
 rg_get_mark_category_background(VALUE self, VALUE category)
 {
     GdkColor color;
-    gtk_source_view_get_mark_category_background(_SELF (self),
-                         RVAL2CSTR(category),
-                         &color);
-    return GDKCOLOR2RVAL(&color);
+    gboolean found;
+    found = gtk_source_view_get_mark_category_background(_SELF (self),
+                                                         RVAL2CSTR(category),
+                                                         &color);
+    if (found) {
+        return GDKCOLOR2RVAL(&color);
+    } else {
+        return Qnil;
+    }
 }
 
 /*

data/lib/gtksourceview2.rb

@@ -12,7 +12,7 @@ vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_dll_path(vendor_bin_dir)
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/gtksourceview2.so"
 rescue LoadError
   require "gtksourceview2.so"

data/test/test_source_view.rb

@@ -6,12 +6,13 @@ class TestSourceView < Test::Unit::TestCase
 
     red_rgb = [65535, 0, 0]
     red_color = Gdk::Color.parse("red")
-    assert_not_equal(red_rgb, view.get_mark_category_background("XXX").to_a)
 
-    view.set_mark_category_background("XXX", red_color)
-    assert_equal(red_rgb, view.get_mark_category_background("XXX").to_a)
+    assert_nil(view.get_mark_category_background("new-category"))
 
-    view.set_mark_category_background("XXX", nil)
-    assert_not_equal(red_rgb, view.get_mark_category_background("XXX").to_a)
+    view.set_mark_category_background("new-category", red_color)
+    assert_equal(red_rgb, view.get_mark_category_background("new-category").to_a)
+
+    view.set_mark_category_background("new-category", nil)
+    assert_nil(view.get_mark_category_background("new-category"))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtksourceview2
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 description: Ruby/GtkSourceView2 is a Ruby binding of gtksourceview-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []