From dc277e086d67b4e5ae53211229368c1bd7572844 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 19 Oct 2010 15:37:03 +0200
Subject: rename the chat handler to Empathy.Chat

---
 data/.gitignore                                            |  2 +-
 data/Empathy.Chat.client                                   | 14 ++++++++++++++
 data/Empathy.client                                        | 14 --------------
 data/Makefile.am                                           |  6 +++---
 ...rg.freedesktop.Telepathy.Client.Empathy.Chat.service.in |  3 +++
 data/org.freedesktop.Telepathy.Client.Empathy.service.in   |  3 ---
 6 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 data/Empathy.Chat.client
 delete mode 100644 data/Empathy.client
 create mode 100644 data/org.freedesktop.Telepathy.Client.Empathy.Chat.service.in
 delete mode 100644 data/org.freedesktop.Telepathy.Client.Empathy.service.in

(limited to 'data')

diff --git a/data/.gitignore b/data/.gitignore
index 7ec3d4d81..9033e3d36 100644
--- 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
index 000000000..3d0bd91fa
--- /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
index 3d0bd91fa..000000000
--- 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 befd1c926..8c11d9fd0 100644
--- 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
index 000000000..225c6ae0c
--- /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
index 332e0cf08..000000000
--- 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
-- 
cgit v1.2.3