[nautilus-actions/file-manager-actions] src/core/fma-importer-ask.ui: homogeneize the installation directory

[Pierre Wieser <pwieser src gnome org>]

commit bbf737269ee873699d0a336cf93c0b82f359df88
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 13:48:13 2015 +0200

    src/core/fma-importer-ask.ui: homogeneize the installation directory

 src/core/Makefile.am        |   10 +++++-----
 src/core/fma-importer-ask.c |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 35462ec..6d70864 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -31,9 +31,9 @@ exportformat_datadir = $(pkgdatadir)/export-format
 
 importmode_datadir = $(pkgdatadir)/import-mode
 
-icon_fname = $(datadir)/icons/hicolor/48x48/apps/filemanager-actions.png
+importerask_datadir = $(pkgdatadir)/importer-ask
 
-ui_datadir = $(pkgdatadir)/ui
+icon_fname = $(datadir)/icons/hicolor/48x48/apps/filemanager-actions.png
 
 AM_CPPFLAGS += \
        -I $(top_srcdir)                                                                        \
@@ -46,7 +46,7 @@ AM_CPPFLAGS += \
        -DICON_FNAME=\"$(icon_fname)\"                                          \
        -DPKGEXPORTFORMATDIR=\"$(exportformat_datadir)\"        \
        -DPKGIMPORTMODEDIR=\"$(importmode_datadir)\"            \
-       -DPKGUIDIR=\"$(ui_datadir)\"                                            \
+       -DPKGIMPORTERASKDIR=\"$(importerask_datadir)\"          \
        $(NAUTILUS_ACTIONS_CFLAGS)                                                      \
        $(NULL)
 
@@ -135,7 +135,7 @@ libfma_core_la_LDFLAGS = \
        -fPIC                                                                                           \
        $(NULL)
 
-ui_data_DATA = \
+importerask_data_DATA = \
        fma-importer-ask.ui                                                                     \
        $(NULL)
 
@@ -154,7 +154,7 @@ CLEANFILES = \
        $(NULL)
 
 EXTRA_DIST = \
-       $(ui_data_DATA)                                                                         \
+       $(importerask_data_DATA)                                                        \
        $(exportformat_data_DATA)                                                       \
        $(importmode_data_DATA)                                                         \
        $(NULL)
diff --git a/src/core/fma-importer-ask.c b/src/core/fma-importer-ask.c
index e94597c..7d4ab5d 100644
--- a/src/core/fma-importer-ask.c
+++ b/src/core/fma-importer-ask.c
@@ -52,17 +52,17 @@ struct _FMAImporterAskClassPrivate {
 /* private instance data
  */
 struct _FMAImporterAskPrivate {
-       gboolean                dispose_has_run;
-       GtkWindow              *toplevel;
+       gboolean                 dispose_has_run;
+       GtkWindow               *toplevel;
        FMAObjectItem           *importing;
        FMAObjectItem           *existing;
        FMAImporterAskUserParms *parms;
-       guint                   mode;
+       guint                    mode;
 };
 
-static GObjectClass  *st_parent_class = NULL;
+static GObjectClass   *st_parent_class = NULL;
 static FMAImporterAsk *st_dialog       = NULL;
-static const gchar   *st_uixml        = PKGUIDIR "/fma-importer-ask.ui";
+static const gchar    *st_uixml        = PKGIMPORTERASKDIR "/fma-importer-ask.ui";
 
 static GType          register_type( void );
 static void           class_init( FMAImporterAskClass *klass );