[gnome-nibbles] Use Games.Gridframe from libgames-support
- From: Iulian Radu <iulianradu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-nibbles] Use Games.Gridframe from libgames-support
- Date: Mon, 26 Oct 2015 00:15:32 +0000 (UTC)
commit 4d9729d73ff4f49aa30fc09f20db4dce89b61134
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun Jun 28 19:13:39 2015 -0500
Use Games.Gridframe from libgames-support
configure.ac | 1 +
src/Makefile.am | 6 +-
src/games-gridframe.c | 276 ----------------------------------------------
src/games-gridframe.h | 63 -----------
src/games-gridframe.vapi | 25 ----
src/gnome-nibbles.vala | 4 +-
6 files changed, 5 insertions(+), 370 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ddb1e38..d0cf4c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ PKG_CHECK_MODULES(GNOME_NIBBLES, [
clutter-1.0 >= $CLUTTER_REQUIRED
clutter-gtk-1.0 >= $CLUTTER_REQUIRED
gee-0.8
+ libgames-support-1.0
])
AC_SUBST([GLIB_REQUIRED])
diff --git a/src/Makefile.am b/src/Makefile.am
index a379e11..6d3a192 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,6 @@ gnome_nibbles_SOURCES = \
gnome-nibbles.vala \
nibbles-view.vala \
nibbles-game.vala \
- games-gridframe.h \
- games-gridframe.c \
worm.vala \
$(BUILT_SOURCES)
@@ -28,10 +26,10 @@ gnome_nibbles_VALAFLAGS = \
--pkg clutter-gtk-1.0 \
--pkg libcanberra \
--pkg libcanberra-gtk \
+ --pkg libgames-support-1.0 \
--pkg gee-0.8 \
--target-glib=$(GLIB_REQUIRED) \
- --gresources=$(builddir)/gnome-nibbles.gresource.xml \
- games-gridframe.vapi
+ --gresources=$(builddir)/gnome-nibbles.gresource.xml
gnome_nibbles_LDADD = \
$(GNOME_NIBBLES_LIBS)
diff --git a/src/gnome-nibbles.vala b/src/gnome-nibbles.vala
index 859cf88..761bd8d 100644
--- a/src/gnome-nibbles.vala
+++ b/src/gnome-nibbles.vala
@@ -28,7 +28,7 @@ public class Nibbles : Gtk.Application
private Gtk.ApplicationWindow window;
private Gtk.HeaderBar headerbar;
private Gtk.Stack main_stack;
- private GamesGridFrame frame;
+ private Games.GridFrame frame;
private NibblesView? view;
private NibblesGame? game = null;
@@ -191,7 +191,7 @@ public class Nibbles : Gtk.Application
view = new NibblesView (game);
view.configure_event.connect (configure_event_cb);
- frame = new GamesGridFrame (NibblesGame.WIDTH, NibblesGame.HEIGHT);
+ frame = new Games.GridFrame (NibblesGame.WIDTH, NibblesGame.HEIGHT);
main_stack.add_named (frame, "frame");
frame.add (view);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]