[nautilus-actions] Fix headers to support single compilation (but io-gconf/)

[Pierre Wieser <pwieser src gnome org>]

commit ce3bc5e56955f3c8bccc05c59fc40a4481d5e678
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Sep 9 23:02:58 2015 +0200

    Fix headers to support single compilation (but io-gconf/)

 configure.ac                 |    2 +-
 maintainer/run-distcheck.sh  |    6 +-
 po/POTFILES.in               |  142 +++++++++++++++++++++---------------------
 src/ui/fma-match-list.h      |    1 +
 src/ui/fma-tree-model-priv.h |    1 +
 src/ui/fma-tree-model.c      |    1 -
 src/ui/fma-tree-model.h      |    2 +-
 src/ui/fma-tree-view.c       |    2 -
 8 files changed, 79 insertions(+), 78 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d6cd753..b32cd1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.53])
 
 AC_INIT([FileManager-Actions],[3.4],[maintainer nautilus-actions org],,[http://www.nautilus-actions.org])
 
-#m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 
diff --git a/maintainer/run-distcheck.sh b/maintainer/run-distcheck.sh
index 4aa397a..b9ce164 100755
--- a/maintainer/run-distcheck.sh
+++ b/maintainer/run-distcheck.sh
@@ -47,11 +47,11 @@ done
 
 rm -fr ${builddir}
 rm -fr ${installdir}
-find ${top_srcdir}/docs/nact -type f -name '*.html' -o -name '*.pdf' | xargs rm -f
-find ${top_srcdir}/docs/nact \( -type d -o -type l \) -name 'stylesheet-images' -o -name 'admon' | xargs rm 
-fr
+find ${top_srcdir}/docs/user-manual -type f -name '*.html' -o -name '*.pdf' | xargs rm -f
+find ${top_srcdir}/docs/user-manual \( -type d -o -type l \) -name 'stylesheet-images' -o -name 'admon' | 
xargs rm -fr
 
 ${maintainer_dir}/run-autogen.sh --enable-deprecated --enable-gtk-doc --enable-html-manuals &&
        ${maintainer_dir}/check-po.sh -nodummy &&
        ${maintainer_dir}/check-headers.sh -nodummy -builddir="${builddir}" &&
-       desktop-file-validate ${installdir}/share/applications/nact.desktop &&
+       desktop-file-validate ${installdir}/share/applications/fma-ui.desktop &&
        make -C ${builddir} distcheck
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 235b223..7de036b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,73 +1,75 @@
 data/gconf-schemas/nautilus-actions-prefs.schemas.in
-src/core/na-exporter.c
-src/core/na-about.c
-src/core/na-desktop-environment.c
-src/core/na-icontext-factory.c
-src/core/na-iimporter.c
-src/core/na-importer.c
-src/core/na-importer-ask.c
-[type: gettext/glade] src/core/na-importer-ask.ui
-src/core/na-io-provider.c
-src/core/na-object-action.c
-src/core/na-object-action-factory.c
-src/core/na-object-id.c
-src/core/na-object-item-factory.c
-src/core/na-object-menu.c
-src/core/na-object-profile.c
-src/core/na-object-profile-factory.c
-src/core/na-selected-info.c
-src/core/na-tokens.c
-src/io-desktop/nadp-desktop-provider.c
-src/io-desktop/nadp-formats.c
-src/io-desktop/nadp-reader.c
-src/io-gconf/nagp-gconf-provider.c
-src/io-xml/naxml-reader.c
-src/io-xml/naxml-formats.c
-src/nact/base-application.c
-src/nact/base-assistant.c
-src/nact/base-iunique.c
-src/nact/base-window.c
-src/nact/egg-desktop-file.c
-src/nact/egg-sm-client.c
-src/nact/nact-application.c
-src/nact/nact-add-capability-dialog.c
-[type: gettext/glade] src/nact/nact-add-capability.ui
-[type: gettext/glade] src/nact/nact-add-scheme.ui
-src/nact/nact-assistant-export.c
-[type: gettext/glade] src/nact/nact-assistant-export.ui
-src/nact/nact-assistant-import.c
-[type: gettext/glade] src/nact/nact-assistant-import.ui
-src/nact/nact.desktop.in
-src/nact/nact-export-ask.c
-src/nact/nact-iaction-tab.c
-src/nact/nact-ibasenames-tab.c
-src/nact/nact-icapabilities-tab.c
-src/nact/nact-icommand-tab.c
-[type: gettext/glade] src/nact/nact-icon-chooser.ui
-src/nact/nact-ienvironment-tab.c
-src/nact/nact-ifolders-tab.c
-src/nact/nact-imimetypes-tab.c
-src/nact/nact-iproperties-tab.c
-src/nact/nact-ischemes-tab.c
-src/nact/nact-main-window.c
-src/nact/nact-match-list.c
-src/nact/nact-menubar.c
-src/nact/nact-menubar-edit.c
-src/nact/nact-menubar-file.c
-[type: gettext/glade] src/nact/nact-preferences.ui
-src/nact/nact-preferences-editor.c
-src/nact/nact-providers-list.c
-src/nact/nact-schemes-list.c
-src/nact/nact-tree-model.c
-src/nact/nact-tree-model-dnd.c
-src/nact/nact-tree-view.c
-[type: gettext/glade] src/nact/nautilus-actions-config-tool.ui
-src/plugin-menu/nautilus-actions.c
+src/core/fma-exporter.c
+src/core/fma-about.c
+src/core/fma-desktop-environment.c
+src/core/fma-icontext-factory.c
+src/core/fma-iimporter.c
+src/core/fma-importer.c
+src/core/fma-importer-ask.c
+[type: gettext/glade] src/core/fma-importer-ask.ui
+src/core/fma-io-provider.c
+src/core/fma-object-action.c
+src/core/fma-object-action-factory.c
+src/core/fma-object-id.c
+src/core/fma-object-item-factory.c
+src/core/fma-object-menu.c
+src/core/fma-object-profile.c
+src/core/fma-object-profile-factory.c
+src/core/fma-selected-info.c
+src/core/fma-tokens.c
+src/io-desktop/fma-desktop-provider.c
+src/io-desktop/fma-desktop-formats.c
+src/io-desktop/fma-desktop-reader.c
+src/io-gconf/fma-gconf-provider.c
+src/io-xml/fma-xml-reader.c
+src/io-xml/fma-xml-formats.c
+src/ui/base-assistant.c
+src/ui/base-gtk-utils.c
+src/ui/base-window.c
+src/ui/egg-desktop-file.c
+src/ui/egg-sm-client.c
+src/ui/fma-application.c
+src/ui/fma-add-capability-dialog.c
+[type: gettext/glade] src/ui/fma-add-capability.ui
+[type: gettext/glade] src/ui/fma-add-scheme.ui
+src/ui/fma-assistant-export.c
+[type: gettext/glade] src/ui/fma-assistant-export.ui
+src/ui/fma-assistant-import.c
+[type: gettext/glade] src/ui/fma-assistant-import.ui
+[type: gettext/glade] src/ui/fma-confirm-logout.ui
+src/ui/fma-export-ask.c
+[type: gettext/glade] src/ui/fma-export-ask.ui
+src/ui/fma-iaction-tab.c
+src/ui/fma-ibasenames-tab.c
+src/ui/fma-icapabilities-tab.c
+src/ui/fma-icommand-tab.c
+[type: gettext/glade] src/ui/fma-icon-chooser.ui
+src/ui/fma-ienvironment-tab.c
+src/ui/fma-ifolders-tab.c
+src/ui/fma-imimetypes-tab.c
+src/ui/fma-iproperties-tab.c
+src/ui/fma-ischemes-tab.c
+[type: gettext/glade] src/ui/fma-legend.ui
+src/ui/fma-main-window.c
+[type: gettext/glade] src/ui/fma-main-window.ui
+src/ui/fma-match-list.c
+src/ui/fma-menu.c
+src/ui/fma-menu-edit.c
+src/ui/fma-menu-file.c
+[type: gettext/glade] src/ui/fma-preferences.ui
+src/ui/fma-preferences-editor.c
+src/ui/fma-providers-list.c
+src/ui/fma-schemes-list.c
+[type: gettext/glade] src/ui/fma-toolbar.ui
+src/ui/fma-tree-model-dnd.c
+[type: gettext/glade] src/ui/fma-ui.actions
+src/ui/fma-ui.desktop.in
+src/plugin-menu/fma-menu-plugin.c
 src/test/test-reader.c
 src/utils/console-utils.c
-src/utils/na-delete-xmltree.c
-src/utils/na-print-schemas.c
-src/utils/na-set-conf.c
-src/utils/nautilus-actions-new.c
-src/utils/nautilus-actions-print.c
-src/utils/nautilus-actions-run.c
+src/utils/fma-delete-xmltree.c
+src/utils/fma-new.c
+src/utils/fma-print.c
+src/utils/fma-print-schemas.c
+src/utils/fma-run.c
+src/utils/fma-set-conf.c
diff --git a/src/ui/fma-match-list.h b/src/ui/fma-match-list.h
index 4e9b8d2..a961f3d 100644
--- a/src/ui/fma-match-list.h
+++ b/src/ui/fma-match-list.h
@@ -48,6 +48,7 @@
  * So we stay with just a piece of helper functions...
  */
 
+#include "base-window.h"
 #include "fma-main-window-def.h"
 
 G_BEGIN_DECLS
diff --git a/src/ui/fma-tree-model-priv.h b/src/ui/fma-tree-model-priv.h
index 90d2a09..efc4982 100644
--- a/src/ui/fma-tree-model-priv.h
+++ b/src/ui/fma-tree-model-priv.h
@@ -36,6 +36,7 @@
 #ifndef __UI_FMA_TREE_MODEL_PRIV_H__
 #define __UI_FMA_TREE_MODEL_PRIV_H__
 
+#include "base-window.h"
 #include "egg-tree-multi-dnd.h"
 #include "fma-clipboard.h"
 
diff --git a/src/ui/fma-tree-model.c b/src/ui/fma-tree-model.c
index 308257d..67f526d 100644
--- a/src/ui/fma-tree-model.c
+++ b/src/ui/fma-tree-model.c
@@ -31,7 +31,6 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
 #include <string.h>
 
 #include "api/fma-object-api.h"
diff --git a/src/ui/fma-tree-model.h b/src/ui/fma-tree-model.h
index df483a6..394d590 100644
--- a/src/ui/fma-tree-model.h
+++ b/src/ui/fma-tree-model.h
@@ -44,7 +44,7 @@
 #ifndef __UI_FMA_TREE_MODEL_H__
 #define __UI_FMA_TREE_MODEL_H__
 
-#include "api/fma-object.h"
+#include "api/fma-object-item.h"
 
 #include "fma-main-window-def.h"
 
diff --git a/src/ui/fma-tree-view.c b/src/ui/fma-tree-view.c
index ca2b52e..520b908 100644
--- a/src/ui/fma-tree-view.c
+++ b/src/ui/fma-tree-view.c
@@ -31,8 +31,6 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
-
 #include "api/fma-object-api.h"
 
 #include "core/fma-gtk-utils.h"