Define as $(datadir)/pixmaps/gtetrinet. (PIXMAPSDIR): Change to

2003-06-08  Jordi Mallach  <jordi@sindominio.net>

	* src/Makefile.am (GTETPIXMAPSDIR): Define as
	$(datadir)/pixmaps/gtetrinet.
	(PIXMAPSDIR): Change to $(datadir)/pixmaps.
	* src/winlist.c (winlist_page_new): Use GTETPIXMAPSDIR instead of
	PIXMAPSDIR.

diff --git a/ChangeLog b/ChangeLog
index ae969329a58d352f50850f6dd974e0988099f167..66e77e0bcd643e67a2eab04847feb8ecedce2e30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-08  Jordi Mallach  <jordi@sindominio.net>
+
+       * src/Makefile.am (GTETPIXMAPSDIR): Define as
+       $(datadir)/pixmaps/gtetrinet.
+       (PIXMAPSDIR): Change to $(datadir)/pixmaps.
+       * src/winlist.c (winlist_page_new): Use GTETPIXMAPSDIR instead of
+       PIXMAPSDIR.
+
 2003-06-07  Jordi Mallach  <jordi@sindominio.net>
 
        * NEWS: Update for 0.7.2.

diff --git a/src/Makefile.am b/src/Makefile.am
index 3336dd88b4ff7eab4bb063329eeb5d3a21e5cfa3..cf317a965261e6a0b1857842cebca189b90766c1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,12 @@ SUBDIRS = images
 
 localedir = $(datadir)/locale
 
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED $(GTET_CFLAGS)
+INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
+          -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" \
+          -DGTETPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" \
+          -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
+          -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+          $(GTET_CFLAGS)
 LDADD = $(GTET_LIBS)
 AM_CPPFLAGS = -DGTETRINET_DATA=\"$(pkgdatadir)\"
 

diff --git a/src/winlist.c b/src/winlist.c
index 51f0b5eed6e23f94c1d6e6bddcbdfd779e5e38e1..9ea0bf0f5dba4a4958afaaf2f59a504d672ef6ee 100644 (file)
--- a/src/winlist.c
+++ b/src/winlist.c
@@ -43,11 +43,11 @@ GtkWidget *winlist_page_new (void)
     GdkPixbuf *pixbuf;
 
     /* Load the icons and scale them */
-    pixbuf = gdk_pixbuf_new_from_file (PIXMAPSDIR "/team.png",  NULL);
+    pixbuf = gdk_pixbuf_new_from_file (GTETPIXMAPSDIR "/team.png",  NULL);
     team_icon = gdk_pixbuf_scale_simple (pixbuf, 24, 24, GDK_INTERP_BILINEAR);
     gdk_pixbuf_unref (pixbuf);
     
-    pixbuf = gdk_pixbuf_new_from_file (PIXMAPSDIR "/alone.png", NULL);
+    pixbuf = gdk_pixbuf_new_from_file (GTETPIXMAPSDIR "/alone.png", NULL);
     alone_icon = gdk_pixbuf_scale_simple (pixbuf, 24, 24, GDK_INTERP_BILINEAR);
     gdk_pixbuf_unref (pixbuf);