[gthumb/gthumb-3-0] fixed broken video thumbnail

[Paolo Bacchilega <paobac src gnome org>]

commit 294c1e6b36db65fb3f2943bf07d67892595fba52
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Aug 18 20:14:26 2012 +0200

    fixed broken video thumbnail
    
    [bug #666303]

 data/Makefile.am               |    4 ----
 data/icons/Makefile.am         |    7 ++++++-
 data/{ => icons}/filmholes.png |  Bin 173 -> 173 bytes
 gthumb/Makefile.am             |    7 ++-----
 gthumb/gth-grid-view.c         |    2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 4c00f47..f5ccdde 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,16 +43,12 @@ convert_DATA = gthumb.convert
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gthumb-$(GTHUMB_API_VERSION).pc
 
-uidir = $(pkgdatadir)/ui
-ui_DATA = filmholes.png
-
 man_MANS=gthumb.1
 
 EXTRA_DIST =                    	\
 	$(desktop_in_in_files)  	\
 	$(gsettings_schema_in_files)    \
 	$(pkgconfig_DATA)		\
-	$(ui_DATA)			\
 	gthumb.convert			\
 	$(man_MANS)
 
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index c962f7e..cb96368 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,5 +1,10 @@
 SUBDIRS = hicolor
 
-EXTRA_DIST = selection.svg
+icondir = $(pkgdatadir)/icons
+icon_DATA = filmholes.png
+
+EXTRA_DIST = 		\
+	selection.svg	\
+	$(ui_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/filmholes.png b/data/icons/filmholes.png
similarity index 100%
rename from data/filmholes.png
rename to data/icons/filmholes.png
diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am
index 9d7d8f2..4e279f0 100644
--- a/gthumb/Makefile.am
+++ b/gthumb/Makefile.am
@@ -279,14 +279,12 @@ gthumb_LDADD =						\
 	$(NULL)
 
 if RUN_IN_PLACE
-data_dir = $(abs_top_srcdir)/data
-ui_dir = $(data_dir)/ui
-icon_dir = $(data_dir)/icons
+ui_dir = $(abs_top_srcdir)/data/ui
+icon_dir = $(abs_top_srcdir)/data/icons
 extensions_ui_dir = $(abs_top_srcdir)/extensions
 extensions_dir = $(abs_top_builddir)/extensions
 applications_dir = $(abs_top_builddir)/data
 else
-data_dir = $(datadir)
 ui_dir = $(pkgdatadir)/ui
 icon_dir = $(pkgdatadir)/icons
 extensions_ui_dir = $(pkgdatadir)/ui
@@ -312,7 +310,6 @@ gthumb_CFLAGS =							\
 	-DGTHUMB_LOCALEDIR=\"$(datadir)/locale\"		\
 	-DGTHUMB_PREFIX=\"$(prefix)\"           		\
 	-DGTHUMB_SYSCONFDIR=\"$(sysconfdir)\"   		\
-	-DGTHUMB_DATADIR=\"$(data_dir)\"         		\
 	-DGTHUMB_LIBDIR=\"$(libdir)\" 				\
 	-DGTHUMB_PKGDATADIR=\"$(pkgdatadir)\"			\
 	-DGTHUMB_UI_DIR=\"$(ui_dir)\"				\
diff --git a/gthumb/gth-grid-view.c b/gthumb/gth-grid-view.c
index 882a1fd..7240f44 100644
--- a/gthumb/gth-grid-view.c
+++ b/gthumb/gth-grid-view.c
@@ -1228,7 +1228,7 @@ _cairo_film_pattern_create (void)
 		char            *filename;
 		cairo_surface_t *surface;
 
-		filename = g_build_filename (GTHUMB_DATADIR, "filmholes.png", NULL);
+		filename = g_build_filename (GTHUMB_ICON_DIR, "filmholes.png", NULL);
 		surface = cairo_image_surface_create_from_png (filename);
 		film_pattern = cairo_pattern_create_for_surface (surface);
 		cairo_pattern_set_filter (film_pattern, CAIRO_FILTER_GOOD);