GNOME.org
 

[gnome-games] libgames-support: Remove GamesControls

commit 6b067bd1e3973dcb054d64b9487e9e34053cbf26
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu Aug 30 13:12:18 2012 +1200

    libgames-support: Remove GamesControls

 gnect/src/Makefile.am                              |    2 ++
 {libgames-support => gnect/src}/games-controls.c   |    0
 {libgames-support => gnect/src}/games-controls.h   |    0
 gnect/src/prefs.c                                  |    3 +--
 gnibbles/src/Makefile.am                           |    2 ++
 .../src}/games-controls.c                          |    0
 .../src}/games-controls.h                          |    0
 gnibbles/src/preferences.c                         |    3 +--
 gnobots2/src/Makefile.am                           |    2 ++
 .../src}/games-controls.c                          |    0
 .../src}/games-controls.h                          |    0
 gnobots2/src/properties.c                          |    2 +-
 libgames-support/GnomeGamesSupport-1.0.vapi        |    8 --------
 libgames-support/Makefile.am                       |    2 --
 po/POTFILES.in                                     |    4 +++-
 15 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/gnect/src/Makefile.am b/gnect/src/Makefile.am
index 8cd9318..95e8627 100644
--- a/gnect/src/Makefile.am
+++ b/gnect/src/Makefile.am
@@ -14,6 +14,8 @@ gnect_SOURCES = main.h     \
                 connect4.h \
                 connect4.c \
                 evaluate.c \
+                games-controls.c \
+                games-controls.h \
                 games-fullscreen-action.c \
                 games-fullscreen-action.h \
                 games-gridframe.c \
diff --git a/libgames-support/games-controls.c b/gnect/src/games-controls.c
similarity index 100%
copy from libgames-support/games-controls.c
copy to gnect/src/games-controls.c
diff --git a/libgames-support/games-controls.h b/gnect/src/games-controls.h
similarity index 100%
copy from libgames-support/games-controls.h
copy to gnect/src/games-controls.h
diff --git a/gnect/src/prefs.c b/gnect/src/prefs.c
index 12a2c99..0193dcc 100644
--- a/gnect/src/prefs.c
+++ b/gnect/src/prefs.c
@@ -30,12 +30,11 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-controls.h>
-
 #include "main.h"
 #include "theme.h"
 #include "prefs.h"
 #include "gfx.h"
+#include "games-controls.h"
 
 #define DEFAULT_THEME_ID       0
 #define DEFAULT_KEY_LEFT       GDK_KEY_Left
diff --git a/gnibbles/src/Makefile.am b/gnibbles/src/Makefile.am
index bc60536..b582713 100644
--- a/gnibbles/src/Makefile.am
+++ b/gnibbles/src/Makefile.am
@@ -9,6 +9,8 @@ gnibbles_SOURCES = \
 	warp.c \
 	warpmanager.h \
 	warpmanager.c \
+	games-controls.h \
+	games-controls.c \
 	games-fullscreen-action.h \
 	games-fullscreen-action.c \
 	games-gridframe.h \
diff --git a/libgames-support/games-controls.c b/gnibbles/src/games-controls.c
similarity index 100%
copy from libgames-support/games-controls.c
copy to gnibbles/src/games-controls.c
diff --git a/libgames-support/games-controls.h b/gnibbles/src/games-controls.h
similarity index 100%
copy from libgames-support/games-controls.h
copy to gnibbles/src/games-controls.h
diff --git a/gnibbles/src/preferences.c b/gnibbles/src/preferences.c
index f5670f9..c6d5b79 100644
--- a/gnibbles/src/preferences.c
+++ b/gnibbles/src/preferences.c
@@ -26,11 +26,10 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-controls.h>
-
 #include "preferences.h"
 #include "main.h"
 #include "games-pause-action.h"
+#include "games-controls.h"
 
 #define KB_TEXT_WIDTH 60
 #define KB_TEXT_HEIGHT 32
diff --git a/gnobots2/src/Makefile.am b/gnobots2/src/Makefile.am
index e0ed83e..84149ff 100644
--- a/gnobots2/src/Makefile.am
+++ b/gnobots2/src/Makefile.am
@@ -24,6 +24,8 @@ gnobots2_SOURCES = \
 	gbdefs.h \
 	find-file.c \
 	find-file.h \
+	games-controls.c \
+	games-controls.h \
 	games-file-list.c \
 	games-file-list.h \
 	games-fullscreen-action.c \
diff --git a/libgames-support/games-controls.c b/gnobots2/src/games-controls.c
similarity index 100%
rename from libgames-support/games-controls.c
rename to gnobots2/src/games-controls.c
diff --git a/libgames-support/games-controls.h b/gnobots2/src/games-controls.h
similarity index 100%
rename from libgames-support/games-controls.h
rename to gnobots2/src/games-controls.h
diff --git a/gnobots2/src/properties.c b/gnobots2/src/properties.c
index f96d456..ae5e4f9 100644
--- a/gnobots2/src/properties.c
+++ b/gnobots2/src/properties.c
@@ -27,7 +27,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-controls.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 
@@ -40,6 +39,7 @@
 #include "game.h"
 #include "menu.h"
 #include "games-file-list.h"
+#include "games-controls.h"
 
 
 /**********************************************************************/
diff --git a/libgames-support/GnomeGamesSupport-1.0.vapi b/libgames-support/GnomeGamesSupport-1.0.vapi
index 3fe11c4..1738cb8 100644
--- a/libgames-support/GnomeGamesSupport-1.0.vapi
+++ b/libgames-support/GnomeGamesSupport-1.0.vapi
@@ -63,13 +63,5 @@ namespace GnomeGamesSupport
         public void set_message (string? message);
         public void set_buttons (uint buttons);
     }
-
-    [CCode (cheader_filename = "games-controls.h")]
-    public class ControlsList : Gtk.ScrolledWindow
-    {
-        public ControlsList (GLib.Settings settings);
-        public void add_control (string conf_key, string label, uint default_keyval);
-        public void add_controls (string first_conf_key, ...);
-    }
 }
 
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 1c0ed99..45a5f51 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -7,8 +7,6 @@ libgames_support_la_SOURCES = \
 	games-scores.h			\
 	games-scores-dialog.c	\
 	games-scores-dialog.h	\
-	games-controls.c		\
-	games-controls.h		\
 	games-scores-backend.c	\
 	games-scores-backend.h
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 097cf22..e5c8423 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -30,6 +30,7 @@ glines/src/games-stock.c
 glines/src/glines.c
 gnect/data/gnect.desktop.in.in
 gnect/data/org.gnome.gnect.gschema.xml.in
+gnect/src/games-controls.c
 gnect/src/games-stock.c
 gnect/src/gfx.c
 gnect/src/main.c
@@ -39,6 +40,7 @@ gnect/src/theme.c
 gnibbles/data/gnibbles.desktop.in.in
 gnibbles/data/org.gnome.gnibbles.gschema.xml.in
 gnibbles/src/board.c
+gnibbles/src/games-controls.c
 gnibbles/src/games-stock.c
 gnibbles/src/gnibbles.c
 gnibbles/src/main.c
@@ -47,6 +49,7 @@ gnibbles/src/scoreboard.c
 gnobots2/data/gnobots2.desktop.in.in
 gnobots2/data/org.gnome.gnobots2.gschema.xml.in
 gnobots2/src/game.c
+gnobots2/src/games-controls.c
 gnobots2/src/games-stock.c
 gnobots2/src/gnobots.c
 gnobots2/src/graphics.c
@@ -113,7 +116,6 @@ iagno/src/computer-player.vala
 iagno/src/game.vala
 iagno/src/game-view.vala
 iagno/src/iagno.vala
-libgames-support/games-controls.c
 libgames-support/games-scores-dialog.c
 lightsoff/data/lightsoff.desktop.in.in
 lightsoff/data/org.gnome.lightsoff.gschema.xml.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]