[rhythmbox] add version number to all dbus interfaces and object names

[Jonathan Matthew <jmatthew src gnome org>]

commit 7e38224ae6b3999a2cd2593823f1408dc5d538b5
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Sep 29 09:40:29 2011 +1000

    add version number to all dbus interfaces and object names
    
    Also change some method names to look more like everything else.

 metadata/rb-metadata-dbus.c    |    2 +-
 metadata/rb-metadata-dbus.h    |    6 +++---
 rhythmdb/rhythmdb-dbus.c       |    6 +++---
 shell/rb-playlist-manager.c    |   34 +++++++++++++++++-----------------
 sources/rb-play-queue-source.c |    6 +++---
 5 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/metadata/rb-metadata-dbus.c b/metadata/rb-metadata-dbus.c
index 799b9d2..d700c1f 100644
--- a/metadata/rb-metadata-dbus.c
+++ b/metadata/rb-metadata-dbus.c
@@ -38,7 +38,7 @@
 
 const char *rb_metadata_iface_xml = "				\
 <node>								\
-  <interface name='org.gnome.Rhythmbox.Metadata'>		\
+  <interface name='org.gnome.Rhythmbox3.Metadata'>		\
     <method name='ping'>					\
       <arg direction='out' type='b' name='ok'/>			\
     </method>							\
diff --git a/metadata/rb-metadata-dbus.h b/metadata/rb-metadata-dbus.h
index 8187da6..46d0d39 100644
--- a/metadata/rb-metadata-dbus.h
+++ b/metadata/rb-metadata-dbus.h
@@ -34,9 +34,9 @@
 
 G_BEGIN_DECLS
 
-#define RB_METADATA_DBUS_NAME		"org.gnome.Rhythmbox.Metadata"
-#define RB_METADATA_DBUS_OBJECT_PATH	"/org/gnome/Rhythmbox/MetadataService"
-#define RB_METADATA_DBUS_INTERFACE	"org.gnome.Rhythmbox.Metadata"
+#define RB_METADATA_DBUS_NAME		"org.gnome.Rhythmbox3.Metadata"
+#define RB_METADATA_DBUS_OBJECT_PATH	"/org/gnome/Rhythmbox3/MetadataService"
+#define RB_METADATA_DBUS_INTERFACE	"org.gnome.Rhythmbox3.Metadata"
 
 /* Timeouts in milliseconds.  If a metadata operation takes longer than this,
  * the metadata process will be killed and the operation will fail.  We use a
diff --git a/rhythmdb/rhythmdb-dbus.c b/rhythmdb/rhythmdb-dbus.c
index 9b22dd1..bf982ce 100644
--- a/rhythmdb/rhythmdb-dbus.c
+++ b/rhythmdb/rhythmdb-dbus.c
@@ -33,12 +33,12 @@
 #include "rhythmdb.h"
 #include "rhythmdb-private.h"
 
-static const char *RHYTHMDB_OBJECT_PATH = "/org/gnome/Rhythmbox/RhythmDB";
-static const char *RHYTHMDB_INTERFACE_NAME = "org.gnome.Rhythmbox.RhythmDB";
+static const char *RHYTHMDB_OBJECT_PATH = "/org/gnome/Rhythmbox3/RhythmDB";
+static const char *RHYTHMDB_INTERFACE_NAME = "org.gnome.Rhythmbox3.RhythmDB";
 
 static const char *rhythmdb_dbus_spec =
 "<node>"
-"  <interface name='org.gnome.Rhythmbox.RhythmDB'>"
+"  <interface name='org.gnome.Rhythmbox3.RhythmDB'>"
 "    <method name='GetEntryProperties'>"
 "      <arg name='uri' type='s'/>"
 "      <arg name='properties' type='a{sv}' direction='out'/>"
diff --git a/shell/rb-playlist-manager.c b/shell/rb-playlist-manager.c
index db8cee3..f825178 100644
--- a/shell/rb-playlist-manager.c
+++ b/shell/rb-playlist-manager.c
@@ -64,35 +64,35 @@
 #define RB_PLAYLIST_MGR_VERSION (xmlChar *) "1.0"
 #define RB_PLAYLIST_MGR_PL (xmlChar *) "rhythmdb-playlists"
 
-#define RB_PLAYLIST_MANAGER_IFACE_NAME "org.gnome.Rhythmbox.PlaylistManager"
-#define RB_PLAYLIST_MANAGER_DBUS_PATH "/org/gnome/Rhythmbox/PlaylistManager"
+#define RB_PLAYLIST_MANAGER_IFACE_NAME "org.gnome.Rhythmbox3.PlaylistManager"
+#define RB_PLAYLIST_MANAGER_DBUS_PATH "/org/gnome/Rhythmbox3/PlaylistManager"
 
 static const char *rb_playlist_manager_dbus_spec =
 "<node>"
-"  <interface name='org.gnome.Rhythmbox.PlaylistManager'>"
-"    <method name='getPlaylists'>"
+"  <interface name='org.gnome.Rhythmbox3.PlaylistManager'>"
+"    <method name='GetPlaylists'>"
 "      <arg type='as' direction='out'/>"
 "    </method>"
-"    <method name='createPlaylist'>"
+"    <method name='CreatePlaylist'>"
 "      <arg type='s' name='name'/>"
 "    </method>"
-"    <method name='deletePlaylist'>"
+"    <method name='DeletePlaylist'>"
 "      <arg type='s' name='name'/>"
 "    </method>"
-"    <method name='addToPlaylist'>"
+"    <method name='AddToPlaylist'>"
 "      <arg type='s' name='playlist'/>"
 "      <arg type='s' name='uri'/>"
 "    </method>"
-"    <method name='removeFromPlaylist'>"
+"    <method name='RemoveFromPlaylist'>"
 "      <arg type='s' name='playlist'/>"
 "      <arg type='s' name='uri'/>"
 "    </method>"
-"    <method name='exportPlaylist'>"
+"    <method name='ExportPlaylist'>"
 "      <arg type='s' name='playlist'/>"
 "      <arg type='s' name='uri'/>"
 "      <arg type='b' name='mp3_format'/>"
 "    </method>"
-"    <method name='importPlaylist'>"
+"    <method name='ImportPlaylist'>"
 "      <arg type='s' name='uri'/>"
 "    </method>"
 "  </interface>"
@@ -1623,14 +1623,14 @@ playlist_manager_method_call (GDBusConnection *connection,
 		return;
 	}
 
-	if (g_strcmp0 (method_name, "getPlaylists") == 0) {
+	if (g_strcmp0 (method_name, "GetPlaylists") == 0) {
 		char **names;
 
 		rb_playlist_manager_get_playlist_names (mgr, &names, NULL);
 		g_dbus_method_invocation_return_value (invocation,
 						       g_variant_new_strv ((const char * const *)names, -1));
 		g_strfreev (names);
-	} else if (g_strcmp0 (method_name, "createPlaylist") == 0) {
+	} else if (g_strcmp0 (method_name, "CreatePlaylist") == 0) {
 		g_variant_get (parameters, "(&s)", &name);
 		if (rb_playlist_manager_create_static_playlist (mgr, name, &error)) {
 			g_dbus_method_invocation_return_value (invocation, NULL);
@@ -1638,7 +1638,7 @@ playlist_manager_method_call (GDBusConnection *connection,
 			g_dbus_method_invocation_return_gerror (invocation, error);
 			g_clear_error (&error);
 		}
-	} else if (g_strcmp0 (method_name, "deletePlaylist") == 0) {
+	} else if (g_strcmp0 (method_name, "DeletePlaylist") == 0) {
 		g_variant_get (parameters, "(&s)", &name);
 		if (rb_playlist_manager_delete_playlist (mgr, name, &error)) {
 			g_dbus_method_invocation_return_value (invocation, NULL);
@@ -1646,7 +1646,7 @@ playlist_manager_method_call (GDBusConnection *connection,
 			g_dbus_method_invocation_return_gerror (invocation, error);
 			g_clear_error (&error);
 		}
-	} else if (g_strcmp0 (method_name, "addToPlaylist") == 0) {
+	} else if (g_strcmp0 (method_name, "AddToPlaylist") == 0) {
 		g_variant_get (parameters, "(ss)", &name, &uri);
 		if (rb_playlist_manager_add_to_playlist (mgr, name, uri, &error)) {
 			g_dbus_method_invocation_return_value (invocation, NULL);
@@ -1654,7 +1654,7 @@ playlist_manager_method_call (GDBusConnection *connection,
 			g_dbus_method_invocation_return_gerror (invocation, error);
 			g_clear_error (&error);
 		}
-	} else if (g_strcmp0 (method_name, "removeFromPlaylist") == 0) {
+	} else if (g_strcmp0 (method_name, "RemoveFromPlaylist") == 0) {
 		g_variant_get (parameters, "(ss)", &name, &uri);
 		if (rb_playlist_manager_remove_from_playlist (mgr, name, uri, &error)) {
 			g_dbus_method_invocation_return_value (invocation, NULL);
@@ -1662,7 +1662,7 @@ playlist_manager_method_call (GDBusConnection *connection,
 			g_dbus_method_invocation_return_gerror (invocation, error);
 			g_clear_error (&error);
 		}
-	} else if (g_strcmp0 (method_name, "exportPlaylist") == 0) {
+	} else if (g_strcmp0 (method_name, "ExportPlaylist") == 0) {
 		gboolean m3u_format;
 		g_variant_get (parameters, "(ssb)", &name, &uri, &m3u_format);
 		if (rb_playlist_manager_export_playlist (mgr, name, uri, m3u_format, &error)) {
@@ -1671,7 +1671,7 @@ playlist_manager_method_call (GDBusConnection *connection,
 			g_dbus_method_invocation_return_gerror (invocation, error);
 			g_clear_error (&error);
 		}
-	} else if (g_strcmp0 (method_name, "importPlaylist") == 0) {
+	} else if (g_strcmp0 (method_name, "ImportPlaylist") == 0) {
 		g_variant_get (parameters, "(s)", &uri);
 		if (rb_playlist_manager_parse_file (mgr, uri, &error)) {
 			g_dbus_method_invocation_return_value (invocation, NULL);
diff --git a/sources/rb-play-queue-source.c b/sources/rb-play-queue-source.c
index 82948c7..166353f 100644
--- a/sources/rb-play-queue-source.c
+++ b/sources/rb-play-queue-source.c
@@ -53,12 +53,12 @@
  * the usual horizontal space allowed for the side bar.
  */
 
-static const char *RB_PLAY_QUEUE_DBUS_PATH = "/org/gnome/Rhythmbox/PlayQueue";
-static const char *RB_PLAY_QUEUE_IFACE_NAME = "org.gnome.Rhythmbox.PlayQueue";
+static const char *RB_PLAY_QUEUE_DBUS_PATH = "/org/gnome/Rhythmbox3/PlayQueue";
+static const char *RB_PLAY_QUEUE_IFACE_NAME = "org.gnome.Rhythmbox3.PlayQueue";
 
 static const char *rb_play_queue_dbus_spec =
 "<node>"
-"  <interface name='org.gnome.Rhythmbox.PlayQueue'>"
+"  <interface name='org.gnome.Rhythmbox3.PlayQueue'>"
 "    <method name='AddToQueue'>"
 "      <arg type='s' name='uri'/>"
 "    </method>"