[gnome-games] libgames-support: blackjack: move GamesCardSelector to blackjack

[Christian Persch <chpe src gnome org>]

commit e60337e57a995fd524268ae5032f51ac0ef5d237
Author: Christian Persch <chpe gnome org>
Date:   Wed Jul 8 13:32:01 2009 +0200

    libgames-support: blackjack: move GamesCardSelector to blackjack
    
    Blackjack is the only game using the GamesCardSelector class, so move it
    to blackjack.

 blackjack/src/Makefile.am                          |    2 ++
 .../src/card-selector.cpp                          |   14 +++++++-------
 .../src/card-selector.h                            |    6 +++---
 blackjack/src/card.cpp                             |    2 +-
 libgames-support/Makefile.am                       |    9 ---------
 po/POTFILES.in                                     |    2 +-
 6 files changed, 14 insertions(+), 21 deletions(-)
---
diff --git a/blackjack/src/Makefile.am b/blackjack/src/Makefile.am
index 98014f9..e1367a5 100644
--- a/blackjack/src/Makefile.am
+++ b/blackjack/src/Makefile.am
@@ -7,6 +7,8 @@ blackjack_SOURCES = 	\
 	blackjack.h	\
 	card.cpp	\
 	card.h		\
+	card-selector.cpp \
+	card-selector.h	\
 	chips.cpp	\
 	chips.h		\
 	dialog.cpp	\
diff --git a/libgames-support/games-card-selector.c b/blackjack/src/card-selector.cpp
similarity index 92%
rename from libgames-support/games-card-selector.c
rename to blackjack/src/card-selector.cpp
index 96bf369..88cff28 100644
--- a/libgames-support/games-card-selector.c
+++ b/blackjack/src/card-selector.cpp
@@ -24,12 +24,12 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "games-card.h"
-#include "games-frame.h"
-#include "games-files.h"
-#include "games-card-theme.h"
+#include <libgames-support/games-card.h>
+#include <libgames-support/games-frame.h>
+#include <libgames-support/games-files.h>
+#include <libgames-support/games-card-theme.h>
 
-#include "games-card-selector.h"
+#include "card-selector.h"
 
 enum {
   COL_INFO,
@@ -84,7 +84,7 @@ create_combo_box (GamesCardThemes *theme_manager,
   themes = games_card_themes_get_themes (theme_manager);
 
   for (l = themes; l != NULL; l = l->next) {
-    GamesCardThemeInfo *info = l->data;
+    GamesCardThemeInfo *info = (GamesCardThemeInfo *) l->data;
 
     gtk_list_store_insert_with_values (store, &iter, -1,
                                        COL_INFO, info,
@@ -118,7 +118,7 @@ games_card_selector_new (GamesCardThemes *theme_manager,
 {
   GamesCardSelector *selector;
 
-  selector = g_object_new (GAMES_TYPE_CARD_SELECTOR, NULL);
+  selector = (GamesCardSelector *) g_object_new (GAMES_TYPE_CARD_SELECTOR, NULL);
 
   games_frame_set_label (GAMES_FRAME (selector), _("Card Style"));
 
diff --git a/libgames-support/games-card-selector.h b/blackjack/src/card-selector.h
similarity index 94%
rename from libgames-support/games-card-selector.h
rename to blackjack/src/card-selector.h
index 1cd1fe2..741fb8d 100644
--- a/libgames-support/games-card-selector.h
+++ b/blackjack/src/card-selector.h
@@ -24,9 +24,9 @@
 
 #include <gtk/gtk.h>
 
-#include "games-frame.h"
-#include "games-card-theme.h"
-#include "games-card-themes.h"
+#include <libgames-support/games-frame.h>
+#include <libgames-support/games-card-theme.h>
+#include <libgames-support/games-card-themes.h>
 
 G_BEGIN_DECLS
 
diff --git a/blackjack/src/card.cpp b/blackjack/src/card.cpp
index 5b0893a..d480ed6 100644
--- a/blackjack/src/card.cpp
+++ b/blackjack/src/card.cpp
@@ -27,8 +27,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgames-support/games-card-theme.h>
 #include <libgames-support/games-card-images.h>
-#include <libgames-support/games-card-selector.h>
 #include "card.h"
+#include "card-selector.h"
 #include "chips.h"
 #include "draw.h"
 
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 514cd06..c6a7ad5 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -79,8 +79,6 @@ libgames_support_la_SOURCES +=		\
 	games-find-file.h		\
 	games-gridframe.c		\
 	games-gridframe.h		\
-	games-card-selector.c		\
-	games-card-selector.h		\
 	games-score.h			\
 	games-score.c			\
 	games-scores.c			\
@@ -197,13 +195,6 @@ libgamescards_la_SOURCES = \
 	games-pixbuf-utils.h \
 	$(NULL)
 
-if LIBGAMES_SUPPORT_FULL
-libgamescards_la_SOURCES += \
-	games-card-selector.c \
-	games-card-selector.h \
-	$(NULL)
-endif # LIBGAMES_SUPPORT_FULL
-
 if HAVE_CLUTTER
 libgamescards_la_SOURCES += \
 	games-card-textures-cache.c \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 086947e..fc1bf70 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -104,6 +104,7 @@ blackjack/data/blackjack.desktop.in.in
 blackjack/data/blackjack.schemas.in
 blackjack/src/blackjack.cpp
 blackjack/src/card.cpp
+blackjack/src/card-selector.cpp
 blackjack/src/dialog.cpp
 blackjack/src/events.cpp
 blackjack/src/game.cpp
@@ -287,7 +288,6 @@ libgames-support/eggsmclient-xsmp.c
 libgames-support/games-dlg-chat.c
 libgames-support/games-dlg-players.c
 libgames-support/games-card.c
-libgames-support/games-card-selector.c
 libgames-support/games-controls.c
 libgames-support/games-files.c
 libgames-support/games-gridframe.c