rename the chat handler to Empathy.Chat

diff --git a/data/.gitignore b/data/.gitignore
index 7ec3d4d81dfc7a0fe89582c79b058d7034cd8749..9033e3d363ceff935f8725be139e062554fa646c 100644 (file)
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -2,7 +2,7 @@ empathy.desktop
 empathy.desktop.in
 org.gnome.Empathy.gschema.valid
 org.gnome.Empathy.gschema.xml
-org.freedesktop.Telepathy.Client.Empathy.service
+org.freedesktop.Telepathy.Client.Empathy.Chat.service
 org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service
 empathy-accounts.desktop
 empathy-accounts.desktop.in

diff --git a/data/Empathy.Chat.client b/data/Empathy.Chat.client
new file mode 100644 (file)
index 0000000..3d0bd91
--- /dev/null
+++ b/data/Empathy.Chat.client
@@ -0,0 +1,14 @@
+[org.freedesktop.Telepathy.Client]
+Interfaces=org.freedesktop.Telepathy.Client.Handler
+
+[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
+org.freedesktop.Telepathy.Channel.TargetHandleType u=0
+
+[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1]
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
+org.freedesktop.Telepathy.Channel.TargetHandleType u=1
+
+[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 2]
+org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
+org.freedesktop.Telepathy.Channel.TargetHandleType u=2

diff --git a/data/Empathy.client b/data/Empathy.client
deleted file mode 100644 (file)
index 3d0bd91..0000000
--- a/data/Empathy.client
+++ /dev/null
@@ -1,14 +0,0 @@
-[org.freedesktop.Telepathy.Client]
-Interfaces=org.freedesktop.Telepathy.Client.Handler
-
-[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
-org.freedesktop.Telepathy.Channel.TargetHandleType u=0
-
-[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
-org.freedesktop.Telepathy.Channel.TargetHandleType u=1
-
-[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 2]
-org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Text
-org.freedesktop.Telepathy.Channel.TargetHandleType u=2

diff --git a/data/Makefile.am b/data/Makefile.am
index befd1c926018b593826191720bbebf11c9e9490c..8c11d9fd047777dc5815656834124575076eb3dd 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -26,13 +26,13 @@ streamingprefs_DATA =               \
 
 servicefiledir = $(datadir)/dbus-1/services
 servicefile_in_files = \
-       org.freedesktop.Telepathy.Client.Empathy.service.in \
+       org.freedesktop.Telepathy.Client.Empathy.Chat.service.in \
        org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in \
        org.freedesktop.Telepathy.Client.Empathy.Auth.service.in
 
 servicefile_DATA = $(servicefile_in_files:.service.in=.service)
 
-org.freedesktop.Telepathy.Client.Empathy.service: org.freedesktop.Telepathy.Client.Empathy.service.in
+org.freedesktop.Telepathy.Client.Empathy.Chat.service: org.freedesktop.Telepathy.Client.Empathy.Chat.service.in
        $(AM_V_GEN)sed -e "s|[@]bindir[@]|$(bindir)|" $< > $@
 
 org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service: org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
@@ -43,7 +43,7 @@ org.freedesktop.Telepathy.Client.Empathy.Auth.service: org.freedesktop.Telepathy
 
 clientfiledir = $(datarootdir)/telepathy/clients
 clientfile_DATA = \
-       Empathy.client \
+       Empathy.Chat.client \
        Empathy.AudioVideo.client \
        Empathy.Auth.client
 

diff --git a/data/org.freedesktop.Telepathy.Client.Empathy.Chat.service.in b/data/org.freedesktop.Telepathy.Client.Empathy.Chat.service.in
new file mode 100644 (file)
index 0000000..225c6ae
--- /dev/null
+++ b/data/org.freedesktop.Telepathy.Client.Empathy.Chat.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.Empathy.Chat
+Exec=@bindir@/empathy-chat

diff --git a/data/org.freedesktop.Telepathy.Client.Empathy.service.in b/data/org.freedesktop.Telepathy.Client.Empathy.service.in
deleted file mode 100644 (file)
index 332e0cf..0000000
--- a/data/org.freedesktop.Telepathy.Client.Empathy.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.Empathy
-Exec=@bindir@/empathy -h

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index d16be299dd312bfbd73893aa152f0d778047cc05..b450a5198213e4571b271c7a93b14c887901b8ab 100644 (file)
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -255,7 +255,7 @@ empathy_chat_manager_init (EmpathyChatManager *self)
     }
 
   /* Text channels handler */
-  priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, "Empathy",
+  priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, "Empathy.Chat",
       FALSE, handle_channels, self, NULL);
 
   /* EmpathyTpChat relies on this feature being prepared */