[nautilus-actions/file-manager-actions] Get rid of 'nact' mentions
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] Get rid of 'nact' mentions
- Date: Wed, 15 Feb 2017 15:40:44 +0000 (UTC)
commit 8e9fec28a08e5bc9ad4d4b3ddc3556b11fce3f28
Author: Pierre Wieser <pwieser trychlos org>
Date: Wed Feb 15 12:11:42 2017 +0100
Get rid of 'nact' mentions
src/core/fma-importer-ask.c | 2 +-
src/core/fma-tokens.h | 6 +-
src/ui/.gitignore | 3 -
src/ui/fma-assistant-export.c | 2 +-
src/ui/fma-icommand-tab.c | 2 +-
src/ui/fma-tree-ieditable.c | 2 +-
src/ui/fma-tree-ieditable.h | 2 +-
src/utils/fma-gconf2key.sh.in | 94 ++++++++++++++++++++--------------------
8 files changed, 55 insertions(+), 58 deletions(-)
---
diff --git a/src/core/fma-importer-ask.c b/src/core/fma-importer-ask.c
index 2f6d58e..78345e0 100644
--- a/src/core/fma-importer-ask.c
+++ b/src/core/fma-importer-ask.c
@@ -144,7 +144,7 @@ class_init( FMAImporterAskClass *klass )
static void
ioptions_list_iface_init( FMAIOptionsListInterface *iface, void *user_data )
{
- static const gchar *thisfn = "nact_assistant_import_ioptions_list_iface_init";
+ static const gchar *thisfn = "fma_importer_ask_ioptions_list_iface_init";
g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
diff --git a/src/core/fma-tokens.h b/src/core/fma-tokens.h
index 71a5110..08b9844 100644
--- a/src/core/fma-tokens.h
+++ b/src/core/fma-tokens.h
@@ -46,12 +46,12 @@
* plugin, attaching the result to each item in the context menu.
*
* Adding a parameter requires updating of:
- * - doc/nact/C/figures/nact-legend.png screenshot
- * - doc/nact/C/nact-execution.xml "Multiple execution" paragraph
+ * - docs/manual/C/figures/fma-legend.png screenshot
+ * - docs/manual/C/fma-execution.xml "Multiple execution" paragraph
* - src/core/fma-tokens.c::is_singular_exec() function
* - src/core/fma-tokens.c::parse_singular() function
- * - src/nact/filemanager-actions-config-tool.ui:LegendDialog labels
* - src/core/fma-object-profile-factory.c:FMAFO_DATA_PARAMETERS comment
+ * - src/ui/fma-legend.ui:LegendDialog labels
*
* Valid parameters are :
*
diff --git a/src/ui/.gitignore b/src/ui/.gitignore
index 165558b..d4d61ee 100644
--- a/src/ui/.gitignore
+++ b/src/ui/.gitignore
@@ -1,5 +1,2 @@
base-marshal.c
base-marshal.h
-nact.desktop
-filemanager-actions-config
-filemanager-actions-config-tool
diff --git a/src/ui/fma-assistant-export.c b/src/ui/fma-assistant-export.c
index 3457a57..3a18371 100644
--- a/src/ui/fma-assistant-export.c
+++ b/src/ui/fma-assistant-export.c
@@ -741,7 +741,7 @@ assist_prepare_confirm( FMAAssistantExport *window, GtkAssistant *assistant, Gtk
}
/*
- * As of 1.11, nact_gconf_writer doesn't return any error message.
+ * As of 1.11, fma_gconf_writer doesn't return any error message.
* An error is simply indicated by returning a null filename.
* So we provide a general error message.
*/
diff --git a/src/ui/fma-icommand-tab.c b/src/ui/fma-icommand-tab.c
index 88f73d0..1a7e7ba 100644
--- a/src/ui/fma-icommand-tab.c
+++ b/src/ui/fma-icommand-tab.c
@@ -636,7 +636,7 @@ parse_parameters( FMAICommandTab *instance )
static void
update_example_label( FMAICommandTab *instance, FMAObjectProfile *profile )
{
- /*static const char *thisfn = "nact_iconditions_update_example_label";*/
+ /*static const char *thisfn = "fma_icommand_tab_update_example_label";*/
gchar *newlabel;
gchar *parameters;
GtkWidget *example_widget;
diff --git a/src/ui/fma-tree-ieditable.c b/src/ui/fma-tree-ieditable.c
index 9559af1..7e60003 100644
--- a/src/ui/fma-tree-ieditable.c
+++ b/src/ui/fma-tree-ieditable.c
@@ -535,7 +535,7 @@ add_to_deleted_rec( IEditableData *ied, FMAObject *object )
static void
decrement_counters( FMATreeIEditable *view, IEditableData *ied, GList *items )
{
- static const gchar *thisfn = "nact_tree_editable_decrement_counters";
+ static const gchar *thisfn = "fma_tree_ieditable_decrement_counters";
gint menus, actions, profiles;
g_debug( "%s: view=%p, ied=%p, items=%p (count=%u)",
diff --git a/src/ui/fma-tree-ieditable.h b/src/ui/fma-tree-ieditable.h
index 6c0e8dd..b7af053 100644
--- a/src/ui/fma-tree-ieditable.h
+++ b/src/ui/fma-tree-ieditable.h
@@ -31,7 +31,7 @@
#define __UI_NACT_TREE_TREE_IEDITABLE_H__
/**
- * SECTION: nact-tree_ieditable
+ * SECTION: fma-tree_ieditable
* @title: FMATreeIEditable
* @short_description: The FMATreeIEditable interface definition
* @include: ui/fma-tree-ieditable.h
diff --git a/src/utils/fma-gconf2key.sh.in b/src/utils/fma-gconf2key.sh.in
index e2874e0..dfd959d 100644
--- a/src/utils/fma-gconf2key.sh.in
+++ b/src/utils/fma-gconf2key.sh.in
@@ -485,7 +485,7 @@ fi
destdir=${conf_dir}/@PACKAGE@
command "mkdir -m ${dir_mode} -p ${destdir}"
destconf=${destdir}/@PACKAGE@.conf
-rm -f ${my_tmproot}.nact
+rm -f ${my_tmproot}.fma
rm -f ${my_tmproot}.runtime
rm -f ${my_tmproot}.io-provider_*
@@ -493,97 +493,97 @@ if [ "${opt_admin}" = "no" ]; then
gconftool-2 --all-entries ${na_preferences} | while read key x value; do
case ${key} in
add-capability-dialog)
- add_pref "nact" "capability-add-capability-wsp" list "${value}"
+ add_pref "fma-config-tool" "capability-add-capability-wsp" list "${value}"
;;
add-scheme-dialog)
- add_pref "nact" "scheme-add-scheme-wsp" list "${value}"
+ add_pref "fma-config-tool" "scheme-add-scheme-wsp" list "${value}"
;;
assistant-esc-confirm)
- add_pref "nact" "${key}" str "${value}"
+ add_pref "fma-config-tool" "${key}" str "${value}"
;;
assistant-esc-quit)
- add_pref "nact" "${key}" str "${value}"
+ add_pref "fma-config-tool" "${key}" str "${value}"
;;
auto-save-on)
- add_pref "nact" "main-save-auto" str "${value}"
+ add_pref "fma-config-tool" "main-save-auto" str "${value}"
;;
auto-save-period)
- add_pref "nact" "main-save-period" str "${value}"
+ add_pref "fma-config-tool" "main-save-period" str "${value}"
;;
export-assistant)
- add_pref "nact" "export-assistant-wsp" list "${value}"
+ add_pref "fma-config-tool" "export-assistant-wsp" list "${value}"
;;
export-ask-user)
- add_pref "nact" "export-ask-user-wsp" list "${value}"
+ add_pref "fma-config-tool" "export-ask-user-wsp" list "${value}"
;;
export-ask-user-last-format)
- add_pref "nact" "${key}" str "${value}"
+ add_pref "fma-config-tool" "${key}" str "${value}"
;;
export-folder-uri)
- add_pref "nact" "export-assistant-lfu" str "${value}"
+ add_pref "fma-config-tool" "export-assistant-lfu" str "${value}"
;;
export-format)
- add_pref "nact" "export-preferred-format" str "${value}"
+ add_pref "fma-config-tool" "export-preferred-format" str "${value}"
;;
icommand-command-chooser)
- add_pref "nact" "command-command-chooser-wsp" list "${value}"
+ add_pref "fma-config-tool" "command-command-chooser-wsp" list "${value}"
;;
icommand-folder-uri)
- add_pref "nact" "command-command-chooser-lfu" list "${value}"
+ add_pref "fma-config-tool" "command-command-chooser-lfu" list "${value}"
;;
icommand-legend-dialog)
- add_pref "nact" "command-legend-wsp" list "${value}"
+ add_pref "fma-config-tool" "command-legend-wsp" list "${value}"
;;
icommand-working-dir-dialog)
- add_pref "nact" "command-working-dir-chooser-wsp" list "${value}"
+ add_pref "fma-config-tool" "command-working-dir-chooser-wsp" list "${value}"
;;
icommand-working-dir-uri)
- add_pref "nact" "command-working-dir-chooser-lfu" str "${value}"
+ add_pref "fma-config-tool" "command-working-dir-chooser-lfu" str "${value}"
;;
icons-chooser)
- add_pref "nact" "item-icon-chooser-wsp" list "${value}"
+ add_pref "fma-config-tool" "item-icon-chooser-wsp" list "${value}"
;;
icons-path)
- add_pref "nact" "item-icon-chooser-last-file-uri" str "${value}"
+ add_pref "fma-config-tool" "item-icon-chooser-last-file-uri" str "${value}"
;;
ienvironment-show-if-running-dialog)
- add_pref "nact" "environment-show-if-running-wsp" list "${value}"
+ add_pref "fma-config-tool" "environment-show-if-running-wsp" list "${value}"
;;
ienvironment-show-if-running-uri)
- add_pref "nact" "environment-show-if-running-lfu" str "${value}"
+ add_pref "fma-config-tool" "environment-show-if-running-lfu" str "${value}"
;;
ienvironment-try-exec-dialog)
- add_pref "nact" "environment-try-exec-wsp" list "${value}"
+ add_pref "fma-config-tool" "environment-try-exec-wsp" list "${value}"
;;
ienvironment-try-exec-uri)
- add_pref "nact" "environment-try-exec-lfu" str "${value}"
+ add_pref "fma-config-tool" "environment-try-exec-lfu" str "${value}"
;;
ifolders-chooser)
- add_pref "nact" "folder-chooser-wsp" list "${value}"
+ add_pref "fma-config-tool" "folder-chooser-wsp" list "${value}"
;;
ifolders-path)
- add_pref "nact" "folder-chooser-lfu" str "file://${value}"
+ add_pref "fma-config-tool" "folder-chooser-lfu" str "file://${value}"
;;
import-ask-user)
- add_pref "nact" "import-ask-user-wsp" list "${value}"
+ add_pref "fma-config-tool" "import-ask-user-wsp" list "${value}"
;;
import-ask-user-last-mode)
- add_pref "nact" "${key}" str "${value}"
+ add_pref "fma-config-tool" "${key}" str "${value}"
;;
import-assistant)
- add_pref "nact" "import-assistant-wsp" list "${value}"
+ add_pref "fma-config-tool" "import-assistant-wsp" list "${value}"
;;
import-folder-uri)
- add_pref "nact" "import-assistant-lfu" str "${value}"
+ add_pref "fma-config-tool" "import-assistant-lfu" str "${value}"
;;
import-keep-choice)
- add_pref "nact" "import-ask-user-keep-last-choice" list "${value}"
+ add_pref "fma-config-tool" "import-ask-user-keep-last-choice" list "${value}"
;;
import-mode)
- add_pref "nact" "import-preferred-mode" str "${value}"
+ add_pref "fma-config-tool" "import-preferred-mode" str "${value}"
;;
io-providers-order)
- add_pref "nact" "io-providers-write-order" list "${value}"
+ add_pref "fma-config-tool" "io-providers-write-order" list "${value}"
;;
iprefs-add-about-item)
add_pref "runtime" "items-add-about-item" str "${value}"
@@ -601,37 +601,37 @@ if [ "${opt_admin}" = "no" ]; then
add_pref "runtime" "items-level-zero-order" list "${value}"
;;
iprefs-relabel-actions)
- add_pref "nact" "relabel-when-duplicate-action" str "${value}"
+ add_pref "fma-config-tool" "relabel-when-duplicate-action" str "${value}"
;;
iprefs-relabel-menus)
- add_pref "nact" "relabel-when-duplicate-menu" str "${value}"
+ add_pref "fma-config-tool" "relabel-when-duplicate-menu" str "${value}"
;;
iprefs-relabel-profiles)
- add_pref "nact" "relabel-when-duplicate-profile" str "${value}"
+ add_pref "fma-config-tool" "relabel-when-duplicate-profile" str "${value}"
;;
main-edit-toolbar)
- add_pref "nact" "main-toolbar-edit-display" str "${value}"
+ add_pref "fma-config-tool" "main-toolbar-edit-display" str "${value}"
;;
main-file-toolbar)
- add_pref "nact" "main-toolbar-file-display" str "${value}"
+ add_pref "fma-config-tool" "main-toolbar-file-display" str "${value}"
;;
main-help-toolbar)
- add_pref "nact" "main-toolbar-help-display" str "${value}"
+ add_pref "fma-config-tool" "main-toolbar-help-display" str "${value}"
;;
main-tools-toolbar)
- add_pref "nact" "main-toolbar-tools-display" str "${value}"
+ add_pref "fma-config-tool" "main-toolbar-tools-display" str "${value}"
;;
main-paned)
- add_pref "nact" "main-paned-width" str "${value}"
+ add_pref "fma-config-tool" "main-paned-width" str "${value}"
;;
main-window)
- add_pref "nact" "main-window-wsp" list "${value}"
+ add_pref "fma-config-tool" "main-window-wsp" list "${value}"
;;
preferences-editor)
- add_pref "nact" "preferences-wsp" list "${value}"
+ add_pref "fma-config-tool" "preferences-wsp" list "${value}"
;;
schemes)
- add_pref "nact" "scheme-default-list" list "${value}"
+ add_pref "fma-config-tool" "scheme-default-list" list "${value}"
;;
esac
done
@@ -692,15 +692,15 @@ if [ -e ${destconf} ]; then
msg "${destconf} already exists: do not replace it, update the FMA configuration file instead"
command "@pkglibexecdir@/fma-set-conf --group 'io-provider fma-gconf' --key writable --type bool
--value false"
else
- nbprefs=$(cat ${my_tmproot}.nact ${my_tmproot}.runtime ${my_tmproot}.io-provider_* 2>/dev/null | wc
-l)
+ nbprefs=$(cat ${my_tmproot}.fma ${my_tmproot}.runtime ${my_tmproot}.io-provider_* 2>/dev/null | wc -l)
if [ ${nbprefs} -gt 0 ]; then
rm -f ${destconf}
- if [ -s ${my_tmproot}.nact ]; then
+ if [ -s ${my_tmproot}.fma ]; then
cat <<! >>${destconf}
-[nact]
-$(sort < ${my_tmproot}.nact 2>/dev/null)
+[fma-config-tool]
+$(sort < ${my_tmproot}.fma 2>/dev/null)
!
fi
if [ -s ${my_tmproot}.runtime ]; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
