gnome-games r7193 - in trunk: aisleriot libgames-support

[chpe svn gnome org]

Author: chpe
Date: Sun Jan 13 22:08:20 2008
New Revision: 7193
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7193&view=rev

Log:
Move games-card-common.h to games-card.h.


Added:
   trunk/libgames-support/games-card.c
   trunk/libgames-support/games-card.h
      - copied, changed from r7192, /trunk/libgames-support/games-card-common.h
Removed:
   trunk/libgames-support/games-card-common.h
Modified:
   trunk/aisleriot/game.h
   trunk/libgames-support/Makefile.am
   trunk/libgames-support/games-card-images.c
   trunk/libgames-support/games-card-images.h
   trunk/libgames-support/games-card-selector.c
   trunk/libgames-support/games-card-theme.c
   trunk/libgames-support/games-card-theme.h
   trunk/libgames-support/games-files.c

Modified: trunk/aisleriot/game.h
==============================================================================
--- trunk/aisleriot/game.h	(original)
+++ trunk/aisleriot/game.h	Sun Jan 13 22:08:20 2008
@@ -23,7 +23,7 @@
 
 #include <gdk/gdktypes.h>
 
-#include <libgames-support/games-card-common.h>
+#include <libgames-support/games-card.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libgames-support/Makefile.am
==============================================================================
--- trunk/libgames-support/Makefile.am	(original)
+++ trunk/libgames-support/Makefile.am	Sun Jan 13 22:08:20 2008
@@ -34,7 +34,8 @@
 
 libgames_support_la_SOURCES =		\
 	$(BUILT_SOURCES)		\
-	games-card-common.h		\
+	games-card.c			\
+	games-card.h			\
 	games-card-images.c		\
 	games-card-images.h		\
 	games-card-theme.c		\

Modified: trunk/libgames-support/games-card-images.c
==============================================================================
--- trunk/libgames-support/games-card-images.c	(original)
+++ trunk/libgames-support/games-card-images.c	Sun Jan 13 22:08:20 2008
@@ -1,6 +1,6 @@
 /* 
    Copyright  2004 Callum McKenzie
-   Copyright  2007 Christian Persch
+   Copyright  2007, 2008 Christian Persch
 
    This library is free software; you can redistribute it and'or modify
    it under the terms of the GNU Library General Public License as published 
@@ -26,7 +26,6 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "games-card-common.h"
 #include "games-find-file.h"
 #include "games-files.h"
 #include "games-preimage.h"

Modified: trunk/libgames-support/games-card-images.h
==============================================================================
--- trunk/libgames-support/games-card-images.h	(original)
+++ trunk/libgames-support/games-card-images.h	Sun Jan 13 22:08:20 2008
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "games-card-common.h"
+#include "games-card.h"
 #include "games-card-theme.h"
 
 G_BEGIN_DECLS

Modified: trunk/libgames-support/games-card-selector.c
==============================================================================
--- trunk/libgames-support/games-card-selector.c	(original)
+++ trunk/libgames-support/games-card-selector.c	Sun Jan 13 22:08:20 2008
@@ -24,11 +24,10 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "games-card.h"
 #include "games-frame.h"
 #include "games-files.h"
 
-#include "games-card-common.h"
-
 #include "games-card-selector.h"
 
 enum

Modified: trunk/libgames-support/games-card-theme.c
==============================================================================
--- trunk/libgames-support/games-card-theme.c	(original)
+++ trunk/libgames-support/games-card-theme.c	Sun Jan 13 22:08:20 2008
@@ -24,7 +24,6 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "games-card-common.h"
 #include "games-find-file.h"
 #include "games-files.h"
 #include "games-preimage.h"

Modified: trunk/libgames-support/games-card-theme.h
==============================================================================
--- trunk/libgames-support/games-card-theme.h	(original)
+++ trunk/libgames-support/games-card-theme.h	Sun Jan 13 22:08:20 2008
@@ -23,6 +23,7 @@
 
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include "games-card.h"
 #include "games-preimage.h"
 
 G_BEGIN_DECLS

Added: trunk/libgames-support/games-card.c
==============================================================================
--- (empty file)
+++ trunk/libgames-support/games-card.c	Sun Jan 13 22:08:20 2008
@@ -0,0 +1,23 @@
+/*
+   Copyright  2007, 2008 Christian Persch
+
+   This library is free software; you can redistribute it and'or modify
+   it under the terms of the GNU Library General Public License as published 
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+
+#include <config.h>
+
+#include <glib/gi18n.h>
+
+#include "games-card.h"

Copied: trunk/libgames-support/games-card.h (from r7192, /trunk/libgames-support/games-card-common.h)
==============================================================================
--- /trunk/libgames-support/games-card-common.h	(original)
+++ trunk/libgames-support/games-card.h	Sun Jan 13 22:08:20 2008
@@ -1,6 +1,6 @@
 /*
    Copyright  2004 Callum McKenzie
-   Copyright  2007 Christian Persch
+   Copyright  2007, 2008 Christian Persch
 
    This library is free software; you can redistribute it and'or modify
    it under the terms of the GNU Library General Public License as published 
@@ -20,8 +20,8 @@
 
 /* Common definitions for all card handling routines. */
 
-#ifndef GAMES_CARD_COMMON
-#define GAMES_CARD_COMMON
+#ifndef GAMES_CARD_H
+#define GAMES_CARD_H
 
 /* A card */
 
@@ -61,4 +61,4 @@
 #define GAMES_CARD_THEME_DEFAULT "bonded"
 #endif
 
-#endif /* GAMES_CARD_COMMON */
+#endif /* !GAMES_CARD_H */

Modified: trunk/libgames-support/games-files.c
==============================================================================
--- trunk/libgames-support/games-files.c	(original)
+++ trunk/libgames-support/games-files.c	Sun Jan 13 22:08:20 2008
@@ -41,7 +41,7 @@
 #endif
 
 #include "games-files.h"
-#include "games-card-common.h"
+#include "games-card.h"
 
 G_DEFINE_TYPE (GamesFileList, games_file_list, G_TYPE_OBJECT)