[nautilus-actions] Ask export format: store the icon in a dedicated subdirectory

[Pierre Wieser <pwieser src gnome org>]

commit 5eff9a89152058481d966aee80283c5affcd3ce1
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 22 22:05:39 2012 +0100

    Ask export format: store the icon in a dedicated subdirectory

 ChangeLog              |    5 +++++
 src/core/Makefile.am   |    7 +++++++
 src/core/na-exporter.c |    2 +-
 3 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3c6d1b4..770cee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-02-22 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/Makefile.am: Store export-format image in dedicated dir.
+
+	* src/core/na-exporter.c (na_exporter_get_ask_option): Updated
+	accordingly.
+
 	* configure.ac: Check for ICE library (fix #670434).
 
 	* docs/reference/na-compiling.xml: Updated accordingly.
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 9b8486d..8f6591c 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -28,6 +28,8 @@
 
 pkglib_LTLIBRARIES = libna-core.la
 
+exportformat_datadir = $(pkgdatadir)/export-format
+
 AM_CPPFLAGS += \
 	-I $(top_srcdir)									\
 	-I $(top_srcdir)/src								\
@@ -37,6 +39,7 @@ AM_CPPFLAGS += \
 	-DPKGLIBEXECDIR=\""$(pkglibexecdir)"\"				\
 	-DSYSCONFDIR=\"$(sysconfdir)\"						\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_CORE}\"				\
+	-DPKGEXPORTFORMATDIR=\"$(exportformat_datadir)\"	\
 	$(NAUTILUS_ACTIONS_CFLAGS)							\
 	$(NULL)
 
@@ -139,6 +142,9 @@ libna_core_la_LDFLAGS = \
 
 pkgdata_DATA = \
 	na-importer-ask.ui									\
+	$(NULL)
+
+exportformat_data_DATA = \
 	export-format-ask.png								\
 	$(NULL)
 
@@ -148,5 +154,6 @@ CLEANFILES = \
 
 EXTRA_DIST = \
 	$(pkgdata_DATA)										\
+	$(exportformat_data_DATA)							\
 	na-marshal.def										\
 	$(NULL)
diff --git a/src/core/na-exporter.c b/src/core/na-exporter.c
index 3e325ea..ec245da 100644
--- a/src/core/na-exporter.c
+++ b/src/core/na-exporter.c
@@ -218,7 +218,7 @@ na_exporter_get_ask_option( void )
 	str->label = g_strdup( gettext( st_format_ask.label ));
 	str->description = g_strdup( gettext( st_format_ask.description ));
 	if( st_format_ask.image ){
-		fname = g_strdup_printf( "%s/%s", PKGDATADIR, st_format_ask.image );
+		fname = g_strdup_printf( "%s/%s", PKGEXPORTFORMATDIR, st_format_ask.image );
 		str->pixbuf = gdk_pixbuf_new_from_file_at_size( fname, width, height, NULL );
 		g_free( fname );
 		if( str->pixbuf ){