[nautilus-actions] NADBus interface is renamed to FMADBus
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] NADBus interface is renamed to FMADBus
- Date: Wed, 15 Feb 2017 22:45:35 +0000 (UTC)
commit c0d8639c2b9f7aa0e7e1055bfe5d2cfe8be0800c
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Sep 7 21:43:27 2015 +0200
NADBus interface is renamed to FMADBus
src/api/Makefile.am | 2 +-
src/api/{na-dbus.h => fma-dbus.h} | 26 +++++++++++++-------------
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 | 14 +++++++-------
src/utils/Makefile.am | 2 +-
src/utils/nautilus-actions-run.c | 14 +++++++-------
8 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 83a8d9e..376d56c 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -30,7 +30,7 @@ api_includedir = $(pkgincludedir)
api_include_HEADERS = \
na-extension.h \
\
- na-dbus.h \
+ fma-dbus.h \
na-iexporter.h \
na-iimporter.h \
na-ifactory-provider.h \
diff --git a/src/api/na-dbus.h b/src/api/fma-dbus.h
similarity index 83%
rename from src/api/na-dbus.h
rename to src/api/fma-dbus.h
index 2cf35c2..f533c43 100644
--- a/src/api/na-dbus.h
+++ b/src/api/fma-dbus.h
@@ -27,14 +27,14 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __FILE_MANAGER_ACTIONS_API_NA_DBUS_H__
-#define __FILE_MANAGER_ACTIONS_API_NA_DBUS_H__
+#ifndef __FILE_MANAGER_ACTIONS_API_DBUS_H__
+#define __FILE_MANAGER_ACTIONS_API_DBUS_H__
/**
* SECTION: dbus
* @title: D-Bus
* @short_description: The D-Bus Services
- * @include: file-manager-actions/na-dbus.h
+ * @include: file-manager-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
/**
- * NAUTILUS_ACTIONS_DBUS_SERVICE:
+ * FILE_MANAGER_ACTIONS_DBUS_SERVICE:
*
* This is the « well-known » name that
* &prodname; reserves on D-Bus session bus.
*/
-#define NAUTILUS_ACTIONS_DBUS_SERVICE "org.file-manager-actions.DBus"
+#define FILE_MANAGER_ACTIONS_DBUS_SERVICE "org.file-manager-actions.DBus"
/**
- * NAUTILUS_ACTIONS_DBUS_TRACKER_PATH:
+ * FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH:
*
* The D-Bus path of the <emphasis>tracker</emphasis> object.
*
@@ -82,7 +82,7 @@ G_BEGIN_DECLS
* --type=method_call \
* --print-reply \
* --dest=org.file-manager-actions.DBus \
- * /org/nautilus_actions/DBus/Tracker \
+ * /org/file_manager_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.nautilus_actions.DBus.Tracker.Status">
+ * <interface name="org.file_manager_actions.DBus.Tracker.Status">
* <method name="GetSelectedPaths">
* <arg name="paths" type="as" direction="out"/>
* </method>
@@ -122,16 +122,16 @@ G_BEGIN_DECLS
* </computeroutput>
* </programlisting>
*/
-#define NAUTILUS_ACTIONS_DBUS_TRACKER_PATH "/org/nautilus_actions/DBus/Tracker"
+#define FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH "/org/file_manager_actions/DBus/Tracker"
/**
- * NAUTILUS_ACTIONS_DBUS_TRACKER_IFACE:
+ * FILE_MANAGER_ACTIONS_DBUS_TRACKER_IFACE:
*
* An interface defined on the <emphasis>tracker</emphasis> object,
- * identified by its %NAUTILUS_ACTIONS_DBUS_TRACKER_PATH D-Bus path.
+ * identified by its %FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH D-Bus path.
*/
-#define NAUTILUS_ACTIONS_DBUS_TRACKER_IFACE "org.nautilus_actions.DBus.Tracker.Properties1"
+#define FILE_MANAGER_ACTIONS_DBUS_TRACKER_IFACE "org.file_manager_actions.DBus.Tracker.Properties1"
G_END_DECLS
-#endif /* __FILE_MANAGER_ACTIONS_API_NA_DBUS_H__ */
+#endif /* __FILE_MANAGER_ACTIONS_API_DBUS_H__ */
diff --git a/src/plugin-tracker/Makefile.am b/src/plugin-tracker/Makefile.am
index b4aaab2..2c05965 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.nautilus_actions.DBus.Tracker. \
+ --interface-prefix org.file_manager_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.nautilus_actions.DBus.Tracker.Properties1.xml
+ na-tracker-gdbus-docs-org.file_manager_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 36cff3e..47e2efa 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/nautilus_actions/DBus/Tracker">
- <interface name="org.nautilus_actions.DBus.Tracker.Properties1">
+<node name="/org/file_manager_actions/DBus/Tracker">
+ <interface name="org.file_manager_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 b16d6b3..4433b11 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.nautilus_actions.DBus.Tracker.Properties1:
+ org.file_manager_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.nautilus_actions.DBus.Tracker.Properties1">
+ <interface name="org.file_manager_actions.DBus.Tracker.Properties1">
<!--
GetSelectedPaths:
diff --git a/src/plugin-tracker/na-tracker.c b/src/plugin-tracker/na-tracker.c
index 42ee6e9..36fdb26 100644
--- a/src/plugin-tracker/na-tracker.c
+++ b/src/plugin-tracker/na-tracker.c
@@ -38,7 +38,7 @@
#include <libnautilus-extension/nautilus-file-info.h>
#include <libnautilus-extension/nautilus-menu-provider.h>
-#include <api/na-dbus.h>
+#include <api/fma-dbus.h>
#include "na-tracker.h"
@@ -161,7 +161,7 @@ initialize_dbus_connection( NATracker *tracker )
priv->owner_id = g_bus_own_name(
G_BUS_TYPE_SESSION,
- NAUTILUS_ACTIONS_DBUS_SERVICE,
+ FILE_MANAGER_ACTIONS_DBUS_SERVICE,
G_BUS_NAME_OWNER_FLAGS_REPLACE,
( GBusAcquiredCallback ) on_bus_acquired,
( GBusNameAcquiredCallback ) on_name_acquired,
@@ -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/nautilus_actions/DBus/Tracker
+ * /org/file_manager_actions/DBus/Tracker
*/
- tracker->private->manager = g_dbus_object_manager_server_new( NAUTILUS_ACTIONS_DBUS_TRACKER_PATH );
+ tracker->private->manager = g_dbus_object_manager_server_new( FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH
);
/* create a new D-Bus object at the path
- * /org/nautilus_actions/DBus/Tracker
+ * /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( NAUTILUS_ACTIONS_DBUS_TRACKER_PATH "/0" );
+ tracker_object = na_tracker_object_skeleton_new( FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
/* make a newly created object export the interface
- * org.nautilus_actions.DBus.Tracker.Properties1
+ * org.file_manager_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 13a082e..a290387 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.nautilus_actions.DBus.Tracker. \
+ --interface-prefix org.file_manager_actions.DBus.Tracker. \
--generate-c-code nautilus-actions-run-bindings \
--c-namespace NA_Tracker \
--c-generate-object-manager \
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index fd5ac8d..88ebf1e 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -39,7 +39,7 @@
#include <api/fma-core-utils.h>
#include <api/na-object-api.h>
-#include <api/na-dbus.h>
+#include <api/fma-dbus.h>
#include <core/na-gconf-migration.h>
#include <core/na-pivot.h>
@@ -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,
- NAUTILUS_ACTIONS_DBUS_SERVICE,
- NAUTILUS_ACTIONS_DBUS_TRACKER_PATH,
+ FILE_MANAGER_ACTIONS_DBUS_SERVICE,
+ FILE_MANAGER_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, NAUTILUS_ACTIONS_DBUS_TRACKER_PATH "/0" );
+ object = g_dbus_object_manager_get_object( manager, FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
if( !object ){
- g_printerr( "%s: unable to get object at %s path\n", thisfn,
NAUTILUS_ACTIONS_DBUS_TRACKER_PATH "/0" );
+ g_printerr( "%s: unable to get object at %s path\n", thisfn,
FILE_MANAGER_ACTIONS_DBUS_TRACKER_PATH "/0" );
g_object_unref( manager );
return( NULL );
}
- iface = g_dbus_object_get_interface( object, NAUTILUS_ACTIONS_DBUS_TRACKER_IFACE );
+ iface = g_dbus_object_get_interface( object, FILE_MANAGER_ACTIONS_DBUS_TRACKER_IFACE );
if( !iface ){
- g_printerr( "%s: unable to get %s interface\n", thisfn, NAUTILUS_ACTIONS_DBUS_TRACKER_IFACE );
+ g_printerr( "%s: unable to get %s interface\n", thisfn,
FILE_MANAGER_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]
