From 4390ed341ded7c116efcebbc5030d4adcf415d56 Mon Sep 17 00:00:00 2001 From: Jordi Mallach Date: Sun, 8 Jun 2003 12:56:54 +0000 Subject: [PATCH] Define as $(datadir)/pixmaps/gtetrinet. (PIXMAPSDIR): Change to 2003-06-08 Jordi Mallach * 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. --- ChangeLog | 8 ++++++++ src/Makefile.am | 7 ++++++- src/winlist.c | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae96932..66e77e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-06-08 Jordi Mallach + + * 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 * NEWS: Update for 0.7.2. diff --git a/src/Makefile.am b/src/Makefile.am index 3336dd8..cf317a9 100644 --- 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 51f0b5e..9ea0bf0 100644 --- 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); -- 2.50.1