Don't use the same bus name for filter and chandler programs.

2007-11-12  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-status-icon.c:
	* src/empathy-call-chandler.c:
	* src/empathy-call.chandler:
	* src/org.gnome.Empathy.Call.service.in:
	* src/empathy-chat.chandler:
	* src/org.gnome.Empathy.Chat.service.in:
	* src/empathy-chat-chandler.c: Don't use the same bus name for filter
	and chandler programs.


svn path=/trunk/; revision=431

8 files changed, 23 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 45450f06e..7c41dd560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2007-11-12  Xavier Claessens  <xclaesse@gmail.com>
 
+	* libempathy-gtk/empathy-status-icon.c:
+	* src/empathy-call-chandler.c:
+	* src/empathy-call.chandler:
+	* src/org.gnome.Empathy.Call.service.in:
+	* src/empathy-chat.chandler:
+	* src/org.gnome.Empathy.Chat.service.in:
+	* src/empathy-chat-chandler.c: Don't use the same bus name for filter
+	and chandler programs.
+
+2007-11-12  Xavier Claessens  <xclaesse@gmail.com>
+
 	* libempathy-gtk/empathy-account-widget-jabber.glade: Jabber priority is
 	in the range -128 127 (Laurent Bigonville).
 
diff --git a/libempathy-gtk/empathy-status-icon.c b/libempathy-gtk/empathy-status-icon.c
index e3abe49e6..2cf8dc24b 100644
--- a/libempathy-gtk/empathy-status-icon.c
+++ b/libempathy-gtk/empathy-status-icon.c
@@ -162,8 +162,8 @@ empathy_status_icon_init (EmpathyStatusIcon *icon)
 	empathy_idle_set_auto_disconnect (priv->idle, TRUE);
 	priv->manager = empathy_contact_manager_new ();
 	priv->mc = empathy_mission_control_new ();
-	priv->text_filter = empathy_filter_new ("org.gnome.Empathy.Chat",
-						"/org/freedesktop/Telepathy/Filter",
+	priv->text_filter = empathy_filter_new ("org.gnome.Empathy.ChatFilter",
+						"/org/gnome/Empathy/ChatFilter",
 						TP_IFACE_CHANNEL_TYPE_TEXT,
 						MC_FILTER_PRIORITY_DIALOG,
 						MC_FILTER_FLAG_INCOMING);
diff --git a/src/empathy-call-chandler.c b/src/empathy-call-chandler.c
index 8833bcbcc..3a1b51137 100644
--- a/src/empathy-call-chandler.c
+++ b/src/empathy-call-chandler.c
@@ -39,8 +39,8 @@
 
 #define DEBUG_DOMAIN "EmpathyCall"
 
-#define BUS_NAME "org.gnome.Empathy.Call"
-#define OBJECT_PATH "/org/freedesktop/Telepathy/ChannelHandler"
+#define BUS_NAME "org.gnome.Empathy.CallChandler"
+#define OBJECT_PATH "/org/gnome/Empathy/CallChandler"
 
 static void
 call_chandler_new_channel_cb (EmpathyChandler *chandler,
diff --git a/src/empathy-call.chandler b/src/empathy-call.chandler
index 190494d3c..88ad9e747 100644
--- a/src/empathy-call.chandler
+++ b/src/empathy-call.chandler
@@ -1,5 +1,5 @@
 [ChannelHandler]
-BusName = org.gnome.Empathy.Call
-ObjectPath = /org/freedesktop/Telepathy/ChannelHandler
+BusName = org.gnome.Empathy.CallChandler
+ObjectPath = /org/gnome/Empathy/CallChandler
 ChannelType = org.freedesktop.Telepathy.Channel.Type.StreamedMedia
 TypeSpecificCapabilities = 15
diff --git a/src/empathy-chat-chandler.c b/src/empathy-chat-chandler.c
index c178f7b72..2064f16d6 100644
--- a/src/empathy-chat-chandler.c
+++ b/src/empathy-chat-chandler.c
@@ -45,8 +45,8 @@
 
 #define DEBUG_DOMAIN "EmpathyChat"
 
-#define BUS_NAME "org.gnome.Empathy.Chat"
-#define OBJECT_PATH "/org/freedesktop/Telepathy/ChannelHandler"
+#define BUS_NAME "org.gnome.Empathy.ChatChandler"
+#define OBJECT_PATH "/org/gnome/Empathy/ChatChandler"
 
 static void
 chat_chandler_new_channel_cb (EmpathyChandler *chandler,
diff --git a/src/empathy-chat.chandler b/src/empathy-chat.chandler
index 4cfe75b01..7de2f28d6 100644
--- a/src/empathy-chat.chandler
+++ b/src/empathy-chat.chandler
@@ -1,5 +1,5 @@
 [ChannelHandler]
-BusName = org.gnome.Empathy.Chat
-ObjectPath = /org/freedesktop/Telepathy/ChannelHandler
+BusName = org.gnome.Empathy.ChatChandler
+ObjectPath = /org/gnome/Empathy/ChatChandler
 ChannelType = org.freedesktop.Telepathy.Channel.Type.Text
 
diff --git a/src/org.gnome.Empathy.Call.service.in b/src/org.gnome.Empathy.Call.service.in
index 9262dc7bf..1c4b95fb4 100644
--- a/src/org.gnome.Empathy.Call.service.in
+++ b/src/org.gnome.Empathy.Call.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.Empathy.Call
+Name=org.gnome.Empathy.CallChandler
 Exec=@libexecdir@/empathy-call-chandler
diff --git a/src/org.gnome.Empathy.Chat.service.in b/src/org.gnome.Empathy.Chat.service.in
index 89031f3dc..291e95f96 100644
--- a/src/org.gnome.Empathy.Chat.service.in
+++ b/src/org.gnome.Empathy.Chat.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.Empathy.Chat
+Name=org.gnome.Empathy.ChatChandler
 Exec=@libexecdir@/empathy-chat-chandler