From 7ebaf3f5c8e1df77ef83c66aec0878961be7e730 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Thu, 28 Jan 2010 00:12:52 +0000
Subject: [PATCH] Rename gis_test to gis-demo

---
 TODO                           |  1 -
 src/.gitignore                 |  2 +-
 src/Makefile.am                | 16 ++++++++--------
 src/{gis_test.c => gis-demo.c} |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename src/{gis_test.c => gis-demo.c} (97%)

diff --git a/TODO b/TODO
index 7ae0906..4e40f91 100644
--- a/TODO
+++ b/TODO
@@ -11,7 +11,6 @@ GisObject:
   - Move to subdirctory?
 
 gis-demo:
-  - Rename gis_test -> gis_demo
   - Add configs, prefs, name spoofing, offline
 
 roam:
diff --git a/src/.gitignore b/src/.gitignore
index 4441717..60ae693 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -7,7 +7,7 @@
 *.so
 .deps
 .libs
+gis-demo
 gis-marshal.[ch]
-gis_test
 gmon.*
 tile_test
diff --git a/src/Makefile.am b/src/Makefile.am
index 265abdd..844d54d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,11 +43,11 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgis.pc
 
 # Test programs
-bin_PROGRAMS = gis_test tile_test
+bin_PROGRAMS = gis-demo tile_test
 
-gis_test_SOURCES  = gis_test.c gis.h
-gis_test_LDADD    = $(AM_LDADD) libgis.la
-gis_test_LDFLAGS  = -static
+gis_demo_SOURCES  = gis-demo.c gis.h
+gis_demo_LDADD    = $(AM_LDADD) libgis.la
+gis_demo_LDFLAGS  = -static
 
 tile_test_SOURCES = tile_test.c   \
 	gis-util.c   gis-util.h   \
@@ -63,13 +63,13 @@ MAINTAINERCLEANFILES = Makefile.in
 	glib-genmarshal --prefix=gis_cclosure_marshal --header $< > $@
 
 test: all .libs/gis
-	./gis_test
+	./gis-demo
 
 gdb: all .libs/gis
-	gdb ./gis_test
+	gdb ./gis-demo
 
 ddd: all .libs/gis
-	ddd ./gis_test
+	ddd ./gis-demo
 
 .libs/gis: plugins/.libs
 	ln -sf ../plugins/.libs .libs/gis
@@ -82,5 +82,5 @@ memcheck: all
 	         --leak-resolution=high         \
 	         --num-callers=50               \
 	         --suppressions=gtk.suppression \
-	         ./gis_test                     \
+	         ./gis-demo                     \
 	2> valgrind.out
diff --git a/src/gis_test.c b/src/gis-demo.c
similarity index 97%
rename from src/gis_test.c
rename to src/gis-demo.c
index 9726994..803e51a 100644
--- a/src/gis_test.c
+++ b/src/gis-demo.c
@@ -27,7 +27,7 @@
 static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event,
 		gpointer _window)
 {
-	g_debug("GisTest: on_key_press - key=%x, state=%x",
+	g_debug("GisDemo: on_key_press - key=%x, state=%x",
 			event->keyval, event->state);
 	GtkWidget *window = _window;
 	switch (event->keyval) {
-- 
2.43.2