[nautilus-actions] Tracker DBus interface is renamed as org.nautilus_actions.DBus.Tracker.Properties1

[Pierre Wieser <pwieser src gnome org>]

commit bc2f347cd483384e690bbc83884956bc559d30e1
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Jan 27 22:09:41 2012 +0100

    Tracker DBus interface is renamed as org.nautilus_actions.DBus.Tracker.Properties1

 ChangeLog                              |   11 +++++++++++
 src/api/na-dbus.h                      |   19 ++++++++++---------
 src/plugin-tracker/na-tracker-dbus.xml |    2 +-
 src/utils/nautilus-actions-run.c       |    2 +-
 4 files changed, 23 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6b5f836..6b8df94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2012-01-27 Pierre Wieser <pwieser trychlos org>
 
+	* m4/na-check-for-gdbus.m4: New file.
+
+	* configure.ac: Updated accordingly.
+
+	* src/api/na-dbus.h:
+	* src/plugin-tracker/na-tracker-dbus.xml:
+	* src/utils/nautilus-actions-run.c:
+	Tracker DBus interface is renamed as
+	org.nautilus_actions.DBus.Tracker.Properties1 and versioned according to
+	http://0pointer.de/blog/projects/versioning-dbus.html
+
 	* m4/na-default-io-provider.m4: Talk about items, not just actions.
 
 	* docs/reference/na-compiling.xml: Slightly improve documentation.
diff --git a/src/api/na-dbus.h b/src/api/na-dbus.h
index 6467934..cb377e1 100644
--- a/src/api/na-dbus.h
+++ b/src/api/na-dbus.h
@@ -43,14 +43,14 @@
  *
  * <note>
  *   <para>
- *    To be really clear, &prodname; relies on &nautilus; being
- *    run at the startup of the session, in order to be able to register
- *    its own D-Bus services via the <emphasis>tracker</emphasis> plugin.
+ *    To be really clear, &prodname; relies on &nautilus; in order
+ *    to be able to register its own D-Bus services via the
+ *    <emphasis>tracker</emphasis> plugin.
  *   </para>
  *   <para>
- *    If &nautilus; is not run at the startup of the session, or the
- *    <emphasis>tracker</emphasis> plugin is not loaded at &nautilus; startup,
- *    then these D-Bus services will not be available.
+ *    If &nautilus; does not run, or the <emphasis>tracker</emphasis>
+ *    plugin is not loaded at &nautilus; startup, then these D-Bus
+ *    services will not be available.
  *   </para>
  * </note>
  */
@@ -62,7 +62,8 @@ G_BEGIN_DECLS
 /**
  * NAUTILUS_ACTIONS_DBUS_SERVICE:
  *
- * This is the name that &prodname; reserves on D-Bus session bus.
+ * This is the &laquo;&nbsp;well-known&nbsp;&raquo; name that
+ * &prodname; reserves on D-Bus session bus.
  */
 #define NAUTILUS_ACTIONS_DBUS_SERVICE            "org.nautilus-actions.DBus"
 
@@ -125,12 +126,12 @@ G_BEGIN_DECLS
 #define NAUTILUS_ACTIONS_DBUS_TRACKER_PATH       "/org/nautilus_actions/DBus/Tracker"
 
 /**
- * NAUTILUS_ACTIONS_DBUS_TRACKER_INTERFACE:
+ * NAUTILUS_ACTIONS_DBUS_TRACKER_IFACE:
  *
  * An interface defined on the <emphasis>tracker</emphasis> object,
  * identified by its %NAUTILUS_ACTIONS_DBUS_TRACKER_PATH D-Bus path.
  */
-#define NAUTILUS_ACTIONS_DBUS_TRACKER_INTERFACE  "org.nautilus_actions.DBus.Tracker.Status"
+#define NAUTILUS_ACTIONS_DBUS_TRACKER_IFACE  	"org.nautilus_actions.DBus.Tracker.Properties1"
 
 G_END_DECLS
 
diff --git a/src/plugin-tracker/na-tracker-dbus.xml b/src/plugin-tracker/na-tracker-dbus.xml
index b5d823c..5e53d2f 100644
--- a/src/plugin-tracker/na-tracker-dbus.xml
+++ b/src/plugin-tracker/na-tracker-dbus.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.Status">
+  <interface name="org.nautilus_actions.DBus.Tracker.Properties1">
     <method name="GetSelectedPaths">
       <arg type="as" name="paths" direction="out" />
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="na_tracker_dbus_get_selected_paths" />
diff --git a/src/utils/nautilus-actions-run.c b/src/utils/nautilus-actions-run.c
index 75f375a..0d4d99b 100644
--- a/src/utils/nautilus-actions-run.c
+++ b/src/utils/nautilus-actions-run.c
@@ -284,7 +284,7 @@ targets_from_selection( void )
 	proxy = dbus_g_proxy_new_for_name( connection,
 			NAUTILUS_ACTIONS_DBUS_SERVICE,
 			NAUTILUS_ACTIONS_DBUS_TRACKER_PATH,
-			NAUTILUS_ACTIONS_DBUS_TRACKER_INTERFACE );
+			NAUTILUS_ACTIONS_DBUS_TRACKER_IFACE );
 
 	if( !proxy ){
 		g_printerr( _( "Error: unable to get a proxy on %s service" ), NAUTILUS_ACTIONS_DBUS_SERVICE );