[gnome-games/gnibbles-clutter-rebased: 102/129] Renamed worm-clutter.[ch] to worm.[ch]

[Jason Clinton <jclinton src gnome org>]

commit f95592e30a4986af2a5f4801b1514d80fd20c34a
Author: Guillaume Beland <guillaume beland gmail com>
Date:   Wed Aug 12 19:31:56 2009 -0400

    Renamed worm-clutter.[ch] to worm.[ch]

 gnibbles/Makefile.am                |    4 ++--
 gnibbles/board.c                    |    2 +-
 gnibbles/bonus.h                    |    1 -
 gnibbles/ggz-network.c              |    2 +-
 gnibbles/gnibbles.c                 |    2 +-
 gnibbles/main.c                     |    2 +-
 gnibbles/scoreboard.h               |    3 +--
 gnibbles/warpmanager.h              |    2 +-
 gnibbles/{worm-clutter.c => worm.c} |    2 +-
 gnibbles/{worm-clutter.h => worm.h} |    0
 10 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/gnibbles/Makefile.am b/gnibbles/Makefile.am
index c181451..4fdd7e5 100644
--- a/gnibbles/Makefile.am
+++ b/gnibbles/Makefile.am
@@ -30,8 +30,8 @@ gnibbles_SOURCES = \
 	main.h \
 	board.c \
 	board.h \
-	worm-clutter.c \
-	worm-clutter.h \
+	worm.c \
+	worm.h \
 	$(NULL)
 
 gnibbles_CPPFLAGS = \
diff --git a/gnibbles/board.c b/gnibbles/board.c
index 173969d..41d0571 100644
--- a/gnibbles/board.c
+++ b/gnibbles/board.c
@@ -34,7 +34,7 @@
 #include "gnibbles.h"
 #include "properties.h"
 #include "board.h"
-#include "worm-clutter.h"
+#include "worm.h"
 #include "boni.h"
 
 #ifdef GGZ_CLIENT
diff --git a/gnibbles/bonus.h b/gnibbles/bonus.h
index 091bac8..6571a08 100644
--- a/gnibbles/bonus.h
+++ b/gnibbles/bonus.h
@@ -25,7 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <clutter/clutter.h>
-#include <cogl/cogl.h>
 
 #define BONUSNONE	0
 #define BONUSREGULAR	1
diff --git a/gnibbles/ggz-network.c b/gnibbles/ggz-network.c
index 0db77c3..12818d4 100644
--- a/gnibbles/ggz-network.c
+++ b/gnibbles/ggz-network.c
@@ -45,7 +45,7 @@
 #include "gnibbles.h"
 #include "properties.h"
 #include "ggz-network.h"
-#include "worm-clutter.h"
+#include "worm.h"
 
 
 static void
diff --git a/gnibbles/gnibbles.c b/gnibbles/gnibbles.c
index 47a3e22..8581098 100644
--- a/gnibbles/gnibbles.c
+++ b/gnibbles/gnibbles.c
@@ -44,7 +44,7 @@
 #include "properties.h"
 #include "scoreboard.h"
 #include "board.h"
-#include "worm-clutter.h"
+#include "worm.h"
 
 #ifdef GGZ_CLIENT
 #include "ggz-network.h"
diff --git a/gnibbles/main.c b/gnibbles/main.c
index 99d1ddf..f3f102a 100644
--- a/gnibbles/main.c
+++ b/gnibbles/main.c
@@ -50,7 +50,7 @@
 #include <clutter/clutter.h>
 
 #include "board.h"
-#include "worm-clutter.h"
+#include "worm.h"
 
 #ifdef GGZ_CLIENT
 #include <libgames-support/games-dlg-chat.h>
diff --git a/gnibbles/scoreboard.h b/gnibbles/scoreboard.h
index 9030e87..ec85179 100644
--- a/gnibbles/scoreboard.h
+++ b/gnibbles/scoreboard.h
@@ -25,8 +25,7 @@
 #include <gtk/gtk.h>
 
 #include "gnibbles.h"
-//#include "worm.h"
-#include "worm-clutter.h"
+#include "worm.h"
 
 typedef struct {
   GnibblesWorm *worms[NUMWORMS];
diff --git a/gnibbles/warpmanager.h b/gnibbles/warpmanager.h
index 91b3b56..80461f0 100644
--- a/gnibbles/warpmanager.h
+++ b/gnibbles/warpmanager.h
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 
 #include "warp.h"
-#include "worm-clutter.h"
+#include "worm.h"
 
 #define MAXWARPS 200
 #define WARPLETTER 'W'
diff --git a/gnibbles/worm-clutter.c b/gnibbles/worm.c
similarity index 99%
rename from gnibbles/worm-clutter.c
rename to gnibbles/worm.c
index bf2899c..a043046 100644
--- a/gnibbles/worm-clutter.c
+++ b/gnibbles/worm.c
@@ -43,7 +43,7 @@
 #include "ggz-network.h"
 #endif
 
-#include "worm-clutter.h"
+#include "worm.h"
 
 extern GnibblesProperties *properties;
 extern GdkPixbuf *worm_pixmaps[];
diff --git a/gnibbles/worm-clutter.h b/gnibbles/worm.h
similarity index 100%
rename from gnibbles/worm-clutter.h
rename to gnibbles/worm.h