[gnome-games] libgames-support: Remove games_stock_

From: Robert Ancell <rancell src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-games] libgames-support: Remove games_stock_
Date: Wed, 29 Aug 2012 22:52:59 +0000 (UTC)
commit eb8c4f24dea9502b13d055f6227fa5a68316fc93
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu Aug 30 10:52:51 2012 +1200

    libgames-support: Remove games_stock_

 glines/src/Makefile.am                           |    3 +++
 {libgames-support => glines/src}/games-stock.c   |    0
 {libgames-support => glines/src}/games-stock.h   |    0
 glines/src/glines.c                              |    2 +-
 gnect/src/Makefile.am                            |    3 +++
 gnect/src/games-fullscreen-action.c              |    2 +-
 {libgames-support => gnect/src}/games-stock.c    |    0
 {libgames-support => gnect/src}/games-stock.h    |    0
 gnect/src/main.c                                 |    3 +--
 gnibbles/src/Makefile.am                         |    3 +++
 gnibbles/src/games-fullscreen-action.c           |    2 +-
 gnibbles/src/games-pause-action.c                |    3 +--
 {libgames-support => gnibbles/src}/games-stock.c |    0
 {libgames-support => gnibbles/src}/games-stock.h |    0
 gnibbles/src/main.c                              |    2 +-
 gnobots2/src/Makefile.am                         |    3 +++
 gnobots2/src/games-fullscreen-action.c           |    2 +-
 {libgames-support => gnobots2/src}/games-stock.c |    0
 {libgames-support => gnobots2/src}/games-stock.h |    0
 gnobots2/src/gnobots.c                           |    2 +-
 gnobots2/src/menu.c                              |    2 +-
 gnotski/src/Makefile.am                          |    3 +++
 gnotski/src/games-fullscreen-action.c            |    2 +-
 {libgames-support => gnotski/src}/games-stock.c  |    0
 {libgames-support => gnotski/src}/games-stock.h  |    0
 gnotski/src/gnotski.c                            |    2 +-
 gtali/src/Makefile.am                            |    5 ++++-
 {libgames-support => gtali/src}/games-stock.c    |    0
 {libgames-support => gtali/src}/games-stock.h    |    0
 gtali/src/gyahtzee.c                             |    2 +-
 libgames-support/Makefile.am                     |    3 ---
 po/POTFILES.in                                   |    6 +++++-
 32 files changed, 36 insertions(+), 19 deletions(-)
---
diff --git a/glines/src/Makefile.am b/glines/src/Makefile.am
index c97cf15..b6beb52 100644
--- a/glines/src/Makefile.am
+++ b/glines/src/Makefile.am
@@ -9,6 +9,8 @@ glines_SOURCES =	\
 	games-preimage.h	\
 	games-settings.c	\
 	games-settings.h	\
+	games-stock.c	\
+	games-stock.h	\
 	glines.c	\
 	glines.h
 
@@ -19,6 +21,7 @@ glines_CPPFLAGS = \
 glines_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/glines\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
diff --git a/libgames-support/games-stock.c b/glines/src/games-stock.c
similarity index 100%
copy from libgames-support/games-stock.c
copy to glines/src/games-stock.c
diff --git a/libgames-support/games-stock.h b/glines/src/games-stock.h
similarity index 100%
copy from libgames-support/games-stock.h
copy to glines/src/games-stock.h
diff --git a/glines/src/glines.c b/glines/src/glines.c
index 1b545f8..ec65941 100644
--- a/glines/src/glines.c
+++ b/glines/src/glines.c
@@ -38,13 +38,13 @@
 
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
-#include <libgames-support/games-stock.h>
 
 #include "glines.h"
 #include "games-file-list.h"
 #include "games-preimage.h"
 #include "games-gridframe.h"
 #include "games-settings.h"
+#include "games-stock.h"
 
 #define KEY_BACKGROUND_COLOR  "background-color"
 #define KEY_BALL_THEME        "ball-theme"
diff --git a/gnect/src/Makefile.am b/gnect/src/Makefile.am
index 8190e94..8cd9318 100644
--- a/gnect/src/Makefile.am
+++ b/gnect/src/Makefile.am
@@ -18,6 +18,8 @@ gnect_SOURCES = main.h     \
                 games-fullscreen-action.h \
                 games-gridframe.c \
                 games-gridframe.h \
+                games-stock.c \
+                games-stock.h \
                 heurist.h  \
                 heurist.c  \
                 ia_main.c  \
@@ -35,6 +37,7 @@ gnect_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnect\" \
 	-DSOUND_DIRECTORY=\"$(datadir)/gnect/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
diff --git a/gnect/src/games-fullscreen-action.c b/gnect/src/games-fullscreen-action.c
index 01e3ea3..5943df0 100644
--- a/gnect/src/games-fullscreen-action.c
+++ b/gnect/src/games-fullscreen-action.c
@@ -20,9 +20,9 @@
  */
 
 #include <glib/gi18n.h>
-#include <libgames-support/games-stock.h>
 
 #include "games-fullscreen-action.h"
+#include "games-stock.h"
 
 enum {
     PROP_0,
diff --git a/libgames-support/games-stock.c b/gnect/src/games-stock.c
similarity index 100%
copy from libgames-support/games-stock.c
copy to gnect/src/games-stock.c
diff --git a/libgames-support/games-stock.h b/gnect/src/games-stock.h
similarity index 100%
copy from libgames-support/games-stock.h
copy to gnect/src/games-stock.h
diff --git a/gnect/src/main.c b/gnect/src/main.c
index d0a80ed..07540d2 100644
--- a/gnect/src/main.c
+++ b/gnect/src/main.c
@@ -30,8 +30,6 @@
 #include <gtk/gtk.h>
 #include <canberra-gtk.h>
 
-#include <libgames-support/games-stock.h>
-
 #include "connect4.h"
 #include "main.h"
 #include "theme.h"
@@ -39,6 +37,7 @@
 #include "gfx.h"
 #include "games-gridframe.h"
 #include "games-fullscreen-action.h"
+#include "games-stock.h"
 
 #define SPEED_MOVE     25
 #define SPEED_DROP     20
diff --git a/gnibbles/src/Makefile.am b/gnibbles/src/Makefile.am
index 50c2c51..bc60536 100644
--- a/gnibbles/src/Makefile.am
+++ b/gnibbles/src/Makefile.am
@@ -15,6 +15,8 @@ gnibbles_SOURCES = \
 	games-gridframe.c \
 	games-pause-action.h \
 	games-pause-action.c \
+	games-stock.h \
+	games-stock.c \
 	gnibbles.h \
 	gnibbles.c \
 	properties.h \
@@ -40,6 +42,7 @@ gnibbles_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnibbles\" \
 	-DSOUND_DIRECTORY=\"$(datadir)/gnibbles/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
diff --git a/gnibbles/src/games-fullscreen-action.c b/gnibbles/src/games-fullscreen-action.c
index 01e3ea3..5943df0 100644
--- a/gnibbles/src/games-fullscreen-action.c
+++ b/gnibbles/src/games-fullscreen-action.c
@@ -20,9 +20,9 @@
  */
 
 #include <glib/gi18n.h>
-#include <libgames-support/games-stock.h>
 
 #include "games-fullscreen-action.h"
+#include "games-stock.h"
 
 enum {
     PROP_0,
diff --git a/gnibbles/src/games-pause-action.c b/gnibbles/src/games-pause-action.c
index f9a7671..986285e 100644
--- a/gnibbles/src/games-pause-action.c
+++ b/gnibbles/src/games-pause-action.c
@@ -19,9 +19,8 @@
  *      Robert Ancell <robert ancell gmail com>
  */
 
-#include <libgames-support/games-stock.h>
-
 #include "games-pause-action.h"
+#include "games-stock.h"
 
 enum {
     PROP_0,
diff --git a/libgames-support/games-stock.c b/gnibbles/src/games-stock.c
similarity index 100%
copy from libgames-support/games-stock.c
copy to gnibbles/src/games-stock.c
diff --git a/libgames-support/games-stock.h b/gnibbles/src/games-stock.h
similarity index 100%
copy from libgames-support/games-stock.h
copy to gnibbles/src/games-stock.h
diff --git a/gnibbles/src/main.c b/gnibbles/src/main.c
index c021669..d746078 100644
--- a/gnibbles/src/main.c
+++ b/gnibbles/src/main.c
@@ -32,7 +32,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <libgames-support/games-scores.h>
-#include <libgames-support/games-stock.h>
 
 #include "main.h"
 #include "properties.h"
@@ -45,6 +44,7 @@
 #include "games-gridframe.h"
 #include "games-pause-action.h"
 #include "games-fullscreen-action.h"
+#include "games-stock.h"
 
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter/clutter.h>
diff --git a/gnobots2/src/Makefile.am b/gnobots2/src/Makefile.am
index 2623f22..9ff679a 100644
--- a/gnobots2/src/Makefile.am
+++ b/gnobots2/src/Makefile.am
@@ -34,6 +34,8 @@ gnobots2_SOURCES = \
 	games-preimage.h \
 	games-settings.c \
 	games-settings.h \
+	games-stock.c \
+	games-stock.h \
 	cursor-down.h \
 	cursor-down-left.h \
 	cursor-down-right.h \
@@ -52,6 +54,7 @@ gnobots2_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnobots2\" \
 	-DSOUND_DIRECTORY=\"$(datadir)/gnobots2/sounds\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(CANBERRA_GTK_CFLAGS) \
diff --git a/gnobots2/src/games-fullscreen-action.c b/gnobots2/src/games-fullscreen-action.c
index 01e3ea3..5943df0 100644
--- a/gnobots2/src/games-fullscreen-action.c
+++ b/gnobots2/src/games-fullscreen-action.c
@@ -20,9 +20,9 @@
  */
 
 #include <glib/gi18n.h>
-#include <libgames-support/games-stock.h>
 
 #include "games-fullscreen-action.h"
+#include "games-stock.h"
 
 enum {
     PROP_0,
diff --git a/libgames-support/games-stock.c b/gnobots2/src/games-stock.c
similarity index 100%
copy from libgames-support/games-stock.c
copy to gnobots2/src/games-stock.c
diff --git a/libgames-support/games-stock.h b/gnobots2/src/games-stock.h
similarity index 100%
copy from libgames-support/games-stock.h
copy to gnobots2/src/games-stock.h
diff --git a/gnobots2/src/gnobots.c b/gnobots2/src/gnobots.c
index 8b5f7cc..2cf84a7 100644
--- a/gnobots2/src/gnobots.c
+++ b/gnobots2/src/gnobots.c
@@ -31,7 +31,6 @@
 
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
-#include <libgames-support/games-stock.h>
 
 #include "gbdefs.h"
 #include "statusbar.h"
@@ -44,6 +43,7 @@
 #include "cursors.h"
 #include "games-gridframe.h"
 #include "games-settings.h"
+#include "games-stock.h"
 
 /* Minimum sizes. */
 #define MINIMUM_TILE_WIDTH   8
diff --git a/gnobots2/src/menu.c b/gnobots2/src/menu.c
index 6c10903..8c35399 100644
--- a/gnobots2/src/menu.c
+++ b/gnobots2/src/menu.c
@@ -26,7 +26,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libgames-support/games-stock.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 
@@ -37,6 +36,7 @@
 #include "properties.h"
 #include "gameconfig.h"
 #include "games-fullscreen-action.h"
+#include "games-stock.h"
 
 GtkAction *scores_action;
 GtkAction *pause_action;
diff --git a/gnotski/src/Makefile.am b/gnotski/src/Makefile.am
index 3964cf6..739bc58 100644
--- a/gnotski/src/Makefile.am
+++ b/gnotski/src/Makefile.am
@@ -8,6 +8,8 @@ gnotski_SOURCES = \
 	games-gridframe.h	\
 	games-preimage.c	\
 	games-preimage.h	\
+	games-stock.c	\
+	games-stock.h	\
 	pieces.h
 
 gnotski_CPPFLAGS = \
@@ -17,6 +19,7 @@ gnotski_CPPFLAGS = \
 gnotski_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gnotski\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(AM_CFLAGS)
diff --git a/gnotski/src/games-fullscreen-action.c b/gnotski/src/games-fullscreen-action.c
index 01e3ea3..5943df0 100644
--- a/gnotski/src/games-fullscreen-action.c
+++ b/gnotski/src/games-fullscreen-action.c
@@ -20,9 +20,9 @@
  */
 
 #include <glib/gi18n.h>
-#include <libgames-support/games-stock.h>
 
 #include "games-fullscreen-action.h"
+#include "games-stock.h"
 
 enum {
     PROP_0,
diff --git a/libgames-support/games-stock.c b/gnotski/src/games-stock.c
similarity index 100%
copy from libgames-support/games-stock.c
copy to gnotski/src/games-stock.c
diff --git a/libgames-support/games-stock.h b/gnotski/src/games-stock.h
similarity index 100%
copy from libgames-support/games-stock.h
copy to gnotski/src/games-stock.h
diff --git a/gnotski/src/gnotski.c b/gnotski/src/gnotski.c
index 417d1c9..2bc8f29 100644
--- a/gnotski/src/gnotski.c
+++ b/gnotski/src/gnotski.c
@@ -31,12 +31,12 @@
 
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
-#include <libgames-support/games-stock.h>
 
 #include "pieces.h"
 #include "games-preimage.h"
 #include "games-gridframe.h"
 #include "games-fullscreen-action.h"
+#include "games-stock.h"
 
 #define APPNAME "gnotski"
 #define APPNAME_LONG N_("Klotski")
diff --git a/gtali/src/Makefile.am b/gtali/src/Makefile.am
index aac6352..dade419 100644
--- a/gtali/src/Makefile.am
+++ b/gtali/src/Makefile.am
@@ -9,7 +9,9 @@ gtali_SOURCES =       \
 	computer.c       \
 	setup.c          \
 	games-frame.c    \
-	games-frame.h
+	games-frame.h    \
+	games-stock.c    \
+	games-stock.h
 
 gtali_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -18,6 +20,7 @@ gtali_CPPFLAGS = \
 gtali_CFLAGS = \
 	-DDATA_DIRECTORY=\"$(datadir)/gtali\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
+	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\"" \
 	$(GTK_CFLAGS) \
 	$(RSVG_CFLAGS) \
 	$(AM_CFLAGS)
diff --git a/libgames-support/games-stock.c b/gtali/src/games-stock.c
similarity index 100%
rename from libgames-support/games-stock.c
rename to gtali/src/games-stock.c
diff --git a/libgames-support/games-stock.h b/gtali/src/games-stock.h
similarity index 100%
rename from libgames-support/games-stock.h
rename to gtali/src/games-stock.h
diff --git a/gtali/src/gyahtzee.c b/gtali/src/gyahtzee.c
index 88c58af..e53351a 100644
--- a/gtali/src/gyahtzee.c
+++ b/gtali/src/gyahtzee.c
@@ -45,12 +45,12 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libgames-support/games-stock.h>
 #include <libgames-support/games-scores.h>
 #include <libgames-support/games-scores-dialog.h>
 
 #include "yahtzee.h"
 #include "gyahtzee.h"
+#include "games-stock.h"
 
 #define DELAY_MS 600
 
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index def0c4e..b855c3f 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -1,8 +1,6 @@
 noinst_LTLIBRARIES = libgames-support.la
 
 libgames_support_la_SOURCES = \
-	games-stock.c			\
-	games-stock.h			\
 	games-score.h			\
 	games-score.c			\
 	games-scores.c			\
@@ -24,7 +22,6 @@ libgames_support_la_CPPFLAGS = \
 	-DPKGDATADIR="\"$(pkgdatadir)\""			\
 	-DPREFIX="\"$(prefix)\"" \
 	-DDATADIR="\"$(datadir)\""				\
-	-DICON_THEME_DIRECTORY="\"$(datadir)/icons\""				\
 	-DSCORESDIR="\"$(scoredir)\""				\
 	-DLOCALE_DIRECTORY="\"$(datadir)/locale\""				\
 	$(AM_CPPFLAGS)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 42867db..dc27b72 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,9 +26,11 @@ glines/data/glines.desktop.in.in
 [type: gettext/glade]glines/data/glines-preferences.ui
 [type: gettext/glade]glines/data/glines.ui
 glines/data/org.gnome.glines.gschema.xml.in
+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-stock.c
 gnect/src/gfx.c
 gnect/src/main.c
 gnect/src/main.h
@@ -37,6 +39,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-stock.c
 gnibbles/src/gnibbles.c
 gnibbles/src/main.c
 gnibbles/src/preferences.c
@@ -44,6 +47,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-stock.c
 gnobots2/src/gnobots.c
 gnobots2/src/graphics.c
 gnobots2/src/menu.c
@@ -93,6 +97,7 @@ gnotravex/src/puzzle-view.vala
 gnotravex/src/theme.vala
 gnotski/data/gnotski.desktop.in.in
 gnotski/data/org.gnome.gnotski.gschema.xml.in
+gnotski/src/games-stock.c
 gnotski/src/gnotski.c
 gtali/data/gtali.desktop.in.in
 gtali/data/org.gnome.gtali.gschema.xml.in
@@ -109,7 +114,6 @@ iagno/src/game-view.vala
 iagno/src/iagno.vala
 libgames-support/games-controls.c
 libgames-support/games-scores-dialog.c
-libgames-support/games-stock.c
 lightsoff/data/lightsoff.desktop.in.in
 lightsoff/data/org.gnome.lightsoff.gschema.xml.in
 lightsoff/src/board-view.vala
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]