[empathy] rename the chat handler to Empathy.Chat
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] rename the chat handler to Empathy.Chat
- Date: Mon, 25 Oct 2010 09:19:08 +0000 (UTC)
commit dc277e086d67b4e5ae53211229368c1bd7572844
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Oct 19 15:37:03 2010 +0200
rename the chat handler to Empathy.Chat
data/.gitignore | 2 +-
data/{Empathy.client => Empathy.Chat.client} | 0
data/Makefile.am | 6 +++---
...esktop.Telepathy.Client.Empathy.Chat.service.in | 3 +++
...freedesktop.Telepathy.Client.Empathy.service.in | 3 ---
src/empathy-chat-manager.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/data/.gitignore b/data/.gitignore
index 7ec3d4d..9033e3d 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.client b/data/Empathy.Chat.client
similarity index 100%
rename from data/Empathy.client
rename to data/Empathy.Chat.client
diff --git a/data/Makefile.am b/data/Makefile.am
index befd1c9..8c11d9f 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 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/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index d16be29..b450a51 100644
--- 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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]