+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
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);
#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,
[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
#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,
[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
[D-BUS Service]
-Name=org.gnome.Empathy.Call
+Name=org.gnome.Empathy.CallChandler
Exec=@libexecdir@/empathy-call-chandler
[D-BUS Service]
-Name=org.gnome.Empathy.Chat
+Name=org.gnome.Empathy.ChatChandler
Exec=@libexecdir@/empathy-chat-chandler