[gitg/wip/notebook] Get GitgDashView from the ui file
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg/wip/notebook] Get GitgDashView from the ui file
- Date: Tue, 23 Oct 2012 15:26:50 +0000 (UTC)
commit b71c05e4a8ec609eb8bba7db4df13435df138a3c
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Oct 23 16:12:48 2012 +0200
Get GitgDashView from the ui file
gitg/Makefile.am | 10 ++++++++--
gitg/gitg-window.vala | 2 ++
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 4ccd7a2..8f8ce76 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -16,15 +16,20 @@ AM_VALAFLAGS = \
--pkg Ggit-1.0 \
--pkg libgitg-1.0 \
--pkg libgitg-ext-1.0 \
+ --pkg libgitg-gtk-1.0 \
--pkg gtk+-3.0 \
--pkg gio-2.0 \
--pkg libpeas-1.0 \
--pkg gobject-introspection-1.0 \
--pkg gee-1.0 \
+ --pkg webkitgtk-3.0 \
--girdir "$(top_builddir)/libgitg" \
--girdir "$(top_builddir)/libgitg-ext" \
+ --girdir "$(top_builddir)/libgitg-gtk" \
+ --vapidir $(top_srcdir)/vapi \
--vapidir "$(top_builddir)/libgitg" \
- --vapidir "$(top_builddir)/libgitg-ext"
+ --vapidir "$(top_builddir)/libgitg-ext" \
+ --vapidir "$(top_builddir)/libgitg-gtk"
VALASOURCES = \
gitg.vala \
@@ -50,7 +55,8 @@ gitg_LDADD = \
$(GITG_LIBS) \
$(PACKAGE_LIBS) \
$(top_builddir)/libgitg/libgitg-1.0.la \
- $(top_builddir)/libgitg-ext/libgitg-ext-1.0.la
+ $(top_builddir)/libgitg-ext/libgitg-ext-1.0.la \
+ $(top_builddir)/libgitg-gtk/libgitg-gtk-1.0.la
gitg_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 6817b93..61f8348 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -36,6 +36,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable, Gtk.
private UIElements<GitgExt.Panel> d_panels;
private Gtk.Notebook d_notebook;
+ private GitgGtk.DashView d_dash_view;
private Gtk.MenuButton d_config;
@@ -70,6 +71,7 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable, Gtk.
{
// Extract widgets from the builder
d_notebook = builder.get_object("notebook") as Gtk.Notebook;
+ d_dash_view = builder.get_object("dash_view") as GitgGtk.DashView;
d_toolbar_views = builder.get_object("toolbar_views") as Gtk.Toolbar;
d_paned_views = builder.get_object("paned_views") as Gtk.Paned;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]