gtksourceview-2.0: Regenerated with GtkSourceView 2.7.1

diff --git a/vapi/gtksourceview-2.0.vapi b/vapi/gtksourceview-2.0.vapi
index b9a38c2bd0159ad26127ce2ca7eb1df387651851..39a074abb3f5ef38cb135c1e108b38cd90cc454b 100644 (file)
--- a/vapi/gtksourceview-2.0.vapi
+++ b/vapi/gtksourceview-2.0.vapi
@@ -62,6 +62,7 @@ namespace Gtk {
                public unowned Gtk.SourceLanguage get_language (string id);
                public unowned string get_language_ids ();
                public unowned string get_search_path ();
+               public unowned Gtk.SourceLanguage guess_language (string filename, string content_type);
                [CCode (has_construct_function = false)]
                public SourceLanguageManager ();
                public void set_search_path (string dirs);
@@ -196,10 +197,12 @@ namespace Gtk {
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
        public class SourceView : Gtk.TextView, Atk.Implementor, Gtk.Buildable {
                public bool get_auto_indent ();
+               public Gtk.SourceDrawSpacesFlags get_draw_spaces ();
                public bool get_highlight_current_line ();
                public bool get_indent_on_tab ();
                public int get_indent_width ();
                public bool get_insert_spaces_instead_of_tabs ();
+               public bool get_mark_category_background (string category, Gdk.Color dest);
                public unowned Gdk.Pixbuf get_mark_category_pixbuf (string category);
                public int get_mark_category_priority (string category);
                public uint get_right_margin_position ();
@@ -211,12 +214,16 @@ namespace Gtk {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public SourceView ();
                public void set_auto_indent (bool enable);
+               public void set_draw_spaces (Gtk.SourceDrawSpacesFlags flags);
                public void set_highlight_current_line (bool show);
                public void set_indent_on_tab (bool enable);
                public void set_indent_width (int width);
                public void set_insert_spaces_instead_of_tabs (bool enable);
+               public void set_mark_category_background (string category, Gdk.Color color);
                public void set_mark_category_pixbuf (string category, Gdk.Pixbuf pixbuf);
                public void set_mark_category_priority (string category, int priority);
+               public void set_mark_category_tooltip_func (string category, Gtk.SourceViewMarkTooltipFunc func, GLib.DestroyNotify user_data_notify);
+               public void set_mark_category_tooltip_markup_func (string category, Gtk.SourceViewMarkTooltipFunc markup_func, GLib.DestroyNotify user_data_notify);
                public void set_right_margin_position (uint pos);
                public void set_show_line_marks (bool show);
                public void set_show_line_numbers (bool show);
@@ -226,6 +233,7 @@ namespace Gtk {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
                public SourceView.with_buffer (Gtk.SourceBuffer buffer);
                public bool auto_indent { get; set; }
+               public Gtk.SourceDrawSpacesFlags draw_spaces { get; set; }
                public bool highlight_current_line { get; set; }
                public bool indent_on_tab { get; set; }
                public int indent_width { get; set; }
@@ -239,14 +247,23 @@ namespace Gtk {
                public virtual signal void redo ();
                public virtual signal void undo ();
        }
-       [CCode (cprefix = "GTK_SOURCE_SEARCH_", has_type_id = "0", cheader_filename = "gtksourceview/gtksourceiter.h")]
+       [CCode (cprefix = "GTK_SOURCE_DRAW_SPACES_", cheader_filename = "gtksourceview/gtksourceview.h")]
+       [Flags]
+       public enum SourceDrawSpacesFlags {
+               SPACE,
+               TAB,
+               NEWLINE,
+               NBSP,
+               ALL
+       }
+       [CCode (cprefix = "GTK_SOURCE_SEARCH_", cheader_filename = "gtksourceview/gtksourceiter.h")]
        [Flags]
        public enum SourceSearchFlags {
                VISIBLE_ONLY,
                TEXT_ONLY,
                CASE_INSENSITIVE
        }
-       [CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", has_type_id = "0", cheader_filename = "gtksourceview/gtksourceview.h")]
+       [CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", cheader_filename = "gtksourceview/gtksourceview.h")]
        public enum SourceSmartHomeEndType {
                DISABLED,
                BEFORE,
@@ -254,6 +271,8 @@ namespace Gtk {
                ALWAYS
        }
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
+       public delegate unowned string SourceViewMarkTooltipFunc (Gtk.SourceMark mark);
+       [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
        public static bool source_iter_backward_search (Gtk.TextIter iter, string str, Gtk.SourceSearchFlags flags, out Gtk.TextIter match_start, out Gtk.TextIter match_end, Gtk.TextIter? limit);
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
        public static bool source_iter_forward_search (Gtk.TextIter iter, string str, Gtk.SourceSearchFlags flags, out Gtk.TextIter match_start, out Gtk.TextIter match_end, Gtk.TextIter? limit);

diff --git a/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.gi b/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.gi
index 1fe3ead4401389b480e3a5a09af10c3e4f27e160..90d52a0ae698fbb2a1c069f1918bc0e76d2e053b 100644 (file)
--- a/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.gi
+++ b/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.gi
@@ -23,13 +23,27 @@
                                <parameter name="limit" type="GtkTextIter*"/>
                        </parameters>
                </function>
-               <enum name="GtkSourceSmartHomeEndType">
+               <callback name="GtkSourceViewMarkTooltipFunc">
+                       <return-type type="gchar*"/>
+                       <parameters>
+                               <parameter name="mark" type="GtkSourceMark*"/>
+                               <parameter name="user_data" type="gpointer"/>
+                       </parameters>
+               </callback>
+               <enum name="GtkSourceSmartHomeEndType" type-name="GtkSourceSmartHomeEndType" get-type="gtk_source_smart_home_end_type_get_type">
                        <member name="GTK_SOURCE_SMART_HOME_END_DISABLED" value="0"/>
                        <member name="GTK_SOURCE_SMART_HOME_END_BEFORE" value="1"/>
                        <member name="GTK_SOURCE_SMART_HOME_END_AFTER" value="2"/>
                        <member name="GTK_SOURCE_SMART_HOME_END_ALWAYS" value="3"/>
                </enum>
-               <flags name="GtkSourceSearchFlags">
+               <flags name="GtkSourceDrawSpacesFlags" type-name="GtkSourceDrawSpacesFlags" get-type="gtk_source_draw_spaces_flags_get_type">
+                       <member name="GTK_SOURCE_DRAW_SPACES_SPACE" value="1"/>
+                       <member name="GTK_SOURCE_DRAW_SPACES_TAB" value="2"/>
+                       <member name="GTK_SOURCE_DRAW_SPACES_NEWLINE" value="4"/>
+                       <member name="GTK_SOURCE_DRAW_SPACES_NBSP" value="8"/>
+                       <member name="GTK_SOURCE_DRAW_SPACES_ALL" value="15"/>
+               </flags>
+               <flags name="GtkSourceSearchFlags" type-name="GtkSourceSearchFlags" get-type="gtk_source_search_flags_get_type">
                        <member name="GTK_SOURCE_SEARCH_VISIBLE_ONLY" value="1"/>
                        <member name="GTK_SOURCE_SEARCH_TEXT_ONLY" value="2"/>
                        <member name="GTK_SOURCE_SEARCH_CASE_INSENSITIVE" value="4"/>
@@ -280,10 +294,10 @@
                                </parameters>
                        </method>
                        <method name="get_style_name" symbol="gtk_source_language_get_style_name">
-                               <return-type type="char*"/>
+                               <return-type type="gchar*"/>
                                <parameters>
                                        <parameter name="language" type="GtkSourceLanguage*"/>
-                                       <parameter name="style_id" type="char*"/>
+                                       <parameter name="style_id" type="gchar*"/>
                                </parameters>
                        </method>
                        <property name="hidden" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
@@ -314,6 +328,14 @@
                                        <parameter name="lm" type="GtkSourceLanguageManager*"/>
                                </parameters>
                        </method>
+                       <method name="guess_language" symbol="gtk_source_language_manager_guess_language">
+                               <return-type type="GtkSourceLanguage*"/>
+                               <parameters>
+                                       <parameter name="lm" type="GtkSourceLanguageManager*"/>
+                                       <parameter name="filename" type="gchar*"/>
+                                       <parameter name="content_type" type="gchar*"/>
+                               </parameters>
+                       </method>
                        <constructor name="new" symbol="gtk_source_language_manager_new">
                                <return-type type="GtkSourceLanguageManager*"/>
                        </constructor>
@@ -324,8 +346,8 @@
                                        <parameter name="dirs" type="gchar**"/>
                                </parameters>
                        </method>
-                       <property name="language-ids" type="char*[]" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="search-path" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="language-ids" type="GStrv*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="search-path" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
                <object name="GtkSourceMark" parent="GtkTextMark" type-name="GtkSourceMark" get-type="gtk_source_mark_get_type">
                        <method name="get_category" symbol="gtk_source_mark_get_category">
@@ -744,8 +766,8 @@
                                        <parameter name="path" type="gchar**"/>
                                </parameters>
                        </method>
-                       <property name="scheme-ids" type="char*[]" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="search-path" type="char*[]" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="scheme-ids" type="GStrv*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="search-path" type="GStrv*" readable="1" writable="1" construct="0" construct-only="0"/>
                </object>
                <object name="GtkSourceView" parent="GtkTextView" type-name="GtkSourceView" get-type="gtk_source_view_get_type">
                        <implements>
@@ -758,6 +780,12 @@
                                        <parameter name="view" type="GtkSourceView*"/>
                                </parameters>
                        </method>
+                       <method name="get_draw_spaces" symbol="gtk_source_view_get_draw_spaces">
+                               <return-type type="GtkSourceDrawSpacesFlags"/>
+                               <parameters>
+                                       <parameter name="view" type="GtkSourceView*"/>
+                               </parameters>
+                       </method>
                        <method name="get_highlight_current_line" symbol="gtk_source_view_get_highlight_current_line">
                                <return-type type="gboolean"/>
                                <parameters>
@@ -782,6 +810,14 @@
                                        <parameter name="view" type="GtkSourceView*"/>
                                </parameters>
                        </method>
+                       <method name="get_mark_category_background" symbol="gtk_source_view_get_mark_category_background">
+                               <return-type type="gboolean"/>
+                               <parameters>
+                                       <parameter name="view" type="GtkSourceView*"/>
+                                       <parameter name="category" type="gchar*"/>
+                                       <parameter name="dest" type="GdkColor*"/>
+                               </parameters>
+                       </method>
                        <method name="get_mark_category_pixbuf" symbol="gtk_source_view_get_mark_category_pixbuf">
                                <return-type type="GdkPixbuf*"/>
                                <parameters>
@@ -848,6 +884,13 @@
                                        <parameter name="enable" type="gboolean"/>
                                </parameters>
                        </method>
+                       <method name="set_draw_spaces" symbol="gtk_source_view_set_draw_spaces">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="view" type="GtkSourceView*"/>
+                                       <parameter name="flags" type="GtkSourceDrawSpacesFlags"/>
+                               </parameters>
+                       </method>
                        <method name="set_highlight_current_line" symbol="gtk_source_view_set_highlight_current_line">
                                <return-type type="void"/>
                                <parameters>
@@ -876,6 +919,14 @@
                                        <parameter name="enable" type="gboolean"/>
                                </parameters>
                        </method>
+                       <method name="set_mark_category_background" symbol="gtk_source_view_set_mark_category_background">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="view" type="GtkSourceView*"/>
+                                       <parameter name="category" type="gchar*"/>
+                                       <parameter name="color" type="GdkColor*"/>
+                               </parameters>
+                       </method>
                        <method name="set_mark_category_pixbuf" symbol="gtk_source_view_set_mark_category_pixbuf">
                                <return-type type="void"/>
                                <parameters>
@@ -892,6 +943,26 @@
                                        <parameter name="priority" type="gint"/>
                                </parameters>
                        </method>
+                       <method name="set_mark_category_tooltip_func" symbol="gtk_source_view_set_mark_category_tooltip_func">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="view" type="GtkSourceView*"/>
+                                       <parameter name="category" type="gchar*"/>
+                                       <parameter name="func" type="GtkSourceViewMarkTooltipFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="user_data_notify" type="GDestroyNotify"/>
+                               </parameters>
+                       </method>
+                       <method name="set_mark_category_tooltip_markup_func" symbol="gtk_source_view_set_mark_category_tooltip_markup_func">
+                               <return-type type="void"/>
+                               <parameters>
+                                       <parameter name="view" type="GtkSourceView*"/>
+                                       <parameter name="category" type="gchar*"/>
+                                       <parameter name="markup_func" type="GtkSourceViewMarkTooltipFunc"/>
+                                       <parameter name="user_data" type="gpointer"/>
+                                       <parameter name="user_data_notify" type="GDestroyNotify"/>
+                               </parameters>
+                       </method>
                        <method name="set_right_margin_position" symbol="gtk_source_view_set_right_margin_position">
                                <return-type type="void"/>
                                <parameters>
@@ -935,6 +1006,7 @@
                                </parameters>
                        </method>
                        <property name="auto-indent" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="draw-spaces" type="GtkSourceDrawSpacesFlags" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="highlight-current-line" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="indent-on-tab" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="indent-width" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>