[nautilus-actions] Import mode: store the icons in a dedicated subdirectory

[Pierre Wieser <pwieser src gnome org>]

commit 1b225a2ea33ba1fd41bca2b836dabd3834af1b1c
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Feb 22 22:18:07 2012 +0100

    Import mode: store the icons in a dedicated subdirectory

 ChangeLog                                    |    5 +++++
 src/core/Makefile.am                         |   11 +++++++++++
 src/{nact => core}/import-mode-ask.png       |  Bin 4017 -> 4017 bytes
 src/{nact => core}/import-mode-no-import.png |  Bin 3874 -> 3874 bytes
 src/{nact => core}/import-mode-override.png  |  Bin 4490 -> 4490 bytes
 src/{nact => core}/import-mode-renumber.png  |  Bin 3882 -> 3882 bytes
 src/core/na-importer.c                       |    2 +-
 src/nact/Makefile.am                         |    4 ----
 8 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 770cee4..3e808bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-02-22 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/Makefile.am: Store import mode images in dedicated dir.
+
+	* src/core/na-importer.c (get_mode_from_struct):
+	* src/nact/Makefile.am: Updated accordingly.
+
 	* src/core/Makefile.am: Store export-format image in dedicated dir.
 
 	* src/core/na-exporter.c (na_exporter_get_ask_option): Updated
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 8f6591c..0850b3b 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -30,6 +30,8 @@ pkglib_LTLIBRARIES = libna-core.la
 
 exportformat_datadir = $(pkgdatadir)/export-format
 
+importmode_datadir = $(pkgdatadir)/import-mode
+
 AM_CPPFLAGS += \
 	-I $(top_srcdir)									\
 	-I $(top_srcdir)/src								\
@@ -40,6 +42,7 @@ AM_CPPFLAGS += \
 	-DSYSCONFDIR=\"$(sysconfdir)\"						\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_CORE}\"				\
 	-DPKGEXPORTFORMATDIR=\"$(exportformat_datadir)\"	\
+	-DPKGIMPORTMODEDIR=\"$(importmode_datadir)\"	\
 	$(NAUTILUS_ACTIONS_CFLAGS)							\
 	$(NULL)
 
@@ -148,6 +151,13 @@ exportformat_data_DATA = \
 	export-format-ask.png								\
 	$(NULL)
 
+importmode_data_DATA = \
+	import-mode-ask.png									\
+	import-mode-no-import.png							\
+	import-mode-override.png							\
+	import-mode-renumber.png							\
+	$(NULL)
+
 CLEANFILES = \
 	$(BUILT_SOURCES)									\
 	$(NULL)
@@ -155,5 +165,6 @@ CLEANFILES = \
 EXTRA_DIST = \
 	$(pkgdata_DATA)										\
 	$(exportformat_data_DATA)							\
+	$(importmode_data_DATA)								\
 	na-marshal.def										\
 	$(NULL)
diff --git a/src/nact/import-mode-ask.png b/src/core/import-mode-ask.png
similarity index 100%
rename from src/nact/import-mode-ask.png
rename to src/core/import-mode-ask.png
diff --git a/src/nact/import-mode-no-import.png b/src/core/import-mode-no-import.png
similarity index 100%
rename from src/nact/import-mode-no-import.png
rename to src/core/import-mode-no-import.png
diff --git a/src/nact/import-mode-override.png b/src/core/import-mode-override.png
similarity index 100%
rename from src/nact/import-mode-override.png
rename to src/core/import-mode-override.png
diff --git a/src/nact/import-mode-renumber.png b/src/core/import-mode-renumber.png
similarity index 100%
rename from src/nact/import-mode-renumber.png
rename to src/core/import-mode-renumber.png
diff --git a/src/core/na-importer.c b/src/core/na-importer.c
index 6e39cb1..bdc7b43 100644
--- a/src/core/na-importer.c
+++ b/src/core/na-importer.c
@@ -505,7 +505,7 @@ get_mode_from_struct( const NAImportModeStr *str )
 	pixbuf = NULL;
 
 	if( str->image && g_utf8_strlen( str->image, -1 )){
-		fname = g_strdup_printf( "%s/%s", PKGDATADIR, str->image );
+		fname = g_strdup_printf( "%s/%s", PKGIMPORTMODEDIR, str->image );
 		pixbuf = gdk_pixbuf_new_from_file_at_size( fname, width, height, NULL );
 		g_free( fname );
 	}
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index b4cb769..0802964 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -187,10 +187,6 @@ ui_files = \
 	$(NULL)
 
 images_files = \
-	import-mode-ask.png									\
-	import-mode-no-import.png							\
-	import-mode-override.png							\
-	import-mode-renumber.png							\
 	locked.png											\
 	transparent.png										\
 	$(NULL)