[nautilus-actions/file-manager-actions] rename to filemanager-actions to keep consistency
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] rename to filemanager-actions to keep consistency
- Date: Tue, 8 Sep 2015 12:20:47 +0000 (UTC)
commit 6b1a0145bcdce289ff52abdadd51c281840bab92
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 13:40:28 2015 +0200
rename to filemanager-actions to keep consistency
ChangeLog-2012 | 4 +-
data/actions/Makefile.am | 6 ++--
data/actions/show-parameters.desktop | 6 ++--
icons/16x16/Makefile.am | 2 +-
...manager-actions.png => filemanager-actions.png} | Bin 982 -> 982 bytes
...manager-actions.svg => filemanager-actions.svg} | 0
icons/22x22/Makefile.am | 2 +-
...manager-actions.png => filemanager-actions.png} | Bin 1524 -> 1524 bytes
...manager-actions.svg => filemanager-actions.svg} | 0
icons/32x32/Makefile.am | 2 +-
...manager-actions.png => filemanager-actions.png} | Bin 2599 -> 2599 bytes
...manager-actions.svg => filemanager-actions.svg} | 0
icons/48x48/Makefile.am | 2 +-
...manager-actions.png => filemanager-actions.png} | Bin 4463 -> 4463 bytes
icons/scalable/Makefile.am | 2 +-
...manager-actions.svg => filemanager-actions.svg} | 0
maintainer/check-headers.sh | 4 +-
maintainer/release-tarball.sh | 2 +-
maintainer/run-autogen.sh | 6 ++--
maintainer/run-distcheck.sh | 4 +-
src/api/fma-boxed.h | 8 +++---
src/api/fma-core-utils.h | 8 +++---
src/api/fma-data-boxed.h | 8 +++---
src/api/fma-data-def.h | 16 ++++++------
src/api/fma-data-types.h | 8 +++---
src/api/fma-dbus.h | 24 ++++++++++----------
src/api/fma-extension.h | 12 +++++-----
src/api/fma-gconf-monitor.h | 8 +++---
src/api/fma-gconf-utils.h | 6 ++--
src/api/fma-icontext.h | 8 +++---
src/api/fma-iduplicable.h | 8 +++---
src/api/fma-iexporter.h | 12 +++++-----
src/api/fma-ifactory-object-data.h | 8 +++---
src/api/fma-ifactory-object.h | 8 +++---
src/api/fma-ifactory-provider-provider.h | 6 ++--
src/api/fma-ifactory-provider.h | 8 +++---
src/api/fma-iimporter.h | 10 ++++----
src/api/fma-iio-provider.h | 14 +++++-----
src/api/fma-object-action.h | 8 +++---
src/api/fma-object-api.h | 8 +++---
src/api/fma-object-id.h | 8 +++---
src/api/fma-object-item.h | 8 +++---
src/api/fma-object-menu.h | 8 +++---
src/api/fma-object-profile.h | 8 +++---
src/api/fma-object.h | 10 ++++----
src/api/fma-timeout.h | 8 +++---
src/core/Makefile.am | 12 +++++-----
src/core/fma-about.c | 4 +-
src/core/fma-core-utils.c | 2 +-
...rt-format-ask.png => fma-export-format-ask.png} | Bin 4017 -> 4017 bytes
src/core/fma-exporter.c | 2 +-
...import-mode-ask.png => fma-import-mode-ask.png} | Bin 4017 -> 4017 bytes
...no-import.png => fma-import-mode-no-import.png} | Bin 3874 -> 3874 bytes
...e-override.png => fma-import-mode-override.png} | Bin 4490 -> 4490 bytes
...e-renumber.png => fma-import-mode-renumber.png} | Bin 3882 -> 3882 bytes
src/core/fma-importer.c | 8 +++---
src/core/fma-io-provider.c | 2 +-
src/core/fma-settings.h | 4 +-
src/core/fma-tokens.h | 2 +-
src/io-desktop/nadp-formats.c | 2 +-
src/io-gconf/nagp-keys.h | 4 +-
src/io-gconf/nagp-writer.c | 2 +-
src/io-xml/naxml-writer.c | 12 +++++-----
src/nact/.gitignore | 4 +-
src/nact/nact-application.c | 2 +-
src/nact/nact-application.h | 2 +-
src/nact/nact-assistant-export.h | 2 +-
src/nact/nact-confirm-logout.ui | 2 +-
src/nact/nact-menu.c | 4 +-
src/nact/nact-tree-model-dnd.c | 6 ++--
src/nact/nact.desktop.in | 4 +-
src/plugin-menu/nautilus-actions.c | 4 +-
src/plugin-menu/nautilus-actions.h | 4 +-
src/plugin-tracker/na-tracker.c | 6 ++--
src/test/test-parse-uris.c | 4 +-
src/test/test-reader.c | 2 +-
src/utils/.gitignore | 8 +++---
src/utils/console-utils.c | 4 +-
src/utils/na-gconf2key.sh.in | 16 ++++++------
src/utils/nautilus-actions-print.c | 2 +-
src/utils/nautilus-actions-run.c | 12 +++++-----
81 files changed, 216 insertions(+), 216 deletions(-)
---
diff --git a/ChangeLog-2012 b/ChangeLog-2012
index 27fb968..7bd3353 100644
--- a/ChangeLog-2012
+++ b/ChangeLog-2012
@@ -1226,7 +1226,7 @@
Move 'Ask' export format to NAExporter.
* src/core/Makefile.am:
- * src/nact/Makefile.am: Move export-format-ask.png to src/core.
+ * src/nact/Makefile.am: Move fma-export-format-ask.png to src/core.
* nact-export-format.c:
* nact-export-format.h: Removed files.
@@ -1430,7 +1430,7 @@
2012-01-01 Pierre Wieser <pwieser trychlos org>
- * src/nact/export-format-ask.png: Add omitted image.
+ * src/nact/fma-export-format-ask.png: Add omitted image.
* src/api/na-core-utils.h:
* src/core/na-core-utils.c (na_core_utils_str_add_prefix): Deprecated function.
diff --git a/data/actions/Makefile.am b/data/actions/Makefile.am
index 3183f9d..c8880d3 100644
--- a/data/actions/Makefile.am
+++ b/data/actions/Makefile.am
@@ -26,10 +26,10 @@
# ... and many others (see AUTHORS)
actions_files = \
- my-first-action.desktop \
- my-first-menu.desktop \
+ my-first-action.desktop \
+ my-first-menu.desktop \
open-terminal-here.desktop \
- show-parameters.desktop \
+ show-parameters.desktop \
$(NULL)
actionsdir = $(pkgdatadir)/samples
diff --git a/data/actions/show-parameters.desktop b/data/actions/show-parameters.desktop
index b609b7c..3082744 100644
--- a/data/actions/show-parameters.desktop
+++ b/data/actions/show-parameters.desktop
@@ -5,9 +5,9 @@ Profiles=profile-pre-v2;
Name[en_US]=Display FileManager-Actions Parameters
Name[en]=Display FileManager-Actions Parameters
Name[C]=Display FileManager-Actions Parameters
-Icon[en_US]=/usr/share/icons/hicolor/16x16/apps/file-manager-actions.png
-Icon[en]=/usr/share/icons/hicolor/16x16/apps/file-manager-actions.png
-Icon[C]=/usr/share/icons/hicolor/16x16/apps/file-manager-actions.png
+Icon[en_US]=/usr/share/icons/hicolor/16x16/apps/filemanager-actions.png
+Icon[en]=/usr/share/icons/hicolor/16x16/apps/filemanager-actions.png
+Icon[C]=/usr/share/icons/hicolor/16x16/apps/filemanager-actions.png
ToolbarLabel[en_US]=Display FileManager-Actions Parameters
ToolbarLabel[en]=Display FileManager-Actions Parameters
ToolbarLabel[C]=Display FileManager-Actions Parameters
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 385a474..f62f45d 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -27,6 +27,6 @@
icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA = file-manager-actions.png
+icon_DATA = filemanager-actions.png
EXTRA_DIST = $(icon_DATA)
diff --git a/icons/16x16/file-manager-actions.svg b/icons/16x16/filemanager-actions.svg
similarity index 100%
rename from icons/16x16/file-manager-actions.svg
rename to icons/16x16/filemanager-actions.svg
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index 70b7e8b..2809b63 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -27,6 +27,6 @@
icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = file-manager-actions.png
+icon_DATA = filemanager-actions.png
EXTRA_DIST = $(icon_DATA)
diff --git a/icons/22x22/file-manager-actions.svg b/icons/22x22/filemanager-actions.svg
similarity index 100%
rename from icons/22x22/file-manager-actions.svg
rename to icons/22x22/filemanager-actions.svg
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index dca95f8..ceccb60 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -27,6 +27,6 @@
icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = file-manager-actions.png
+icon_DATA = filemanager-actions.png
EXTRA_DIST = $(icon_DATA)
diff --git a/icons/32x32/file-manager-actions.svg b/icons/32x32/filemanager-actions.svg
similarity index 100%
rename from icons/32x32/file-manager-actions.svg
rename to icons/32x32/filemanager-actions.svg
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index b655969..a097b6f 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -27,6 +27,6 @@
icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = file-manager-actions.png
+icon_DATA = filemanager-actions.png
EXTRA_DIST = $(icon_DATA)
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
index 184abd7..fc86593 100644
--- a/icons/scalable/Makefile.am
+++ b/icons/scalable/Makefile.am
@@ -27,6 +27,6 @@
svgicondir = $(datadir)/icons/hicolor/scalable/apps
-svgicon_DATA = file-manager-actions.svg
+svgicon_DATA = filemanager-actions.svg
EXTRA_DIST = $(svgicon_DATA)
diff --git a/icons/scalable/file-manager-actions.svg b/icons/scalable/filemanager-actions.svg
similarity index 100%
rename from icons/scalable/file-manager-actions.svg
rename to icons/scalable/filemanager-actions.svg
diff --git a/maintainer/check-headers.sh b/maintainer/check-headers.sh
index ea9b4e3..0914b3a 100755
--- a/maintainer/check-headers.sh
+++ b/maintainer/check-headers.sh
@@ -300,9 +300,9 @@ if [ "${opt_version}" = "yes" ]; then
exit
fi
-#if [ "${top_srcdir##*/}" != "file-manager-actions" ]; then
+#if [ "${top_srcdir##*/}" != "filemanager-actions" ]; then
# msgerr "current directory is $(pwd)"
-# msg "you should change to file-manager-actions/"
+# msg "you should change to filemanager-actions/"
# let errs+=1
#fi
diff --git a/maintainer/release-tarball.sh b/maintainer/release-tarball.sh
index 16da5f4..64d9883 100755
--- a/maintainer/release-tarball.sh
+++ b/maintainer/release-tarball.sh
@@ -199,7 +199,7 @@ set -- ${my_parms}
# interpreting command-line arguments
# pck_name: FileManager-Actions
-# product: file-manager-actions
+# product: filemanager-actions
# version: most recent found in builddir
thisdir=$(cd ${0%/*}; pwd)
rootdir=${thisdir%/*}
diff --git a/maintainer/run-autogen.sh b/maintainer/run-autogen.sh
index c0aa0f4..a697330 100755
--- a/maintainer/run-autogen.sh
+++ b/maintainer/run-autogen.sh
@@ -62,12 +62,12 @@ fi
maintainer_dir=$(cd ${0%/*}; pwd)
top_srcdir="${maintainer_dir%/*}"
-PKG_NAME="file-manager-actions"
+PKG_NAME="filemanager-actions"
-# a file-manager-actions-x.y may remain after an aborted make distcheck
+# a filemanager-actions-x.y may remain after an aborted make distcheck
# such a directory breaks gnome-autogen.sh generation
# so clean it here
-for d in $(find ${top_srcdir} -maxdepth 2 -type d -name 'file-manager-actions-*'); do
+for d in $(find ${top_srcdir} -maxdepth 2 -type d -name 'filemanager-actions-*'); do
echo "> Removing $d"
chmod -R u+w $d
rm -fr $d
diff --git a/maintainer/run-distcheck.sh b/maintainer/run-distcheck.sh
index a9f317b..4aa397a 100755
--- a/maintainer/run-distcheck.sh
+++ b/maintainer/run-distcheck.sh
@@ -37,10 +37,10 @@ top_srcdir="${maintainer_dir%/*}"
builddir="${top_srcdir}/_build"
installdir="${top_srcdir}/_install"
-# a file-manager-actions-x.y may remain after an aborted make distcheck
+# a filemanager-actions-x.y may remain after an aborted make distcheck
# such a directory breaks gnome-autogen.sh generation
# so clean it here
-for d in $(find ${top_srcdir} -maxdepth 2 -type d -name 'file-manager-actions-*'); do
+for d in $(find ${top_srcdir} -maxdepth 2 -type d -name 'filemanager-actions-*'); do
chmod -R u+w $d
rm -fr $d
done
diff --git a/src/api/fma-boxed.h b/src/api/fma-boxed.h
index 32b438a..b0d0d59 100644
--- a/src/api/fma-boxed.h
+++ b/src/api/fma-boxed.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_BOXED_H__
-#define __FILE_MANAGER_ACTIONS_API_BOXED_H__
+#ifndef __FILEMANAGER_ACTIONS_API_BOXED_H__
+#define __FILEMANAGER_ACTIONS_API_BOXED_H__
/**
* SECTION: boxed
* @title: FMABoxed
* @short_description: The FMABoxed Structure
- * @include: file-manager-actions/fma-boxed.h
+ * @include: filemanager-actions/fma-boxed.h
*
* The FMABoxed structure is a way of handling various types of data in an
* opaque structure.
@@ -95,4 +95,4 @@ void fma_boxed_set_from_void ( FMABoxed *boxed, const void *value );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_BOXED_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_BOXED_H__ */
diff --git a/src/api/fma-core-utils.h b/src/api/fma-core-utils.h
index c241662..4b2e325 100644
--- a/src/api/fma-core-utils.h
+++ b/src/api/fma-core-utils.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_CORE_UTILS_H__
-#define __FILE_MANAGER_ACTIONS_API_CORE_UTILS_H__
+#ifndef __FILEMANAGER_ACTIONS_API_CORE_UTILS_H__
+#define __FILEMANAGER_ACTIONS_API_CORE_UTILS_H__
/**
* SECTION: core-utils
* @title: Core Misc
* @short_description: The Core Library Utilities
- * @include: file-manager-actions/fma-core-utils.h
+ * @include: filemanager-actions/fma-core-utils.h
*/
#include <glib.h>
@@ -103,4 +103,4 @@ void fma_core_utils_print_version( void );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_CORE_UTILS_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_CORE_UTILS_H__ */
diff --git a/src/api/fma-data-boxed.h b/src/api/fma-data-boxed.h
index d21d371..190b94f 100644
--- a/src/api/fma-data-boxed.h
+++ b/src/api/fma-data-boxed.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_DATA_BOXED_H__
-#define __FILE_MANAGER_ACTIONS_API_DATA_BOXED_H__
+#ifndef __FILEMANAGER_ACTIONS_API_DATA_BOXED_H__
+#define __FILEMANAGER_ACTIONS_API_DATA_BOXED_H__
/**
* SECTION: data-boxed
* @title: FMADataBoxed
* @short_description: The Data Factory Element Class Definition
- * @include: file-manager-actions/fma-data-boxed.h
+ * @include: filemanager-actions/fma-data-boxed.h
*
* The object which encapsulates an elementary data of #FMAIFactoryObject.
* A #FMADataBoxed object has a type and a value.
@@ -109,4 +109,4 @@ void fma_data_boxed_set_from_void ( FMADataBoxed *boxed, const voi
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_DATA_BOXED_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_DATA_BOXED_H__ */
diff --git a/src/api/fma-data-def.h b/src/api/fma-data-def.h
index c8f2c97..f85e493 100644
--- a/src/api/fma-data-def.h
+++ b/src/api/fma-data-def.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_DATA_DEF_H__
-#define __FILE_MANAGER_ACTIONS_API_DATA_DEF_H__
+#ifndef __FILEMANAGER_ACTIONS_API_DATA_DEF_H__
+#define __FILEMANAGER_ACTIONS_API_DATA_DEF_H__
/**
* SECTION: data-def
* @title: FMADataDef, FMADataGroup
* @short_description: The Data Factory Structure Definitions
- * @include: file-manager-actions/fma-data-def.h
+ * @include: filemanager-actions/fma-data-def.h
*
* #FMADataDef and #FMADataGroup are structures which handle the list of
* elementary datas for each and every #FMAObjectItem which happens to
@@ -70,7 +70,7 @@ G_BEGIN_DECLS
* @type: the elementary FMA_DATA_TYPE_xxx data type.
* @default_value: the default to assign when creating a new object.
* This default is also displayed in command-line help
- * of file-manager-actions-new utility.
+ * of filemanager-actions-new utility.
* @write_if_default: write this value even if it is the default value ?
* Should default to FALSE.
* @copyable: whether this data should be automatically copied when
@@ -84,13 +84,13 @@ G_BEGIN_DECLS
* @localizable: whether this is a localizable data when serializing or exporting.
* @gconf_entry: same entry is also used for GConf-based XML docs.
* @desktop_entry: entry in .desktop files.
- * @option_short: the short version of a command-line parameter in file-manager-actions-new,
+ * @option_short: the short version of a command-line parameter in filemanager-actions-new,
* or 0.
- * @option_long: the long version of the same command-line parameter in file-manager-actions-new,
+ * @option_long: the long version of the same command-line parameter in filemanager-actions-new,
* or NULL.
* @option_flags: #GOptionFlags for the command-line parameter, or 0.
* @option_arg: the type of the option, or 0.
- * @option_label: the localizable description for the variable in file-manager-actions-new.
+ * @option_label: the localizable description for the variable in filemanager-actions-new.
* Defaults to @short_label if NULL.
* @option_arg_label: the localizable description for the argument.
*
@@ -142,4 +142,4 @@ const FMADataDef *fma_data_def_get_data_def( const FMADataGroup *group, const gc
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_DATA_DEF_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_DATA_DEF_H__ */
diff --git a/src/api/fma-data-types.h b/src/api/fma-data-types.h
index 21e9eaa..84c5e87 100644
--- a/src/api/fma-data-types.h
+++ b/src/api/fma-data-types.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_DATA_TYPES_H__
-#define __FILE_MANAGER_ACTIONS_API_DATA_TYPES_H__
+#ifndef __FILEMANAGER_ACTIONS_API_DATA_TYPES_H__
+#define __FILEMANAGER_ACTIONS_API_DATA_TYPES_H__
/**
* SECTION: data-type
* @title: FMADataType
* @short_description: The Data Factory Type Definitions
- * @include: file-manager-actions/fma-data-types.h
+ * @include: filemanager-actions/fma-data-types.h
*/
#include <glib.h>
@@ -94,4 +94,4 @@ const gchar *fma_data_types_get_gconf_dump_key( guint type );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_DATA_TYPES_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_DATA_TYPES_H__ */
diff --git a/src/api/fma-dbus.h b/src/api/fma-dbus.h
index f533c43..7b97adb 100644
--- a/src/api/fma-dbus.h
+++ b/src/api/fma-dbus.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_DBUS_H__
-#define __FILE_MANAGER_ACTIONS_API_DBUS_H__
+#ifndef __FILEMANAGER_ACTIONS_API_DBUS_H__
+#define __FILEMANAGER_ACTIONS_API_DBUS_H__
/**
* SECTION: dbus
* @title: D-Bus
* @short_description: The D-Bus Services
- * @include: file-manager-actions/fma-dbus.h
+ * @include: filemanager-actions/fma-dbus.h
*
* &prodname;, through its <emphasis>tracker</emphasis> plugin, exposes
* several D-Bus interfaces. These interfaces may be queried in order to get
@@ -59,15 +59,15 @@
G_BEGIN_DECLS
/**
- * FILE_MANAGER_ACTIONS_DBUS_SERVICE:
+ * FILEMANAGER_ACTIONS_DBUS_SERVICE:
*
* This is the « well-known » name that
* &prodname; reserves on D-Bus session bus.
*/
-#define FILE_MANAGER_ACTIONS_DBUS_SERVICE "org.file-manager-actions.DBus"
+#define FILEMANAGER_ACTIONS_DBUS_SERVICE "org.filemanager-actions.DBus"
/**
- * FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH:
+ * FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH:
*
* The D-Bus path of the <emphasis>tracker</emphasis> object.
*
@@ -81,7 +81,7 @@ G_BEGIN_DECLS
* --session \
* --type=method_call \
* --print-reply \
- * --dest=org.file-manager-actions.DBus \
+ * --dest=org.filemanager-actions.DBus \
* /org/file_manager_actions/DBus/Tracker \
* org.freedesktop.DBus.Introspectable.Introspect
* </command>
@@ -122,16 +122,16 @@ G_BEGIN_DECLS
* </computeroutput>
* </programlisting>
*/
-#define FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH "/org/file_manager_actions/DBus/Tracker"
+#define FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH "/org/file_manager_actions/DBus/Tracker"
/**
- * FILE_MANAGER_ACTIONS_DBUS_TRACKER_IFACE:
+ * FILEMANAGER_ACTIONS_DBUS_TRACKER_IFACE:
*
* An interface defined on the <emphasis>tracker</emphasis> object,
- * identified by its %FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH D-Bus path.
+ * identified by its %FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH D-Bus path.
*/
-#define FILE_MANAGER_ACTIONS_DBUS_TRACKER_IFACE "org.file_manager_actions.DBus.Tracker.Properties1"
+#define FILEMANAGER_ACTIONS_DBUS_TRACKER_IFACE "org.file_manager_actions.DBus.Tracker.Properties1"
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_DBUS_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_DBUS_H__ */
diff --git a/src/api/fma-extension.h b/src/api/fma-extension.h
index 1792f34..34be2d8 100644
--- a/src/api/fma-extension.h
+++ b/src/api/fma-extension.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_EXTENSION_H__
-#define __FILE_MANAGER_ACTIONS_API_EXTENSION_H__
+#ifndef __FILEMANAGER_ACTIONS_API_EXTENSION_H__
+#define __FILEMANAGER_ACTIONS_API_EXTENSION_H__
/**
* SECTION: extension
* @title: Plugins
* @short_description: The FileManager-Actions Extension Interface Definition v 1
- * @include: file-manager-actions/fma-extension.h
+ * @include: filemanager-actions/fma-extension.h
*
* &prodname; accepts extensions as dynamically loadable libraries
* (aka plugins).
@@ -113,8 +113,8 @@
* <para>
* At startup time, &prodname; searches for its candidate libraries in
* <filename>PKGLIBDIR</filename> directory, which most often happens to
- * be <filename>/usr/lib/file-manager-actions/</filename> or
- * <filename>/usr/lib64/file-manager-actions/</filename>,
+ * be <filename>/usr/lib/filemanager-actions/</filename> or
+ * <filename>/usr/lib64/filemanager-actions/</filename>,
* depending of your system.
* </para>
* </refsect3>
@@ -291,4 +291,4 @@ void fma_extension_shutdown ( void );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_EXTENSION_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_EXTENSION_H__ */
diff --git a/src/api/fma-gconf-monitor.h b/src/api/fma-gconf-monitor.h
index dc05adf..45e00be 100644
--- a/src/api/fma-gconf-monitor.h
+++ b/src/api/fma-gconf-monitor.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_GCONF_MONITOR_H__
-#define __FILE_MANAGER_ACTIONS_API_GCONF_MONITOR_H__
+#ifndef __FILEMANAGER_ACTIONS_API_GCONF_MONITOR_H__
+#define __FILEMANAGER_ACTIONS_API_GCONF_MONITOR_H__
#ifdef HAVE_GCONF
#ifdef NA_ENABLE_DEPRECATED
@@ -36,7 +36,7 @@
* SECTION: gconf-monitor
* @title: FMAGConfMonitor
* @short_description: The GConf Monitoring Class Definition
- * @include: file-manager-actions/fma-gconf-monitor.h
+ * @include: filemanager-actions/fma-gconf-monitor.h
*
* This class manages the GConf monitoring.
* It is used to monitor both the GConf provider and the GConf runtime
@@ -85,4 +85,4 @@ G_END_DECLS
#endif /* NA_ENABLE_DEPRECATED */
#endif /* HAVE_GCONF */
-#endif /* __FILE_MANAGER_ACTIONS_API_GCONF_MONITOR_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_GCONF_MONITOR_H__ */
diff --git a/src/api/fma-gconf-utils.h b/src/api/fma-gconf-utils.h
index 2423e86..481280a 100644
--- a/src/api/fma-gconf-utils.h
+++ b/src/api/fma-gconf-utils.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_GCONF_UTILS_H__
-#define __FILE_MANAGER_ACTIONS_API_GCONF_UTILS_H__
+#ifndef __FILEMANAGER_ACTIONS_API_GCONF_UTILS_H__
+#define __FILEMANAGER_ACTIONS_API_GCONF_UTILS_H__
#ifdef HAVE_GCONF
/**
@@ -76,4 +76,4 @@ gchar *fma_gconf_utils_slist_to_string ( GSList *slist );
G_END_DECLS
#endif /* HAVE_GCONF */
-#endif /* __FILE_MANAGER_ACTIONS_API_GCONF_UTILS_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_GCONF_UTILS_H__ */
diff --git a/src/api/fma-icontext.h b/src/api/fma-icontext.h
index 7bb1038..d2bcec0 100644
--- a/src/api/fma-icontext.h
+++ b/src/api/fma-icontext.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_ICONTEXT_H__
-#define __FILE_MANAGER_ACTIONS_API_ICONTEXT_H__
+#ifndef __FILEMANAGER_ACTIONS_API_ICONTEXT_H__
+#define __FILEMANAGER_ACTIONS_API_ICONTEXT_H__
/**
* SECTION: icontext
* @title: FMAIContext
* @short_description: The Contextual Interface
- * @include: file-manager-actions/fma-icontext.h
+ * @include: filemanager-actions/fma-icontext.h
*
* This interface is implemented by all #FMAObject -derived objects
* whose the display in the Nautilus context menu is subject to some
@@ -109,4 +109,4 @@ void fma_icontext_replace_folder ( FMAIContext *context, const gchar *old,
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_ICONTEXT_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_ICONTEXT_H__ */
diff --git a/src/api/fma-iduplicable.h b/src/api/fma-iduplicable.h
index 1832f00..9897a1f 100644
--- a/src/api/fma-iduplicable.h
+++ b/src/api/fma-iduplicable.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_IDUPLICABLE_H__
-#define __FILE_MANAGER_ACTIONS_API_IDUPLICABLE_H__
+#ifndef __FILEMANAGER_ACTIONS_API_IDUPLICABLE_H__
+#define __FILEMANAGER_ACTIONS_API_IDUPLICABLE_H__
/**
* SECTION: iduplicable
* @title: FMAIDuplicable
* @short_description: The Duplication Interface
- * @include: file-manager-actions/private/fma-iduplicable.h
+ * @include: filemanager-actions/private/fma-iduplicable.h
*
* This interface is implemented by #FMAObject in order to let
* #FMAObject -derived instance duplication be easily tracked. This works
@@ -225,4 +225,4 @@ void fma_iduplicable_set_modified( FMAIDuplicable *object, gboolean m
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_IDUPLICABLE_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_IDUPLICABLE_H__ */
diff --git a/src/api/fma-iexporter.h b/src/api/fma-iexporter.h
index 4aef4af..f4996f1 100644
--- a/src/api/fma-iexporter.h
+++ b/src/api/fma-iexporter.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_IEXPORTER_H__
-#define __FILE_MANAGER_ACTIONS_API_IEXPORTER_H__
+#ifndef __FILEMANAGER_ACTIONS_API_IEXPORTER_H__
+#define __FILEMANAGER_ACTIONS_API_IEXPORTER_H__
/**
* SECTION: iexporter
* @title: FMAIExporter
* @short_description: The Export Interface
- * @include: file-manager-actions/fma-iexporter.h
+ * @include: filemanager-actions/fma-iexporter.h
*
* The #FMAIExporter interface exports items to the outside world. Each
* implementation may provide one or more formats.
@@ -49,7 +49,7 @@
* In order to avoid any collision, this export format identifier is
* allocated by the &prodname; maintainers team. If you wish provide
* yourself a new export format, and so need a new export format identifier,
- * please contact the maintainers (see file-manager-actions.doap at the
+ * please contact the maintainers (see filemanager-actions.doap at the
* root of the source tree).
* </para>
* <para>
@@ -447,7 +447,7 @@ typedef struct {
* To avoid any collision, the format identifier is allocated by the
* FileManager-Actions maintainers team. If you wish develop a new export
* format, and so need a new format identifier, please contact the
- * maintainers (see file-manager-actions.doap).
+ * maintainers (see filemanager-actions.doap).
*
* Return value:
* - Interface v1:
@@ -539,4 +539,4 @@ GType fma_iexporter_get_type( void );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_IEXPORTER_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_IEXPORTER_H__ */
diff --git a/src/api/fma-ifactory-object-data.h b/src/api/fma-ifactory-object-data.h
index cbb659c..8d187ec 100644
--- a/src/api/fma-ifactory-object-data.h
+++ b/src/api/fma-ifactory-object-data.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__
-#define __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__
+#ifndef __FILEMANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__
+#define __FILEMANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__
/**
* SECTION: data-name
* @title: Constants
* @short_description: The Data Factory Constant Definitions
- * @include: file-manager-actions/fma-ifactory-object-data.h
+ * @include: filemanager-actions/fma-ifactory-object-data.h
*
* Each elementary data get its own name here.
*
@@ -153,4 +153,4 @@ G_BEGIN_DECLS
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_IFACTORY_OBJECT_DATA_H__ */
diff --git a/src/api/fma-ifactory-object.h b/src/api/fma-ifactory-object.h
index 0f5c9e7..cbaa298 100644
--- a/src/api/fma-ifactory-object.h
+++ b/src/api/fma-ifactory-object.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_H__
-#define __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_H__
+#ifndef __FILEMANAGER_ACTIONS_API_IFACTORY_OBJECT_H__
+#define __FILEMANAGER_ACTIONS_API_IFACTORY_OBJECT_H__
/**
* SECTION: ifactory-object
* @title: FMAIFactoryObject
* @short_description: The #FMAObjectItem Interface v 1
- * @include: file-manager-actions/na-ifactory_object.h
+ * @include: filemanager-actions/na-ifactory_object.h
*
* This interface is implemented by #FMAObjectItem derived objects so that they
* can take advantage of our data factory management system.
@@ -245,4 +245,4 @@ void fma_ifactory_object_set_from_void ( FMAIFactoryObject *object, co
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_IFACTORY_OBJECT_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_IFACTORY_OBJECT_H__ */
diff --git a/src/api/fma-ifactory-provider-provider.h b/src/api/fma-ifactory-provider-provider.h
index cb031da..1d2ff62 100644
--- a/src/api/fma-ifactory-provider-provider.h
+++ b/src/api/fma-ifactory-provider-provider.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_IFACTORY_PROVIDER_PROVIDER_H__
-#define __FILE_MANAGER_ACTIONS_API_IFACTORY_PROVIDER_PROVIDER_H__
+#ifndef __FILEMANAGER_ACTIONS_API_IFACTORY_PROVIDER_PROVIDER_H__
+#define __FILEMANAGER_ACTIONS_API_IFACTORY_PROVIDER_PROVIDER_H__
#include <glib.h>
@@ -38,4 +38,4 @@ typedef struct _FMAIFactoryProvider FMAIFactoryProvider;
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_IFACTORY_PROVIDER_PROVIDER_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_IFACTORY_PROVIDER_PROVIDER_H__ */
diff --git a/src/api/fma-ifactory-provider.h b/src/api/fma-ifactory-provider.h
index 7320405..aa258b6 100644
--- a/src/api/fma-ifactory-provider.h
+++ b/src/api/fma-ifactory-provider.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_IFACTORY_PROVIDER_H__
-#define __FILE_MANAGER_ACTIONS_API_IFACTORY_PROVIDER_H__
+#ifndef __FILEMANAGER_ACTIONS_API_IFACTORY_PROVIDER_H__
+#define __FILEMANAGER_ACTIONS_API_IFACTORY_PROVIDER_H__
/**
* SECTION: ifactory-provider
* @title: FMAIFactoryProvider
* @short_description: The Data Factory Provider Interface v 1
- * @include: file-manager-actions/na-ifactory_provider.h
+ * @include: filemanager-actions/na-ifactory_provider.h
*
* &prodname; has to deal with a relatively great number of elementary datas,
* reading them from different supports, storing and displaying them,
@@ -289,4 +289,4 @@ guint fma_ifactory_provider_write_item( const FMAIFactoryProvider *writer, void
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_IFACTORY_PROVIDER_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_IFACTORY_PROVIDER_H__ */
diff --git a/src/api/fma-iimporter.h b/src/api/fma-iimporter.h
index f696a76..ba6997a 100644
--- a/src/api/fma-iimporter.h
+++ b/src/api/fma-iimporter.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_IIMPORTER_H__
-#define __FILE_MANAGER_ACTIONS_API_IIMPORTER_H__
+#ifndef __FILEMANAGER_ACTIONS_API_IIMPORTER_H__
+#define __FILEMANAGER_ACTIONS_API_IIMPORTER_H__
/**
* SECTION: iimporter
* @title: FMAIImporter
* @short_description: The Import Interface
- * @include: file-manager-actions/fma-iimporter.h
+ * @include: filemanager-actions/fma-iimporter.h
*
* The #FMAIImporter interface imports items from the outside world
* into &prodname; repository (see #FMAIIOProvider interface for how
@@ -351,7 +351,7 @@ typedef struct {
* @IMPORTER_CODE_OK: import ok.
* @IMPORTER_CODE_PROGRAM_ERROR: a program error has been detected.
* You should open a bug in
- * <ulink
url="https://bugzilla.gnome.org/enter_bug.cgi?product=file-manager-actions";>Bugzilla</ulink>.
+ * <ulink
url="https://bugzilla.gnome.org/enter_bug.cgi?product=filemanager-actions";>Bugzilla</ulink>.
* @IMPORTER_CODE_NOT_WILLING_TO: the plugin is not willing to import the uri.
* @IMPORTER_CODE_NO_ITEM_ID: item id not found.
* @IMPORTER_CODE_NO_ITEM_TYPE: item type not found.
@@ -411,4 +411,4 @@ guint fma_iimporter_import_from_uri( const FMAIImporter *importer, FMAIImporterI
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_IIMPORTER_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_IIMPORTER_H__ */
diff --git a/src/api/fma-iio-provider.h b/src/api/fma-iio-provider.h
index 92a1c82..84e9dea 100644
--- a/src/api/fma-iio-provider.h
+++ b/src/api/fma-iio-provider.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_IIO_PROVIDER_H__
-#define __FILE_MANAGER_ACTIONS_API_IIO_PROVIDER_H__
+#ifndef __FILEMANAGER_ACTIONS_API_IIO_PROVIDER_H__
+#define __FILEMANAGER_ACTIONS_API_IIO_PROVIDER_H__
/**
* SECTION: iio-provider
* @title: FMAIIOProvider
* @short_description: The I/O Provider Interface
- * @include: file-manager-actions/fma-iio-provider.h
+ * @include: filemanager-actions/fma-iio-provider.h
*
* The #FMAIIOProvider interface is defined in order to let both &prodname;
* internal and user-provided external plugins provide read and write accesses
@@ -47,7 +47,7 @@
* &prodname; is bundled with several I/O providers.
* Since version 3, the <literal>na-desktop</literal> I/O provider, which
* implements the
- * <ulink role="online-location" url="http://www.file-manager-actions.org/?q=node/377/";>DES-EMA</ulink>
+ * <ulink role="online-location" url="http://www.filemanager-actions.org/?q=node/377/";>DES-EMA</ulink>
* specification, is the preferred way of storing (and sharing) items.
*
* The #FMAIIOProvider interface provides three types of services:
@@ -114,7 +114,7 @@
* In order to avoid any collision, this I/O provider identifier is
* allocated by the &prodname; maintainers team. If you wish develop
* yourself a new I/O provider, and so need a new provider identifier,
- * please contact the maintainers (see file-manager-actions.doap at the
+ * please contact the maintainers (see filemanager-actions.doap at the
* root of the source tree).
* </para>
* <para>
@@ -474,7 +474,7 @@ typedef enum {
* @FMA_IIO_PROVIDER_CODE_OK: the requested operation has been successful.
* @FMA_IIO_PROVIDER_CODE_PROGRAM_ERROR: a program error has been detected;
* you should open a bug in
- * <ulink
url="https://bugzilla.gnome.org/enter_bug.cgi?product=file-manager-actions";>Bugzilla</ulink>.
+ * <ulink
url="https://bugzilla.gnome.org/enter_bug.cgi?product=filemanager-actions";>Bugzilla</ulink>.
* @FMA_IIO_PROVIDER_CODE_NOT_WILLING_TO_RUN: the provider is not willing
* to do the requested action.
* @FMA_IIO_PROVIDER_CODE_WRITE_ERROR: a write error has been detected.
@@ -501,4 +501,4 @@ void fma_iio_provider_item_changed( const FMAIIOProvider *instance );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_IIO_PROVIDER_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_IIO_PROVIDER_H__ */
diff --git a/src/api/fma-object-action.h b/src/api/fma-object-action.h
index 98d26e0..a7cb317 100644
--- a/src/api/fma-object-action.h
+++ b/src/api/fma-object-action.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_OBJECT_ACTION_H__
-#define __FILE_MANAGER_ACTIONS_API_OBJECT_ACTION_H__
+#ifndef __FILEMANAGER_ACTIONS_API_OBJECT_ACTION_H__
+#define __FILEMANAGER_ACTIONS_API_OBJECT_ACTION_H__
/**
* SECTION: object-action
* @title: FMAObjectAction
* @short_description: The Action Class Definition
- * @include: file-manager-actions/fma-object-action.h
+ * @include: filemanager-actions/fma-object-action.h
*
* This is the class which maintains data and properties of a &prodname;
* action.
@@ -95,4 +95,4 @@ void fma_object_action_set_last_version ( FMAObjectAction *action
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_OBJECT_ACTION_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_OBJECT_ACTION_H__ */
diff --git a/src/api/fma-object-api.h b/src/api/fma-object-api.h
index a4d260e..9b97dac 100644
--- a/src/api/fma-object-api.h
+++ b/src/api/fma-object-api.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_OBJECT_API_H__
-#define __FILE_MANAGER_ACTIONS_API_OBJECT_API_H__
+#ifndef __FILEMANAGER_ACTIONS_API_OBJECT_API_H__
+#define __FILEMANAGER_ACTIONS_API_OBJECT_API_H__
/**
* SECTION: object-api
* @title: API
* @short_description: The Common Public #FMAObject API
- * @include: file-manager-actions/fma-object-api.h
+ * @include: filemanager-actions/fma-object-api.h
*
* We define here a common API which makes easier to write (and read)
* the code; all object functions are named fma_object; all arguments
@@ -218,4 +218,4 @@ G_BEGIN_DECLS
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_OBJECT_API_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_OBJECT_API_H__ */
diff --git a/src/api/fma-object-id.h b/src/api/fma-object-id.h
index 955a9f2..a0558c3 100644
--- a/src/api/fma-object-id.h
+++ b/src/api/fma-object-id.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_OBJECT_ID_H__
-#define __FILE_MANAGER_ACTIONS_API_OBJECT_ID_H__
+#ifndef __FILEMANAGER_ACTIONS_API_OBJECT_ID_H__
+#define __FILEMANAGER_ACTIONS_API_OBJECT_ID_H__
/**
* SECTION: object-id
* @title: FMAObjectId
* @short_description: The Identified Object Base Class Definition
- * @include: file-manager-actions/fma-object-id.h
+ * @include: filemanager-actions/fma-object-id.h
*
* This is a pure virtual class, i.e. not an instantiatable one.
* It serves as the base class for #FMAObject -derived object which have
@@ -108,4 +108,4 @@ void fma_object_id_set_new_id ( FMAObjectId *object, const FMAObjectId *
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_OBJECT_ID_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_OBJECT_ID_H__ */
diff --git a/src/api/fma-object-item.h b/src/api/fma-object-item.h
index dc37e77..627851a 100644
--- a/src/api/fma-object-item.h
+++ b/src/api/fma-object-item.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_OBJECT_ITEM_H__
-#define __FILE_MANAGER_ACTIONS_API_OBJECT_ITEM_H__
+#ifndef __FILEMANAGER_ACTIONS_API_OBJECT_ITEM_H__
+#define __FILEMANAGER_ACTIONS_API_OBJECT_ITEM_H__
/**
* SECTION: object-item
* @title: FMAObjectItem
* @short_description: The Object Item Base Class Definition
- * @include: file-manager-actions/fma-object-item.h
+ * @include: filemanager-actions/fma-object-item.h
*
* This is a pure virtual class, i.e. not an instantiatable one, but
* serves as the base class for #FMAObjectAction and #FMAObjectMenu.
@@ -112,4 +112,4 @@ void fma_object_item_set_writability_status( FMAObjectItem *item, gboole
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_OBJECT_ITEM_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_OBJECT_ITEM_H__ */
diff --git a/src/api/fma-object-menu.h b/src/api/fma-object-menu.h
index 9c1a6f6..383d256 100644
--- a/src/api/fma-object-menu.h
+++ b/src/api/fma-object-menu.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_OBJECT_MENU_H__
-#define __FILE_MANAGER_ACTIONS_API_OBJECT_MENU_H__
+#ifndef __FILEMANAGER_ACTIONS_API_OBJECT_MENU_H__
+#define __FILEMANAGER_ACTIONS_API_OBJECT_MENU_H__
/**
* SECTION: object-menu
* @title: FMAObjectMenu
* @short_description: The Menu Class Definition
- * @include: file-manager-actions/fma-object-menu.h
+ * @include: filemanager-actions/fma-object-menu.h
*/
#include "fma-object-item.h"
@@ -73,4 +73,4 @@ FMAObjectMenu *fma_object_menu_new_with_defaults( void );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_OBJECT_MENU_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_OBJECT_MENU_H__ */
diff --git a/src/api/fma-object-profile.h b/src/api/fma-object-profile.h
index 87dda38..56e3be1 100644
--- a/src/api/fma-object-profile.h
+++ b/src/api/fma-object-profile.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_OBJECT_PROFILE_H__
-#define __FILE_MANAGER_ACTIONS_API_OBJECT_PROFILE_H__
+#ifndef __FILEMANAGER_ACTIONS_API_OBJECT_PROFILE_H__
+#define __FILEMANAGER_ACTIONS_API_OBJECT_PROFILE_H__
/**
* SECTION: object-profile
* @title: FMAObjectProfile
* @short_description: The Action Profile Class Definition
- * @include: file-manager-actions/fma-object-item.h
+ * @include: filemanager-actions/fma-object-item.h
*/
#include "fma-object-id.h"
@@ -82,4 +82,4 @@ void fma_object_profile_convert_v2_to_last( FMAObjectProfile *profi
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_OBJECT_PROFILE_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_OBJECT_PROFILE_H__ */
diff --git a/src/api/fma-object.h b/src/api/fma-object.h
index 677e6d6..f1923cf 100644
--- a/src/api/fma-object.h
+++ b/src/api/fma-object.h
@@ -27,21 +27,21 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_OBJECT_H__
-#define __FILE_MANAGER_ACTIONS_API_OBJECT_H__
+#ifndef __FILEMANAGER_ACTIONS_API_OBJECT_H__
+#define __FILEMANAGER_ACTIONS_API_OBJECT_H__
/**
* SECTION: object
* @title: FMAObject
* @short_description: The Deepest Base Class Definition
- * @include: file-manager-actions/fma-object.h
+ * @include: filemanager-actions/fma-object.h
*
* This is the base class of all our data object hierarchy. #FMAObject is
* supposed to be used as a pure virtual base class, i.e. should only be
* derived.
*
* All the API described here is rather private. External code should
- * use the API described in <filename>file-manager-actions/fma-object-api.h</filename>.
+ * use the API described in <filename>filemanager-actions/fma-object-api.h</filename>.
*/
#include <glib-object.h>
@@ -173,4 +173,4 @@ void fma_object_object_debug_invalid ( const FMAObject *object, const gc
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_OBJECT_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_OBJECT_H__ */
diff --git a/src/api/fma-timeout.h b/src/api/fma-timeout.h
index 36bc6fa..6553002 100644
--- a/src/api/fma-timeout.h
+++ b/src/api/fma-timeout.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_TIMEOUT_H__
-#define __FILE_MANAGER_ACTIONS_API_TIMEOUT_H__
+#ifndef __FILEMANAGER_ACTIONS_API_TIMEOUT_H__
+#define __FILEMANAGER_ACTIONS_API_TIMEOUT_H__
/**
* SECTION: timeout
* @title: FMATimeout
* @short_description: The FMATimeout Structure
- * @include: file-manager-actions/fma-timeout.h
+ * @include: filemanager-actions/fma-timeout.h
*
* The FMATimeout structure is a convenience structure to manage timeout
* functions.
@@ -94,4 +94,4 @@ void na_timeout_event( FMATimeout *timeout );
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_TIMEOUT_H__ */
+#endif /* __FILEMANAGER_ACTIONS_API_TIMEOUT_H__ */
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index bcc176f..35462ec 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -31,7 +31,7 @@ exportformat_datadir = $(pkgdatadir)/export-format
importmode_datadir = $(pkgdatadir)/import-mode
-icon_fname = $(datadir)/icons/hicolor/48x48/apps/file-manager-actions.png
+icon_fname = $(datadir)/icons/hicolor/48x48/apps/filemanager-actions.png
ui_datadir = $(pkgdatadir)/ui
@@ -140,14 +140,14 @@ ui_data_DATA = \
$(NULL)
exportformat_data_DATA = \
- export-format-ask.png \
+ fma-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 \
+ fma-import-mode-ask.png \
+ fma-import-mode-no-import.png \
+ fma-import-mode-override.png \
+ fma-import-mode-renumber.png \
$(NULL)
CLEANFILES = \
diff --git a/src/core/fma-about.c b/src/core/fma-about.c
index 5cd7d10..b579464 100644
--- a/src/core/fma-about.c
+++ b/src/core/fma-about.c
@@ -110,7 +110,7 @@ fma_about_display( GtkWindow *toplevel )
"program-name", application_name,
"translator-credits", _( "The GNOME Translation Project <gnome-i18n gnome org>" ),
"version", PACKAGE_VERSION,
- "website", "http://www.file-manager-actions.org";,
+ "website", "http://www.filemanager-actions.org";,
"wrap-license", TRUE,
NULL );
@@ -139,7 +139,7 @@ fma_about_get_application_name( void )
*
* This name is owned by the package, and should not be released by the caller.
*
- * cf. Makefile: PACKAGE = file-manager-actions
+ * cf. Makefile: PACKAGE = filemanager-actions
* while st_icon_filename points to full path of the icon.
*/
const gchar *
diff --git a/src/core/fma-core-utils.c b/src/core/fma-core-utils.c
index b2051f4..127af41 100644
--- a/src/core/fma-core-utils.c
+++ b/src/core/fma-core-utils.c
@@ -1208,7 +1208,7 @@ fma_core_utils_file_load_from_uri( const gchar *uri, gsize *length )
* Print a version message on the console
*
* <programlisting>
- * file-manager-actions-new (FileManager-Actions) v 2.29.1
+ * filemanager-actions-new (FileManager-Actions) v 2.29.1
* Copyright (C) 2005-2007 Frederic Ruaudel
* Copyright (C) 2009, 2010, 2011, 2012 Pierre Wieser
* FileManager-Actions is free software, licensed under GPLv2 or later.
diff --git a/src/core/fma-exporter.c b/src/core/fma-exporter.c
index d86c71e..10c7df5 100644
--- a/src/core/fma-exporter.c
+++ b/src/core/fma-exporter.c
@@ -53,7 +53,7 @@ static NAExporterFormatStr st_format_ask = {
N_( "_Ask me" ),
N_( "You will be asked for the format to choose each time an item " \
"is about to be exported." ),
- "export-format-ask.png"
+ "fma-export-format-ask.png"
};
/* i18n: FMAIExporter is an interface name, do not even try to translate */
diff --git a/src/core/fma-importer.c b/src/core/fma-importer.c
index cb7a1cc..0a35ab4 100644
--- a/src/core/fma-importer.c
+++ b/src/core/fma-importer.c
@@ -59,7 +59,7 @@ static FMAImportModeStr st_import_modes[] = {
N_( "This used to be the historical behavior.\n" \
"The selected file will be marked as \"NOT OK\" in the Summary page.\n" \
"The existing item will not be modified." ),
- "import-mode-no-import.png" },
+ "fma-import-mode-no-import.png" },
{ IMPORTER_MODE_RENUMBER,
"Renumber",
@@ -67,7 +67,7 @@ static FMAImportModeStr st_import_modes[] = {
N_( "The selected file will be imported with a slightly modified label " \
"indicating the renumbering.\n" \
"The existing item will not be modified." ),
- "import-mode-renumber.png" },
+ "fma-import-mode-renumber.png" },
{ IMPORTER_MODE_OVERRIDE,
"Override",
@@ -75,7 +75,7 @@ static FMAImportModeStr st_import_modes[] = {
N_( "The item found in the selected file will silently override the " \
"current one which has the same identifier.\n" \
"Be warned: this mode may be dangerous. You will not be prompted another
time." ),
- "import-mode-override.png" },
+ "fma-import-mode-override.png" },
{ 0 }
};
@@ -86,7 +86,7 @@ static FMAImportModeStr st_import_ask_mode = {
"Ask",
N_( "_Ask me" ),
N_( "You will be asked each time an imported ID already exists." ),
- "import-mode-ask.png"
+ "fma-import-mode-ask.png"
};
static FMAImporterResult *import_from_uri( const FMAPivot *pivot, GList *modules, const gchar *uri );
diff --git a/src/core/fma-io-provider.c b/src/core/fma-io-provider.c
index dd77c47..82d438c 100644
--- a/src/core/fma-io-provider.c
+++ b/src/core/fma-io-provider.c
@@ -67,7 +67,7 @@ enum {
#define IO_PROVIDER_PROP_ID "fma-io-provider-prop-id"
static const gchar *st_enter_bug = N_( "Please, be kind enough to fill out a bug report on "
-
"https://bugzilla.gnome.org/enter_bug.cgi?product=file-manager-actions."; );
+
"https://bugzilla.gnome.org/enter_bug.cgi?product=filemanager-actions."; );
static GObjectClass *st_parent_class = NULL;
static GList *st_io_providers = NULL;
diff --git a/src/core/fma-settings.h b/src/core/fma-settings.h
index 7b5dd6f..e0c2e04 100644
--- a/src/core/fma-settings.h
+++ b/src/core/fma-settings.h
@@ -42,8 +42,8 @@
* - a per-user configuration.
*
* The configuration is implemented as keyed files:
- * - global configuration is sysconfdir/xdg/file-manager-actions/nautilus-actions.conf
- * - per-user configuration is HOME/.config/file-manager-actions/nautilus-actions.conf
+ * - global configuration is sysconfdir/xdg/filemanager-actions/nautilus-actions.conf
+ * - per-user configuration is HOME/.config/filemanager-actions/nautilus-actions.conf
*
* Each setting may so have its own read-only attribute, whether it
* has been read from the global configuration or from the
diff --git a/src/core/fma-tokens.h b/src/core/fma-tokens.h
index 32e3868..8169990 100644
--- a/src/core/fma-tokens.h
+++ b/src/core/fma-tokens.h
@@ -50,7 +50,7 @@
* - doc/nact/C/nact-execution.xml "Multiple execution" paragraph
* - src/core/fma-tokens.c::is_singular_exec() function
* - src/core/fma-tokens.c::parse_singular() function
- * - src/nact/file-manager-actions-config-tool.ui:LegendDialog labels
+ * - src/nact/filemanager-actions-config-tool.ui:LegendDialog labels
* - src/core/fma-object-profile-factory.c:FMAFO_DATA_PARAMETERS comment
*
* Valid parameters are :
diff --git a/src/io-desktop/nadp-formats.c b/src/io-desktop/nadp-formats.c
index ca8c3c0..396a375 100644
--- a/src/io-desktop/nadp-formats.c
+++ b/src/io-desktop/nadp-formats.c
@@ -50,7 +50,7 @@ typedef struct {
static NadpExportFormat nadp_formats[] = {
/* DESKTOP_V1: the initial desktop format as described in
- * http://www.file-manager-actions.org/?q=node/377
+ * http://www.filemanager-actions.org/?q=node/377
*/
{ NADP_FORMAT_DESKTOP_V1,
N_( "Export as a ._desktop file" ),
diff --git a/src/io-gconf/nagp-keys.h b/src/io-gconf/nagp-keys.h
index b3d2113..81f79ce 100644
--- a/src/io-gconf/nagp-keys.h
+++ b/src/io-gconf/nagp-keys.h
@@ -30,8 +30,8 @@
#ifndef __NAGP_GCONF_PROVIDER_KEYS_H__
#define __NAGP_GCONF_PROVIDER_KEYS_H__
-#define NAGP_CONFIGURATIONS_PATH "/apps/file-manager-actions/configurations"
-#define NAGP_SCHEMAS_PATH "/schemas/apps/file-manager-actions/configurations"
+#define NAGP_CONFIGURATIONS_PATH "/apps/filemanager-actions/configurations"
+#define NAGP_SCHEMAS_PATH "/schemas/apps/filemanager-actions/configurations"
#define NAGP_ENTRY_TYPE "type"
#define NAGP_VALUE_TYPE_MENU "Menu"
diff --git a/src/io-gconf/nagp-writer.c b/src/io-gconf/nagp-writer.c
index befc3c7..9a27ae8 100644
--- a/src/io-gconf/nagp-writer.c
+++ b/src/io-gconf/nagp-writer.c
@@ -79,7 +79,7 @@ nagp_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
{
#ifdef NA_ENABLE_DEPRECATED
static const gchar *thisfn = "nagp_iio_provider_is_able_to_write";
- static const gchar *path = "/apps/file-manager-actions/foo";
+ static const gchar *path = "/apps/filemanager-actions/foo";
NagpGConfProvider *self;
gboolean able_to = FALSE;
diff --git a/src/io-xml/naxml-writer.c b/src/io-xml/naxml-writer.c
index 7a38258..a494d7a 100644
--- a/src/io-xml/naxml-writer.c
+++ b/src/io-xml/naxml-writer.c
@@ -537,8 +537,8 @@ write_type_schema_v1( NAXMLWriter *writer, const FMAObjectItem *object, const FM
/*
* <schema>
- * <key>/schemas/apps/file-manager-actions/configurations/entry</key>
- * <applyto>/apps/file-manager-actions/configurations/item_id/profile_id/entry</applyto>
+ * <key>/schemas/apps/filemanager-actions/configurations/entry</key>
+ * <applyto>/apps/filemanager-actions/configurations/item_id/profile_id/entry</applyto>
*/
static void
write_data_schema_v2( NAXMLWriter *writer, const FMAObjectId *object, const FMADataBoxed *boxed, const
FMADataDef *def )
@@ -585,8 +585,8 @@ write_data_schema_v2( NAXMLWriter *writer, const FMAObjectId *object, const FMAD
/*
* <schema>
- * <key>/schemas/apps/file-manager-actions/configurations/entry</key>
- * <applyto>/apps/file-manager-actions/configurations/item_id/profile_id/entry</applyto>
+ * <key>/schemas/apps/filemanager-actions/configurations/entry</key>
+ * <applyto>/apps/filemanager-actions/configurations/item_id/profile_id/entry</applyto>
*/
static void
write_data_schema_v2_element( NAXMLWriter *writer, const FMADataDef *def, const gchar *object_id, const
gchar *value_str )
@@ -624,8 +624,8 @@ write_data_schema_v2_element( NAXMLWriter *writer, const FMADataDef *def, const
/*
* <schema>
- * <key>/schemas/apps/file-manager-actions/configurations/entry</key>
- * <applyto>/apps/file-manager-actions/configurations/item_id/profile_id/entry</applyto>
+ * <key>/schemas/apps/filemanager-actions/configurations/entry</key>
+ * <applyto>/apps/filemanager-actions/configurations/item_id/profile_id/entry</applyto>
*/
static void
write_type_schema_v2( NAXMLWriter *writer, const FMAObjectItem *object, const FMADataDef *def, const gchar
*value )
diff --git a/src/nact/.gitignore b/src/nact/.gitignore
index 601e8db..165558b 100644
--- a/src/nact/.gitignore
+++ b/src/nact/.gitignore
@@ -1,5 +1,5 @@
base-marshal.c
base-marshal.h
nact.desktop
-file-manager-actions-config
-file-manager-actions-config-tool
+filemanager-actions-config
+filemanager-actions-config-tool
diff --git a/src/nact/nact-application.c b/src/nact/nact-application.c
index 5521b6b..615de75 100644
--- a/src/nact/nact-application.c
+++ b/src/nact/nact-application.c
@@ -60,7 +60,7 @@ struct _NactApplicationPrivate {
static const gchar *st_application_name = N_( "FileManager-Actions Configuration Tool" );
static const gchar *st_description = N_( "A user interface to edit your own contextual actions"
);
-static const gchar *st_application_id = "org.gnome.file-manager-actions.ConfigurationTool";
+static const gchar *st_application_id = "org.gnome.filemanager-actions.ConfigurationTool";
static gboolean st_non_unique_opt = FALSE;
static gboolean st_version_opt = FALSE;
diff --git a/src/nact/nact-application.h b/src/nact/nact-application.h
index 10e7cf4..9aa1af2 100644
--- a/src/nact/nact-application.h
+++ b/src/nact/nact-application.h
@@ -35,7 +35,7 @@
* @short_description: #NactApplication class definition.
* @include: nact/nact-application.h
*
- * This is the main class for file-manager-actions-config-tool program.
+ * This is the main class for filemanager-actions-config-tool program.
*
* The #NactApplication object is instanciated from main() function,
* then later #g_object_unref() after nact_application_run() has
diff --git a/src/nact/nact-assistant-export.h b/src/nact/nact-assistant-export.h
index 819079e..222ed6f 100644
--- a/src/nact/nact-assistant-export.h
+++ b/src/nact/nact-assistant-export.h
@@ -41,7 +41,7 @@
* are actually full GConf schema exports of the form :
* <schemalist>
* <schema>
- * <key>/schemas/apps/file-manager-actions/..../uuid/label</key>
+ * <key>/schemas/apps/filemanager-actions/..../uuid/label</key>
* <applyto>/apps/..../label</applyto>
*
* I don't know why Frederic had chosen to export as schema. But this
diff --git a/src/nact/nact-confirm-logout.ui b/src/nact/nact-confirm-logout.ui
index cdf0cc8..99df47b 100644
--- a/src/nact/nact-confirm-logout.ui
+++ b/src/nact/nact-confirm-logout.ui
@@ -17,7 +17,7 @@
<property name="border_width">5</property>
<property name="title" translatable="yes">End of session</property>
<property name="modal">True</property>
- <property name="icon_name">file-manager-actions</property>
+ <property name="icon_name">filemanager-actions</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
diff --git a/src/nact/nact-menu.c b/src/nact/nact-menu.c
index 0edec67..0af762a 100644
--- a/src/nact/nact-menu.c
+++ b/src/nact/nact-menu.c
@@ -48,7 +48,7 @@
#include "nact-preferences-editor.h"
#include "nact-tree-view.h"
-static const gchar *st_uixml_actions = PKGUIDIR "/file-manager-actions-config-tool.actions";
+static const gchar *st_uixml_actions = PKGUIDIR "/filemanager-actions-config-tool.actions";
static const gchar *st_ui_app_menu = "app-menu";
static const gchar *st_ui_menubar = "menubar";
@@ -263,7 +263,7 @@ on_app_help( GSimpleAction *action, GVariant *parameter, gpointer user_data )
g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
error = NULL;
- gtk_show_uri( NULL, "ghelp:file-manager-actions-config-tool", GDK_CURRENT_TIME, &error );
+ gtk_show_uri( NULL, "ghelp:filemanager-actions-config-tool", GDK_CURRENT_TIME, &error );
if( error ){
g_warning( "%s: %s", thisfn, error->message );
g_error_free( error );
diff --git a/src/nact/nact-tree-model-dnd.c b/src/nact/nact-tree-model-dnd.c
index a7fe5c2..cce9de8 100644
--- a/src/nact/nact-tree-model-dnd.c
+++ b/src/nact/nact-tree-model-dnd.c
@@ -343,7 +343,7 @@ nact_tree_model_dnd_imulti_drag_source_drag_data_get( EggTreeMultiDragSource *dr
case NACT_XCHANGE_FORMAT_XDS:
/* get the dest default filename as an uri
- * e.g. file:///home/pierre/data/eclipse/file-manager-actions/trash/xds.txt
+ * e.g. file:///home/pierre/data/eclipse/filemanager-actions/trash/xds.txt
*/
folder = get_xds_atom_value( context );
dest_folder = g_path_get_dirname( folder );
@@ -1107,8 +1107,8 @@ on_drag_drop( GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint
*
* On a 32-bits system:
* get_xds_atom_value: actual_length=63, actual_length=15
- * get_xds_atom_value: ret=file:///home/pierre/data/eclipse/file-manager-actions/trash/xds.txt0x8299
- * get_xds_atom_value: dup=file:///home/pierre/data/eclipse/file-manager-actions/trash/xds.txt
+ * get_xds_atom_value: ret=file:///home/pierre/data/eclipse/filemanager-actions/trash/xds.txt0x8299
+ * get_xds_atom_value: dup=file:///home/pierre/data/eclipse/filemanager-actions/trash/xds.txt
* get_xds_atom_value: ret=file:///home/pi
*
* idem on a 64bits system.
diff --git a/src/nact/nact.desktop.in b/src/nact/nact.desktop.in
index 9c0c855..c8e4d86 100644
--- a/src/nact/nact.desktop.in
+++ b/src/nact/nact.desktop.in
@@ -3,7 +3,7 @@ Version=1.0
Type=Application
_Name=FileManager-Actions Configuration Tool
_Comment=Configure items to be added to the Nautilus context menus
-Exec=file-manager-actions-config-tool
-Icon=file-manager-actions
+Exec=filemanager-actions-config-tool
+Icon=filemanager-actions
Categories=System;FileTools;FileManager;
StartupNotify=true
diff --git a/src/plugin-menu/nautilus-actions.c b/src/plugin-menu/nautilus-actions.c
index 75dd8ed..d6670a3 100644
--- a/src/plugin-menu/nautilus-actions.c
+++ b/src/plugin-menu/nautilus-actions.c
@@ -798,7 +798,7 @@ create_item_from_profile( FMAObjectProfile *profile, guint target, GList *files,
g_object_weak_ref( G_OBJECT( item ), ( GWeakNotify ) weak_notify_profile, duplicate );
g_object_set_data_full( G_OBJECT( item ),
- "file-manager-actions-tokens",
+ "filemanager-actions-tokens",
g_object_ref( tokens ),
( GDestroyNotify ) g_object_unref );
@@ -908,7 +908,7 @@ execute_action( NautilusMenuItem *item, FMAObjectProfile *profile )
g_debug( "%s: item=%p, profile=%p", thisfn, ( void * ) item, ( void * ) profile );
- tokens = FMA_TOKENS( g_object_get_data( G_OBJECT( item ), "file-manager-actions-tokens" ));
+ tokens = FMA_TOKENS( g_object_get_data( G_OBJECT( item ), "filemanager-actions-tokens" ));
fma_tokens_execute_action( tokens, profile );
}
diff --git a/src/plugin-menu/nautilus-actions.h b/src/plugin-menu/nautilus-actions.h
index 35f7a54..a53ac89 100644
--- a/src/plugin-menu/nautilus-actions.h
+++ b/src/plugin-menu/nautilus-actions.h
@@ -31,10 +31,10 @@
#define __PLUGIN_MENU_NAUTILUS_ACTIONS_H__
/**
- * SECTION: file-manager-actions
+ * SECTION: filemanager-actions
* @title: NautilusActions
* @short_description: The NautilusActions plugin class definition
- * @include: plugin-menu/file-manager-actions.h
+ * @include: plugin-menu/filemanager-actions.h
*
* This is the class which handles the file manager menu plugin.
*/
diff --git a/src/plugin-tracker/na-tracker.c b/src/plugin-tracker/na-tracker.c
index 36fdb26..cc20672 100644
--- a/src/plugin-tracker/na-tracker.c
+++ b/src/plugin-tracker/na-tracker.c
@@ -161,7 +161,7 @@ initialize_dbus_connection( NATracker *tracker )
priv->owner_id = g_bus_own_name(
G_BUS_TYPE_SESSION,
- FILE_MANAGER_ACTIONS_DBUS_SERVICE,
+ FILEMANAGER_ACTIONS_DBUS_SERVICE,
G_BUS_NAME_OWNER_FLAGS_REPLACE,
( GBusAcquiredCallback ) on_bus_acquired,
( GBusNameAcquiredCallback ) on_name_acquired,
@@ -188,13 +188,13 @@ on_bus_acquired( GDBusConnection *connection, const gchar *name, NATracker *trac
/* create a new org.freedesktop.DBus.ObjectManager rooted at
* /org/file_manager_actions/DBus/Tracker
*/
- tracker->private->manager = g_dbus_object_manager_server_new( FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH
);
+ tracker->private->manager = g_dbus_object_manager_server_new( FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH );
/* create a new D-Bus object at the path
* /org/file_manager_actions/DBus/Tracker
* (which must be same or below than that of object manager server)
*/
- tracker_object = na_tracker_object_skeleton_new( FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
+ tracker_object = na_tracker_object_skeleton_new( FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
/* make a newly created object export the interface
* org.file_manager_actions.DBus.Tracker.Properties1
diff --git a/src/test/test-parse-uris.c b/src/test/test-parse-uris.c
index 5cc3568..1104592 100644
--- a/src/test/test-parse-uris.c
+++ b/src/test/test-parse-uris.c
@@ -41,8 +41,8 @@ static const gchar *uris[] = {
"http://robert:azerty01 mon domain com/path/to/a/document?query#anchor",
"ssh://pwi.dyndns.biz:2207",
"sftp://kde.org:1234/pub/kde";,
- "/usr/bin/file-manager-actions-config-tool",
- "file:///home/pierre/data/eclipse/file-manager-actions/AUTHORS",
+ "/usr/bin/filemanager-actions-config-tool",
+ "file:///home/pierre/data/eclipse/filemanager-actions/AUTHORS",
NULL
};
diff --git a/src/test/test-reader.c b/src/test/test-reader.c
index 61420c4..50ba8a1 100755
--- a/src/test/test-reader.c
+++ b/src/test/test-reader.c
@@ -120,7 +120,7 @@ init_options( void )
description = g_strdup_printf( "%s.\n%s", PACKAGE_STRING,
_( "Bug reports are welcomed at http://bugzilla.gnome.org,";
- " or you may prefer to mail to <maintainer file-manager-actions org>.\n" ));
+ " or you may prefer to mail to <maintainer filemanager-actions org>.\n" ));
g_option_context_set_description( context, description );
diff --git a/src/utils/.gitignore b/src/utils/.gitignore
index 8774447..2442f0f 100644
--- a/src/utils/.gitignore
+++ b/src/utils/.gitignore
@@ -1,7 +1,7 @@
-file-manager-actions-new
-file-manager-actions-print
-file-manager-actions-run
-file-manager-actions-run-bindings.h
+filemanager-actions-new
+filemanager-actions-print
+filemanager-actions-run
+filemanager-actions-run-bindings.h
na-delete-xmltree
fma-gconf2key.sh
na-print-schemas
diff --git a/src/utils/console-utils.c b/src/utils/console-utils.c
index a9e5c0f..b65793c 100644
--- a/src/utils/console-utils.c
+++ b/src/utils/console-utils.c
@@ -50,8 +50,8 @@ static GLogFunc st_default_log_func = NULL;
gchar *
console_cmdline_get_description( void ){
return( g_strdup_printf( "%s.\n%s", PACKAGE_STRING,
- _( "Bug reports are welcomed at
https://bugzilla.gnome.org/enter_bug.cgi?product=file-manager-actions,\n";
- "or you may prefer to mail to <maintainer file-manager-actions org>.\n" )));
+ _( "Bug reports are welcomed at
https://bugzilla.gnome.org/enter_bug.cgi?product=filemanager-actions,\n";
+ "or you may prefer to mail to <maintainer filemanager-actions org>.\n" )));
}
/**
diff --git a/src/utils/na-gconf2key.sh.in b/src/utils/na-gconf2key.sh.in
index 0fb86b7..6ee199f 100644
--- a/src/utils/na-gconf2key.sh.in
+++ b/src/utils/na-gconf2key.sh.in
@@ -224,7 +224,7 @@ na_mandatory="${na_package}/mandatory"
na_providers="${na_package}/io-providers"
# read an item from GConf, printing as .desktop on stdout
-na_print_program="@bindir@/file-manager-actions-print"
+na_print_program="@bindir@/filemanager-actions-print"
# loop over command line arguments
pos=0
@@ -450,7 +450,7 @@ if [ "${opt_admin}" = "no" ]; then
let nbitems+=1
[ "${opt_verbose}" = "yes" ] && msg "item=${id}"
if [ ! -e ${opt_dir}/${id}.desktop -o "${opt_force}" = "yes" ]; then
- command "${na_print_program} --id ${id} | grep -v 'file-manager-actions-print' >
${opt_dir}/${id}.desktop"
+ command "${na_print_program} --id ${id} | grep -v 'filemanager-actions-print' >
${opt_dir}/${id}.desktop"
let new+=1
else
# the item has most probably already been migrated
@@ -458,7 +458,7 @@ if [ "${opt_admin}" = "no" ]; then
# else create a copy with a new id
msgwarn "${opt_dir}/${id}.desktop already exists"
tmpfile=$(mktemp)
- command "${na_print_program} --id ${id} | grep -v 'file-manager-actions-print' >
${tmpfile}"
+ command "${na_print_program} --id ${id} | grep -v 'filemanager-actions-print' >
${tmpfile}"
diff -qB ${tmpfile} ${opt_dir}/${id}.desktop 1>/dev/null 2>&1
if [ $? -eq 0 ]; then
msg "${opt_dir}/${id}.desktop has no modification, just ignoring it"
@@ -478,8 +478,8 @@ if [ "${opt_admin}" = "no" ]; then
fi
# we are using this same script to migrate preferences to .conf files
-# mandatory preferences go to SYSCONFDIR/xdg/file-manager-actions/nautilus-actions.conf
-# while user preferences go to HOME/.config/file-manager-actions/nautilus-actions.conf
+# mandatory preferences go to SYSCONFDIR/xdg/filemanager-actions/nautilus-actions.conf
+# while user preferences go to HOME/.config/filemanager-actions/nautilus-actions.conf
# Note also that the GConf I/O provider will be disabled for writings
# after this migration
destdir=${conf_dir}/@PACKAGE@
@@ -596,7 +596,7 @@ if [ "${opt_admin}" = "no" ]; then
;;
iprefs-level-zero)
# for now, keep the level zero order as a runtime preference
- # in file-manager-actions.conf
+ # in filemanager-actions.conf
#create_first_level "${value}"
add_pref "runtime" "items-level-zero-order" list "${value}"
;;
@@ -638,8 +638,8 @@ if [ "${opt_admin}" = "no" ]; then
fi
# migrate mandatory keys
-# /apps/file-manager-actions/mandatory/all/locked -> [runtime]
-# /apps/file-manager-actions/mandatory/<provider_id>/locked -> [io-provider <provider_id>]
+# /apps/filemanager-actions/mandatory/all/locked -> [runtime]
+# /apps/filemanager-actions/mandatory/<provider_id>/locked -> [io-provider <provider_id>]
if [ "${opt_admin}" = "yes" ]; then
for dir in $(gconftool-2 --all-dirs ${na_mandatory}); do
bdir=${dir##*/}
diff --git a/src/utils/nautilus-actions-print.c b/src/utils/nautilus-actions-print.c
index a11a4b6..2ad036f 100644
--- a/src/utils/nautilus-actions-print.c
+++ b/src/utils/nautilus-actions-print.c
@@ -51,7 +51,7 @@ static gchar *id = "";
static gchar *format = "";
static gboolean version = FALSE;
-/* i18n: file-manager-actions-print program summary */
+/* i18n: filemanager-actions-print program summary */
static const gchar *program_summary = N_( "Print a menu or an action to stdout." );
static GOptionEntry entries[] = {
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index 5c2c1cd..3e613cf 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -279,8 +279,8 @@ targets_from_selection( void )
manager = na_tracker_object_manager_client_new_for_bus_sync(
G_BUS_TYPE_SESSION,
G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
- FILE_MANAGER_ACTIONS_DBUS_SERVICE,
- FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH,
+ FILEMANAGER_ACTIONS_DBUS_SERVICE,
+ FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH,
NULL,
&error );
@@ -294,16 +294,16 @@ targets_from_selection( void )
g_debug( "%s: name_owner=%s", thisfn, name_owner );
g_free( name_owner );
- object = g_dbus_object_manager_get_object( manager, FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
+ object = g_dbus_object_manager_get_object( manager, FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
if( !object ){
- g_printerr( "%s: unable to get object at %s path\n", thisfn,
FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
+ g_printerr( "%s: unable to get object at %s path\n", thisfn,
FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
g_object_unref( manager );
return( NULL );
}
- iface = g_dbus_object_get_interface( object, FILE_MANAGER_ACTIONS_DBUS_TRACKER_IFACE );
+ iface = g_dbus_object_get_interface( object, FILEMANAGER_ACTIONS_DBUS_TRACKER_IFACE );
if( !iface ){
- g_printerr( "%s: unable to get %s interface\n", thisfn,
FILE_MANAGER_ACTIONS_DBUS_TRACKER_IFACE );
+ g_printerr( "%s: unable to get %s interface\n", thisfn,
FILEMANAGER_ACTIONS_DBUS_TRACKER_IFACE );
g_object_unref( object );
g_object_unref( manager );
return( NULL );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
