[nautilus-actions/file-manager-actions] Change file_manager_actions by filemanager_actions for consistency

[Pierre Wieser <pwieser src gnome org>]

commit d77699c34cfb9262ee395fcbb65ee3b366c2ff4b
Author: Pierre Wieser <pwieser trychlos org>
Date:   Tue Sep 8 13:51:46 2015 +0200

    Change file_manager_actions by filemanager_actions for consistency

 src/api/fma-data-boxed.h                    |    2 +-
 src/api/fma-dbus.h                          |    8 ++++----
 src/plugin-tracker/Makefile.am              |    4 ++--
 src/plugin-tracker/na-tracker-dbus-glib.xml |    4 ++--
 src/plugin-tracker/na-tracker-gdbus.xml     |    4 ++--
 src/plugin-tracker/na-tracker.c             |    6 +++---
 src/utils/Makefile.am                       |    2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/src/api/fma-data-boxed.h b/src/api/fma-data-boxed.h
index 190b94f..38735dc 100644
--- a/src/api/fma-data-boxed.h
+++ b/src/api/fma-data-boxed.h
@@ -81,7 +81,7 @@ typedef struct {
 }
        FMADataBoxedClass;
 
-GType             fma_data_boxed_get_type( void );
+GType             fma_data_boxed_get_type       ( void );
 
 FMADataBoxed     *fma_data_boxed_new            ( const FMADataDef *def );
 
diff --git a/src/api/fma-dbus.h b/src/api/fma-dbus.h
index 7b97adb..1a0076c 100644
--- a/src/api/fma-dbus.h
+++ b/src/api/fma-dbus.h
@@ -82,7 +82,7 @@ G_BEGIN_DECLS
  *       --type=method_call \
  *       --print-reply \
  *       --dest=org.filemanager-actions.DBus \
- *         /org/file_manager_actions/DBus/Tracker \
+ *         /org/filemanager_actions/DBus/Tracker \
  *           org.freedesktop.DBus.Introspectable.Introspect
  *   </command>
  *   <computeroutput>
@@ -112,7 +112,7 @@ G_BEGIN_DECLS
  *           <arg name="props" direction="out" type="a{sv}"/>
  *         </method>
  *       </interface>
- *       <interface name="org.file_manager_actions.DBus.Tracker.Status">
+ *       <interface name="org.filemanager_actions.DBus.Tracker.Status">
  *         <method name="GetSelectedPaths">
  *           <arg name="paths" type="as" direction="out"/>
  *         </method>
@@ -122,7 +122,7 @@ G_BEGIN_DECLS
  *   </computeroutput>
  * </programlisting>
  */
-#define FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH       "/org/file_manager_actions/DBus/Tracker"
+#define FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH       "/org/filemanager_actions/DBus/Tracker"
 
 /**
  * FILEMANAGER_ACTIONS_DBUS_TRACKER_IFACE:
@@ -130,7 +130,7 @@ G_BEGIN_DECLS
  * An interface defined on the <emphasis>tracker</emphasis> object,
  * identified by its %FILEMANAGER_ACTIONS_DBUS_TRACKER_PATH D-Bus path.
  */
-#define FILEMANAGER_ACTIONS_DBUS_TRACKER_IFACE         "org.file_manager_actions.DBus.Tracker.Properties1"
+#define FILEMANAGER_ACTIONS_DBUS_TRACKER_IFACE         "org.filemanager_actions.DBus.Tracker.Properties1"
 
 G_END_DECLS
 
diff --git a/src/plugin-tracker/Makefile.am b/src/plugin-tracker/Makefile.am
index 7246395..7e68237 100644
--- a/src/plugin-tracker/Makefile.am
+++ b/src/plugin-tracker/Makefile.am
@@ -45,7 +45,7 @@ BUILT_SOURCES += \
 
 na-tracker-gdbus.c na-tracker-gdbus.h: na-tracker-gdbus.xml
        gdbus-codegen \
-               --interface-prefix org.file_manager_actions.DBus.Tracker.       \
+               --interface-prefix org.filemanager_actions.DBus.Tracker.        \
                --generate-c-code na-tracker-gdbus                                              \
                --c-namespace NA_Tracker                                                                \
                --c-generate-object-manager                                                             \
@@ -53,7 +53,7 @@ na-tracker-gdbus.c na-tracker-gdbus.h: na-tracker-gdbus.xml
                $<
 
 DISTCLEANFILES = \
-       na-tracker-gdbus-docs-org.file_manager_actions.DBus.Tracker.Properties1.xml
+       na-tracker-gdbus-docs-org.filemanager_actions.DBus.Tracker.Properties1.xml
 
 nodist_libnautilus_actions_tracker_la_SOURCES = \
        $(BUILT_SOURCES)                                                                                      
  \
diff --git a/src/plugin-tracker/na-tracker-dbus-glib.xml b/src/plugin-tracker/na-tracker-dbus-glib.xml
index 47e2efa..7c8acd3 100644
--- a/src/plugin-tracker/na-tracker-dbus-glib.xml
+++ b/src/plugin-tracker/na-tracker-dbus-glib.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<node name="/org/file_manager_actions/DBus/Tracker">
-  <interface name="org.file_manager_actions.DBus.Tracker.Properties1">
+<node name="/org/filemanager_actions/DBus/Tracker">
+  <interface name="org.filemanager_actions.DBus.Tracker.Properties1">
     <method name="GetSelectedPaths">
       <arg type="as" name="paths" direction="out" />
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="na_tracker_get_selected_paths" />
diff --git a/src/plugin-tracker/na-tracker-gdbus.xml b/src/plugin-tracker/na-tracker-gdbus.xml
index 4433b11..cde2967 100644
--- a/src/plugin-tracker/na-tracker-gdbus.xml
+++ b/src/plugin-tracker/na-tracker-gdbus.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <node>
   <!--
-    org.file_manager_actions.DBus.Tracker.Properties1:
+    org.filemanager_actions.DBus.Tracker.Properties1:
     @short_description: Tracker properties
     @since: 3.2
     
@@ -9,7 +9,7 @@
     file manager user interface. and is able to retrieve them through
     DBus.
   -->
-  <interface name="org.file_manager_actions.DBus.Tracker.Properties1">
+  <interface name="org.filemanager_actions.DBus.Tracker.Properties1">
   
     <!--
       GetSelectedPaths:
diff --git a/src/plugin-tracker/na-tracker.c b/src/plugin-tracker/na-tracker.c
index cc20672..528cc59 100644
--- a/src/plugin-tracker/na-tracker.c
+++ b/src/plugin-tracker/na-tracker.c
@@ -186,18 +186,18 @@ on_bus_acquired( GDBusConnection *connection, const gchar *name, NATracker *trac
                        ( void * ) tracker );
 
        /* create a new org.freedesktop.DBus.ObjectManager rooted at
-        *  /org/file_manager_actions/DBus/Tracker
+        *  /org/filemanager_actions/DBus/Tracker
         */
        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
+        *  /org/filemanager_actions/DBus/Tracker
         *  (which must be same or below than that of object manager server)
         */
        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
+        *  org.filemanager_actions.DBus.Tracker.Properties1
         *  and attach it to the D-Bus object, which takes its own reference on it
         */
        tracker_properties1 = na_tracker_properties1_skeleton_new();
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 015f0dd..6cee0fd 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -78,7 +78,7 @@ BUILT_SOURCES += \
 
 nautilus-actions-run-bindings.c nautilus-actions-run-bindings.h: 
$(top_srcdir)/src/plugin-tracker/na-tracker-gdbus.xml
        gdbus-codegen \
-               --interface-prefix org.file_manager_actions.DBus.Tracker.       \
+               --interface-prefix org.filemanager_actions.DBus.Tracker.        \
                --generate-c-code nautilus-actions-run-bindings                 \
                --c-namespace NA_Tracker                                                                \
                --c-generate-object-manager                                                             \