gtksourceview-2.0: Make some interface methods virtual, not abstract

Fixes bug 628704.

diff --git a/vapi/gtksourceview-2.0.vapi b/vapi/gtksourceview-2.0.vapi
index 18212bbd67cf8b0619a902497a1e52c9ef8b9de4..899983ca5d6c946f8f20b81d1780cd5551b20d12 100644 (file)
--- a/vapi/gtksourceview-2.0.vapi
+++ b/vapi/gtksourceview-2.0.vapi
@@ -414,29 +414,29 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
        public interface SourceCompletionProposal : GLib.Object {
-               public abstract bool equal (Gtk.SourceCompletionProposal other);
-               public abstract unowned Gdk.Pixbuf get_icon ();
-               public abstract unowned string get_info ();
-               public abstract unowned string get_label ();
-               public abstract unowned string get_markup ();
-               public abstract unowned string get_text ();
-               public abstract uint hash ();
+               public virtual bool equal (Gtk.SourceCompletionProposal other);
+               public virtual unowned Gdk.Pixbuf get_icon ();
+               public virtual unowned string get_info ();
+               public virtual unowned string get_label ();
+               public virtual unowned string get_markup ();
+               public virtual unowned string get_text ();
+               public virtual uint hash ();
                [HasEmitter]
                public signal void changed ();
        }
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
        public interface SourceCompletionProvider : GLib.Object {
-               public abstract bool activate_proposal (Gtk.SourceCompletionProposal proposal, Gtk.TextIter iter);
-               public abstract Gtk.SourceCompletionActivation get_activation ();
-               public abstract unowned Gdk.Pixbuf? get_icon ();
-               public abstract unowned Gtk.Widget? get_info_widget (Gtk.SourceCompletionProposal proposal);
-               public abstract int get_interactive_delay ();
-               public abstract string get_name ();
-               public abstract int get_priority ();
-               public abstract bool get_start_iter (Gtk.SourceCompletionContext context, Gtk.SourceCompletionProposal proposal, Gtk.TextIter iter);
-               public abstract bool match (Gtk.SourceCompletionContext context);
-               public abstract void populate (Gtk.SourceCompletionContext context);
-               public abstract void update_info (Gtk.SourceCompletionProposal proposal, Gtk.SourceCompletionInfo info);
+               public virtual bool activate_proposal (Gtk.SourceCompletionProposal proposal, Gtk.TextIter iter);
+               public virtual Gtk.SourceCompletionActivation get_activation ();
+               public virtual unowned Gdk.Pixbuf get_icon ();
+               public virtual unowned Gtk.Widget get_info_widget (Gtk.SourceCompletionProposal proposal);
+               public virtual int get_interactive_delay ();
+               public virtual unowned string get_name ();
+               public virtual int get_priority ();
+               public virtual bool get_start_iter (Gtk.SourceCompletionContext context, Gtk.SourceCompletionProposal proposal, Gtk.TextIter iter);
+               public virtual bool match (Gtk.SourceCompletionContext context);
+               public virtual void populate (Gtk.SourceCompletionContext context);
+               public virtual void update_info (Gtk.SourceCompletionProposal proposal, Gtk.SourceCompletionInfo info);
        }
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
        public interface SourceUndoManager : GLib.Object {
@@ -501,9 +501,9 @@ namespace Gtk {
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
        public delegate unowned string SourceViewMarkTooltipFunc (Gtk.SourceMark mark);
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-       public extern const string SOURCE_COMPLETION_CAPABILITY_AUTOMATIC;
+       public const string SOURCE_COMPLETION_CAPABILITY_AUTOMATIC;
        [CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
-       public extern const string SOURCE_COMPLETION_CAPABILITY_INTERACTIVE;
+       public const string SOURCE_COMPLETION_CAPABILITY_INTERACTIVE;
        [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")]

diff --git a/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.metadata b/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.metadata
index 4559529c58667bf141335387ee9db320f26000bd..3dbee0169d15eba165c53a3873ed24716a5702a6 100644 (file)
--- a/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.metadata
+++ b/vapi/packages/gtksourceview-2.0/gtksourceview-2.0.metadata
@@ -34,6 +34,11 @@ gtk_source_language_manager_get_language_ids is_array="1" nullable="1" array_nul
 gtk_source_language_manager_get_search_path is_array="1" nullable="1" array_null_terminated="1"
 gtk_source_language_manager_set_search_path.dirs is_array="1" nullable="1" array_null_terminated="1"
 GtkSourcePrintCompositor cheader_filename="gtksourceview/gtksourceprintcompositor.h"
+gtk_source_completion_provider_* virtual="1"
+gtk_source_completion_provider_get_name virtual="1"
+gtk_source_completion_provider_get_icon virtual="1"
+gtk_source_completion_provider_get_info_widget virtual="1"
+gtk_source_completion_proposal_* virtual="1"
 GtkSourceSearchFlags cheader_filename="gtksourceview/gtksourceiter.h"
 GtkSourceStyleSchemeManager cheader_filename="gtksourceview/gtksourcestyleschememanager.h"
 gtk_source_style_copy transfer_ownership="1"

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index 22258670c4a30ec0a1fc0f95801792fa340d061e..b8dc293a844bbb16c651da6978698d863dc6cfb9 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -2250,6 +2250,9 @@ public class Vala.GIdlParser : CodeVisitor {
                                                if (eval (nv[1]) == "0") {
                                                        m.is_virtual = false;
                                                        m.is_abstract = false;
+                                               } else {
+                                                       m.is_virtual = true;
+                                                       m.is_abstract = false;
                                                }
                                        }
                                }