GNOME.org
 

[gnome-games] libgames-support: Remove obsolete GamesPreimage

commit d53bcc2a9ad98e8b8525fc2bdf0913a643b9e794
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Aug 21 15:20:14 2012 +1200

    libgames-support: Remove obsolete GamesPreimage

 glines/src/Makefile.am                             |    2 ++
 {libgames-support => glines/src}/games-preimage.c  |    0
 {libgames-support => glines/src}/games-preimage.h  |    0
 glines/src/glines.c                                |    2 +-
 gnobots2/src/Makefile.am                           |    2 ++
 .../src}/games-preimage.c                          |    0
 .../src}/games-preimage.h                          |    0
 gnobots2/src/graphics.c                            |    2 +-
 gnotski/src/Makefile.am                            |    2 ++
 {libgames-support => gnotski/src}/games-preimage.c |    0
 {libgames-support => gnotski/src}/games-preimage.h |    0
 gnotski/src/gnotski.c                              |    2 +-
 libgames-support/GnomeGamesSupport-1.0.vapi        |   16 ----------------
 libgames-support/Makefile.am                       |    2 --
 14 files changed, 9 insertions(+), 21 deletions(-)
---
diff --git a/glines/src/Makefile.am b/glines/src/Makefile.am
index d6d9b39..ce42a4a 100644
--- a/glines/src/Makefile.am
+++ b/glines/src/Makefile.am
@@ -3,6 +3,8 @@ bin_PROGRAMS = glines
 glines_SOURCES =	\
 	games-file-list.c	\
 	games-file-list.h	\
+	games-preimage.c	\
+	games-preimage.h	\
 	glines.c	\
 	glines.h
 
diff --git a/libgames-support/games-preimage.c b/glines/src/games-preimage.c
similarity index 100%
copy from libgames-support/games-preimage.c
copy to glines/src/games-preimage.c
diff --git a/libgames-support/games-preimage.h b/glines/src/games-preimage.h
similarity index 100%
copy from libgames-support/games-preimage.h
copy to glines/src/games-preimage.h
diff --git a/glines/src/glines.c b/glines/src/glines.c
index f844b1e..940397c 100644
--- a/glines/src/glines.c
+++ b/glines/src/glines.c
@@ -37,7 +37,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <libgames-support/games-gridframe.h>
-#include <libgames-support/games-preimage.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-settings.h>
@@ -45,6 +44,7 @@
 
 #include "glines.h"
 #include "games-file-list.h"
+#include "games-preimage.h"
 
 #define KEY_BACKGROUND_COLOR  "background-color"
 #define KEY_BALL_THEME        "ball-theme"
diff --git a/gnobots2/src/Makefile.am b/gnobots2/src/Makefile.am
index 826132d..888fe54 100644
--- a/gnobots2/src/Makefile.am
+++ b/gnobots2/src/Makefile.am
@@ -26,6 +26,8 @@ gnobots2_SOURCES = \
 	find-file.h \
 	games-file-list.c \
 	games-file-list.h \
+	games-preimage.c \
+	games-preimage.h \
 	cursor-down.h \
 	cursor-down-left.h \
 	cursor-down-right.h \
diff --git a/libgames-support/games-preimage.c b/gnobots2/src/games-preimage.c
similarity index 100%
copy from libgames-support/games-preimage.c
copy to gnobots2/src/games-preimage.c
diff --git a/libgames-support/games-preimage.h b/gnobots2/src/games-preimage.h
similarity index 100%
copy from libgames-support/games-preimage.h
copy to gnobots2/src/games-preimage.h
diff --git a/gnobots2/src/graphics.c b/gnobots2/src/graphics.c
index e0da667..f60b724 100644
--- a/gnobots2/src/graphics.c
+++ b/gnobots2/src/graphics.c
@@ -25,7 +25,6 @@
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include <libgames-support/games-preimage.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 
@@ -41,6 +40,7 @@
 #include "game.h"
 #include "gnobots.h"
 #include "properties.h"
+#include "games-preimage.h"
 
 /**********************************************************************/
 
diff --git a/gnotski/src/Makefile.am b/gnotski/src/Makefile.am
index 74e1c5f..d75fec9 100644
--- a/gnotski/src/Makefile.am
+++ b/gnotski/src/Makefile.am
@@ -2,6 +2,8 @@ bin_PROGRAMS = gnotski
 
 gnotski_SOURCES = \
 	gnotski.c	\
+	games-preimage.c	\
+	games-preimage.h	\
 	pieces.h
 
 gnotski_CPPFLAGS = \
diff --git a/libgames-support/games-preimage.c b/gnotski/src/games-preimage.c
similarity index 100%
rename from libgames-support/games-preimage.c
rename to gnotski/src/games-preimage.c
diff --git a/libgames-support/games-preimage.h b/gnotski/src/games-preimage.h
similarity index 100%
rename from libgames-support/games-preimage.h
rename to gnotski/src/games-preimage.h
diff --git a/gnotski/src/gnotski.c b/gnotski/src/gnotski.c
index e55544b..8658494 100644
--- a/gnotski/src/gnotski.c
+++ b/gnotski/src/gnotski.c
@@ -30,13 +30,13 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <libgames-support/games-gridframe.h>
-#include <libgames-support/games-preimage.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-stock.h>
 #include <libgames-support/games-fullscreen-action.h>
 
 #include "pieces.h"
+#include "games-preimage.h"
 
 #define APPNAME "gnotski"
 #define APPNAME_LONG N_("Klotski")
diff --git a/libgames-support/GnomeGamesSupport-1.0.vapi b/libgames-support/GnomeGamesSupport-1.0.vapi
index a548204..64bbd57 100644
--- a/libgames-support/GnomeGamesSupport-1.0.vapi
+++ b/libgames-support/GnomeGamesSupport-1.0.vapi
@@ -155,22 +155,6 @@ namespace GnomeGamesSupport
         public void set_buttons (uint buttons);
     }
 
-    [CCode (cheader_filename = "games-preimage.h")]
-    public class Preimage : GLib.Object
-    {
-        public Preimage ();
-        public Preimage.from_file (string filename) throws GLib.Error;
-        public void set_font_options (Cairo.FontOptions font_options);
-        public Gdk.Pixbuf render (int width, int height);
-        public void render_cairo (Cairo.Context cr, int width, int height);
-        public Gdk.Pixbuf render_sub (string node, int width, int height, double xoffset, double yoffset, double xzoom, double yzoom);
-        public void render_cairo_sub (Cairo.Context cr, string? node, int width, int height, double xoffset, double yoffset, double xzoom, double yzoom);
-        public bool is_scalable ();
-        public int get_width ();
-        public int get_height ();
-        public Gdk.Pixbuf render_unscaled_pixbuf ();
-    }
-
     [CCode (cheader_filename = "games-controls.h")]
     public class ControlsList : Gtk.ScrolledWindow
     {
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 5b2a3c4..3197a62 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -3,8 +3,6 @@ noinst_LTLIBRARIES = libgames-support.la
 libgames_support_la_SOURCES = \
 	games-stock.c			\
 	games-stock.h			\
-	games-preimage.c		\
-	games-preimage.h		\
 	games-settings.c		\
 	games-settings.h		\
 	games-fullscreen-action.c	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]