[gnome-games] Remove GamesFrame from libgames-support, copying it into gnibbles and gtali which haven't had it rem
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games] Remove GamesFrame from libgames-support, copying it into gnibbles and gtali which haven't had it rem
- Date: Mon, 23 Jul 2012 03:18:59 +0000 (UTC)
commit 44cc520b7a732c0e0a393835b90877da5630cdfd
Author: Robert Ancell <robert ancell canonical com>
Date: Mon Jul 23 15:18:50 2012 +1200
Remove GamesFrame from libgames-support, copying it into gnibbles and gtali which haven't had it removed
gnibbles/src/Makefile.am | 4 +++-
{libgames-support => gnibbles/src}/games-frame.c | 0
{libgames-support => gnibbles/src}/games-frame.h | 0
gnibbles/src/preferences.c | 2 +-
gtali/src/Makefile.am | 4 +++-
{libgames-support => gtali/src}/games-frame.c | 0
{libgames-support => gtali/src}/games-frame.h | 0
gtali/src/setup.c | 3 +--
libgames-support/GnomeGamesSupport-1.0.vapi | 7 -------
libgames-support/Makefile.am | 2 --
10 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/gnibbles/src/Makefile.am b/gnibbles/src/Makefile.am
index 928b8fb..d4823d3 100644
--- a/gnibbles/src/Makefile.am
+++ b/gnibbles/src/Makefile.am
@@ -24,7 +24,9 @@ gnibbles_SOURCES = \
sound.c \
sound.h \
worm.c \
- worm.h
+ worm.h \
+ games-frame.c \
+ games-frame.h
gnibbles_CPPFLAGS = \
-I$(top_srcdir) \
diff --git a/libgames-support/games-frame.c b/gnibbles/src/games-frame.c
similarity index 100%
copy from libgames-support/games-frame.c
copy to gnibbles/src/games-frame.c
diff --git a/libgames-support/games-frame.h b/gnibbles/src/games-frame.h
similarity index 100%
copy from libgames-support/games-frame.h
copy to gnibbles/src/games-frame.h
diff --git a/gnibbles/src/preferences.c b/gnibbles/src/preferences.c
index ab09e37..f26f66a 100644
--- a/gnibbles/src/preferences.c
+++ b/gnibbles/src/preferences.c
@@ -26,11 +26,11 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <libgames-support/games-frame.h>
#include <libgames-support/games-controls.h>
#include <libgames-support/games-pause-action.h>
#include "preferences.h"
+#include "games-frame.h"
#include "main.h"
#define KB_TEXT_WIDTH 60
diff --git a/gtali/src/Makefile.am b/gtali/src/Makefile.am
index 980adfb..aac6352 100644
--- a/gtali/src/Makefile.am
+++ b/gtali/src/Makefile.am
@@ -7,7 +7,9 @@ gtali_SOURCES = \
yahtzee.h \
yahtzee.c \
computer.c \
- setup.c
+ setup.c \
+ games-frame.c \
+ games-frame.h
gtali_CPPFLAGS = \
-I$(top_srcdir) \
diff --git a/libgames-support/games-frame.c b/gtali/src/games-frame.c
similarity index 100%
rename from libgames-support/games-frame.c
rename to gtali/src/games-frame.c
diff --git a/libgames-support/games-frame.h b/gtali/src/games-frame.h
similarity index 100%
rename from libgames-support/games-frame.h
rename to gtali/src/games-frame.h
diff --git a/gtali/src/setup.c b/gtali/src/setup.c
index 0e44708..a8104cf 100644
--- a/gtali/src/setup.c
+++ b/gtali/src/setup.c
@@ -33,10 +33,9 @@
#include <gtk/gtk.h>
-#include <libgames-support/games-frame.h>
-
#include "yahtzee.h"
#include "gyahtzee.h"
+#include "games-frame.h"
static gint setupdialog_destroy (GtkWidget * widget, gint mode);
static GtkWidget *setupdialog = NULL;
diff --git a/libgames-support/GnomeGamesSupport-1.0.vapi b/libgames-support/GnomeGamesSupport-1.0.vapi
index 3eda331..79788d8 100644
--- a/libgames-support/GnomeGamesSupport-1.0.vapi
+++ b/libgames-support/GnomeGamesSupport-1.0.vapi
@@ -155,13 +155,6 @@ namespace GnomeGamesSupport
public void set_buttons (uint buttons);
}
- [CCode (cheader_filename = "games-frame.h")]
- public class Frame : Gtk.Box
- {
- public Frame (string label);
- void set_label (string label);
- }
-
[CCode (cheader_filename = "games-preimage.h")]
public class Preimage : GLib.Object
{
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index a818a29..75faf1e 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -11,8 +11,6 @@ libgames_support_la_SOURCES = \
games-settings.h \
games-file-list.c \
games-file-list.h \
- games-frame.c \
- games-frame.h \
games-fullscreen-action.c \
games-fullscreen-action.h \
games-gridframe.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]