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



commit 76db24121c89ba09e3a37d5484248c9e8efa76e3
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Aug 21 13:13:49 2012 +1200

    libgames-support: Remove obsolete GamesFileList

 glines/src/Makefile.am                             |    2 ++
 {libgames-support => glines/src}/games-file-list.c |    0
 {libgames-support => glines/src}/games-file-list.h |    0
 glines/src/glines.c                                |    2 +-
 gnobots2/src/Makefile.am                           |    2 ++
 gnobots2/src/find-file.c                           |    2 +-
 .../src}/games-file-list.c                         |    0
 .../src}/games-file-list.h                         |    0
 gnobots2/src/properties.c                          |    2 +-
 libgames-support/GnomeGamesSupport-1.0.vapi        |   18 ------------------
 libgames-support/Makefile.am                       |    2 --
 11 files changed, 7 insertions(+), 23 deletions(-)
---
diff --git a/glines/src/Makefile.am b/glines/src/Makefile.am
index a1345ad..d6d9b39 100644
--- a/glines/src/Makefile.am
+++ b/glines/src/Makefile.am
@@ -1,6 +1,8 @@
 bin_PROGRAMS = glines
 
 glines_SOURCES =	\
+	games-file-list.c	\
+	games-file-list.h	\
 	glines.c	\
 	glines.h
 
diff --git a/libgames-support/games-file-list.c b/glines/src/games-file-list.c
similarity index 100%
copy from libgames-support/games-file-list.c
copy to glines/src/games-file-list.c
diff --git a/libgames-support/games-file-list.h b/glines/src/games-file-list.h
similarity index 100%
copy from libgames-support/games-file-list.h
copy to glines/src/games-file-list.h
diff --git a/glines/src/glines.c b/glines/src/glines.c
index 8e270dc..f844b1e 100644
--- a/glines/src/glines.c
+++ b/glines/src/glines.c
@@ -36,7 +36,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-file-list.h>
 #include <libgames-support/games-gridframe.h>
 #include <libgames-support/games-preimage.h>
 #include <libgames-support/games-scores.h>
@@ -45,6 +44,7 @@
 #include <libgames-support/games-stock.h>
 
 #include "glines.h"
+#include "games-file-list.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 903036e..826132d 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-file-list.c \
+	games-file-list.h \
 	cursor-down.h \
 	cursor-down-left.h \
 	cursor-down-right.h \
diff --git a/gnobots2/src/find-file.c b/gnobots2/src/find-file.c
index ec9fc22..3a005ec 100644
--- a/gnobots2/src/find-file.c
+++ b/gnobots2/src/find-file.c
@@ -22,8 +22,8 @@
 
 #include <glib.h>
 
-#include <libgames-support/games-file-list.h>
 #include "find-file.h"
+#include "games-file-list.h"
 
 static gchar *
 make_canonical_name (const gchar * name)
diff --git a/libgames-support/games-file-list.c b/gnobots2/src/games-file-list.c
similarity index 100%
rename from libgames-support/games-file-list.c
rename to gnobots2/src/games-file-list.c
diff --git a/libgames-support/games-file-list.h b/gnobots2/src/games-file-list.h
similarity index 100%
rename from libgames-support/games-file-list.h
rename to gnobots2/src/games-file-list.h
diff --git a/gnobots2/src/properties.c b/gnobots2/src/properties.c
index 80c7470..cc7b53d 100644
--- a/gnobots2/src/properties.c
+++ b/gnobots2/src/properties.c
@@ -28,7 +28,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <libgames-support/games-controls.h>
-#include <libgames-support/games-file-list.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 #include <libgames-support/games-settings.h>
@@ -41,6 +40,7 @@
 #include "keyboard.h"
 #include "game.h"
 #include "menu.h"
+#include "games-file-list.h"
 
 
 /**********************************************************************/
diff --git a/libgames-support/GnomeGamesSupport-1.0.vapi b/libgames-support/GnomeGamesSupport-1.0.vapi
index 79788d8..a548204 100644
--- a/libgames-support/GnomeGamesSupport-1.0.vapi
+++ b/libgames-support/GnomeGamesSupport-1.0.vapi
@@ -171,24 +171,6 @@ namespace GnomeGamesSupport
         public Gdk.Pixbuf render_unscaled_pixbuf ();
     }
 
-    [CCode (cheader_filename = "games-file-list.h")]
-    public const int FILE_LIST_REMOVE_EXTENSION;
-    [CCode (cheader_filename = "games-file-list.h")]
-    public const int FILE_LIST_REPLACE_UNDERSCORES;
-
-    [CCode (cheader_filename = "games-file-list.h")]
-    public class FileList : GLib.Object
-    {
-        public FileList (string glob, ...);
-        public FileList.images (string path1, ...);
-        public void transform_basename ();
-        public size_t length ();
-        public void for_each (GLib.Func<string> function);
-        public string find (GLib.CompareFunc function);
-        public unowned string? get_nth (int n);
-        public Gtk.Widget create_widget (string selection, uint flags);
-    }
-
     [CCode (cheader_filename = "games-controls.h")]
     public class ControlsList : Gtk.ScrolledWindow
     {
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 0f4a66e..5b2a3c4 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -7,8 +7,6 @@ libgames_support_la_SOURCES = \
 	games-preimage.h		\
 	games-settings.c		\
 	games-settings.h		\
-	games-file-list.c		\
-	games-file-list.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]