[model] model-gtk: Upgrade to gtk-3.0



commit a48933cb715a11956147e5e447dd48c9bafabea8
Author: Alberto Ruiz <aruiz gnome org>
Date:   Fri Oct 26 22:33:28 2012 +0200

    model-gtk: Upgrade to gtk-3.0

 gtk/Makefile.am    |    2 +-
 gtk/model-gtk.vala |    2 +-
 model/model.vapi   |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7660ed7..c3b875a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libmodel-gtk.la
 
-AM_VALAFLAGS = --vapidir $(top_srcdir)/model --pkg model --pkg gtk+-2.0 --pkg=posix --header=model-gtk.h --library=model-gtk --gir=ModelGtk-0.2.gir
+AM_VALAFLAGS = --vapidir $(top_srcdir)/model --pkg model --pkg gtk+-3.0 --pkg=posix --header=model-gtk.h --library=model-gtk --gir=ModelGtk-0.2.gir
 AM_CFLAGS = $(gtk_CFLAGS) -I$(top_srcdir)/model
 libmodel_gtk_la_LIBADD = $(gtk_LIBS) ../model/libmodel.la
 libmodel_gtk_la_SOURCES = model-gtk.vala
diff --git a/gtk/model-gtk.vala b/gtk/model-gtk.vala
index e4b0933..3f346a3 100644
--- a/gtk/model-gtk.vala
+++ b/gtk/model-gtk.vala
@@ -492,7 +492,7 @@ namespace ModelGtk {
 			return keys.length;
 		}
 
-		Gtk.TreePath get_path (Gtk.TreeIter iter) {
+		Gtk.TreePath? get_path (Gtk.TreeIter iter) {
 			return iter_to_dictionary_tracker (iter).get_tree_path ();
 		}
 
diff --git a/model/model.vapi b/model/model.vapi
index 664a83b..d573dc9 100644
--- a/model/model.vapi
+++ b/model/model.vapi
@@ -93,8 +93,8 @@ namespace Model {
     [SimpleType] [CCode (cname = "gconstpointer")]
     public struct ConstKey { }
 
-    private override Model.Object get_child (ulong index);
-    private override ulong n_children ();
+    public override Model.Object get_child (ulong index);
+    public override ulong n_children ();
 
     [NoWrapper]
     protected abstract int compare (ConstKey a, ConstKey b);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]