[gitg] Fix libgitg-gtk compilation



commit 009683eac43a04dde613fcf500016b7b4630feb9
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Oct 3 09:00:20 2012 +0200

    Fix libgitg-gtk compilation

 libgitg-gtk/Makefile.am                     |   15 +++++++++----
 libgitg-gtk/gitg-gtk-dash-view.vala         |   28 ++++++++++++++------------
 libgitg-gtk/gitg-gtk-diff-view-request.vala |    6 +++++
 3 files changed, 31 insertions(+), 18 deletions(-)
---
diff --git a/libgitg-gtk/Makefile.am b/libgitg-gtk/Makefile.am
index ee54c8d..f90b28e 100644
--- a/libgitg-gtk/Makefile.am
+++ b/libgitg-gtk/Makefile.am
@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libgitg-gtk-1.0.la
 INCLUDES =								\
 	-I$(top_srcdir)							\
 	-I$(srcdir)							\
+	-I$(srcdir)/egg-list-box					\
 	$(LIBGITG_CFLAGS)						\
 	$(LIBGITG_GTK_CFLAGS)						\
 	$(WARN_CFLAGS)							\
@@ -20,7 +21,7 @@ libgitg_gtk_1_0_la_LIBADD = 				\
 INST_H_FILES =				\
 	libgitg-gtk.h
 
-VALAFLAGS = 					\
+AM_VALAFLAGS = 					\
 	--pkg Ggit-1.0 				\
 	--pkg libgitg-1.0			\
 	--pkg gtk+-3.0				\
@@ -28,8 +29,10 @@ VALAFLAGS = 					\
 	--pkg webkitgtk-3.0			\
 	--pkg gee-1.0				\
 	--pkg json-glib-1.0			\
+	--pkg egglistbox			\
 	$(GITG_VALAFLAGS)			\
 	--vapidir $(top_srcdir)/vapi		\
+	--vapidir $(srcdir)/egg-list-box	\
 	--header libgitg-gtk.h			\
 	--includedir libgitg-gtk		\
 	--basedir $(top_srcdir)			\
@@ -51,16 +54,16 @@ VALA_FILES =						\
 	gitg-gtk-diff-view-request.vala			\
 	gitg-gtk-diff-view-request-resource.vala	\
 	gitg-gtk-diff-view-request-diff.vala		\
-	gitg-gtk-dash-view.vala				\
-	egg-list-box/egg-list-box.vala
+	gitg-gtk-dash-view.vala
 
 # Ignore all warnings for vala code...
 libgitg_gtk_1_0_la_CFLAGS =		\
 	-w
 
 libgitg_gtk_1_0_la_SOURCES = 		\
-	$(VALA_FILES)			\
-	gitg-gtk-resources.c
+	egg-list-box/egg-list-box.c	\
+	gitg-gtk-resources.c		\
+	$(VALA_FILES)
 
 headerdir = $(prefix)/include/libgitg-gtk-1.0/libgitg-gtk
 header_DATA = $(INST_H_FILES)
@@ -102,6 +105,8 @@ BUILT_SOURCES = 			\
 EXTRA_DIST = \
 	$(pkgconfig_DATA)		\
 	resources/resources.xml		\
+	egg-list-box/egglistbox.vapi	\
+	egg-list-box/egg-list-box.h	\
 	$(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir $(srcdir)/resources resources/resources.xml)
 
 CLEANFILES = $(VALA_FILES:.vala=.c)
diff --git a/libgitg-gtk/gitg-gtk-dash-view.vala b/libgitg-gtk/gitg-gtk-dash-view.vala
index a030a5e..f0bacf1 100644
--- a/libgitg-gtk/gitg-gtk-dash-view.vala
+++ b/libgitg-gtk/gitg-gtk-dash-view.vala
@@ -22,8 +22,9 @@ using Gtk;
 
 namespace GitgGtk
 {
-	public class DashView : ListBox
+	public class DashView : Box
 	{
+		private Egg.ListBox d_listbox;
 		private class RepositoryData
 		{
 			public Repository repository;
@@ -37,7 +38,18 @@ namespace GitgGtk
 
 		construct
 		{
-			set_activate_on_single_click(false);
+			d_listbox = new Egg.ListBox();
+			add(d_listbox);
+
+			d_listbox.set_activate_on_single_click(false);
+			d_listbox.child_activated.connect((listbox, child) => {
+				var data = child.get_data<RepositoryData>("data");
+
+				if (data != null)
+				{
+					repository_activated(data.repository);
+				}
+			});
 
 			var recent_manager = RecentManager.get_default();
 			var items = recent_manager.get_items();
@@ -129,17 +141,7 @@ namespace GitgGtk
 
 			data.grid.set_data<RepositoryData>("data", data);
 			data.grid.show_all();
-			add(data.grid);
-		}
-
-		public override void child_activated(Widget? child)
-		{
-			var data = child.get_data<RepositoryData>("data");
-
-			if (data != null)
-			{
-				repository_activated(data.repository);
-			}
+			d_listbox.add(data.grid);
 		}
 	}
 }
diff --git a/libgitg-gtk/gitg-gtk-diff-view-request.vala b/libgitg-gtk/gitg-gtk-diff-view-request.vala
index eeae130..91955f1 100644
--- a/libgitg-gtk/gitg-gtk-diff-view-request.vala
+++ b/libgitg-gtk/gitg-gtk-diff-view-request.vala
@@ -87,6 +87,12 @@ namespace GitgGtk
 			{
 				return (void *)stream;
 			}
+
+			public bool is_tagged(void *source_tag)
+			{
+				// FIXME: is this right?
+				return false;
+			}
 		}
 
 		public override InputStream? send_finish(AsyncResult result) throws GLib.Error



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