[horizon] Fix compilation, run windowed by default, store data in /tmp

[Øyvind Kolås <ok src gnome org>]

commit cc96a730fbe947234ed1f3e033f09fc8d90c6238
Author: �yvind Kolås <pippin gimp org>
Date:   Tue Feb 1 16:03:45 2011 +0000

    Fix compilation, run windowed by default, store data in /tmp

 src/Makefile        |    4 ++--
 src/canvas/canvas.h |    6 +++---
 src/config.h        |    2 +-
 src/horizon.c       |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/Makefile b/src/Makefile
index 00d8f43..6309c7e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@ BINARY=horizon
 
 all: .depend $(BINARY)
 
-CFLAGS  = -g -O2 -Wall -Werror                              \
+CFLAGS  = -g -O2 -Wall                                      \
 	  -I/usr/X11R6/include                              \
 	  `sdl-config --cflags`                             \
 	  `pkg-config --cflags glib-2.0 gobject-2.0 libpng` \
@@ -10,7 +10,7 @@ CFLAGS  = -g -O2 -Wall -Werror                              \
 LDFLAGS = -L/usr/X11R6/lib -lX11                            \
 	  `sdl-config --libs`                               \
 	  `pkg-config --libs glib-2.0 gobject-2.0 libpng`   \
-	  -ljpeg
+	  -ljpeg -lm
 
 CFILES  = $(wildcard *.c) $(wildcard */*.c)
 OBJS   = $(CFILES:.c=.o)
diff --git a/src/canvas/canvas.h b/src/canvas/canvas.h
index 91d8ac7..5834ca2 100644
--- a/src/canvas/canvas.h
+++ b/src/canvas/canvas.h
@@ -81,9 +81,9 @@ canvas_get_tile (Canvas *canvas,
                  gint    x,
                  gint    y);
 
-#define canvas_get_tile_width(canvas) (g_assert(canvas), (canvas)->tile_width)
-#define canvas_get_tile_height(canvas) (g_assert(canvas), (canvas)->tile_height)
-#define canvas_get_format(canvas) (g_assert(canvas), (canvas)->format)
+#define canvas_get_tile_width(canvas) ((canvas)->tile_width)
+#define canvas_get_tile_height(canvas) ((canvas)->tile_height)
+#define canvas_get_format(canvas) ((canvas)->format)
 
 
 void
diff --git a/src/config.h b/src/config.h
index f9a2337..df50e04 100644
--- a/src/config.h
+++ b/src/config.h
@@ -23,7 +23,7 @@
 /*  where is the data for the canvas stored, (unless horizon is started with
  *  a commandline parameter specifying the canvas 
  */
-#define CANVAS_PATH         "/media/mmc1/horizon"
+#define CANVAS_PATH         "/tmp/horizon"
 
 
 #define USER_POSITION_PATH  CANVAS_PATH "/position"
diff --git a/src/horizon.c b/src/horizon.c
index 3056f9d..a19c2db 100644
--- a/src/horizon.c
+++ b/src/horizon.c
@@ -231,7 +231,7 @@ horizon_new (gint    argc,
     }
   else
     {
-      horizon->fullscreen = TRUE;
+      horizon->fullscreen = FALSE; /* run windowed.. */
       horizon->storage_path=CANVAS_PATH;
     }