aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-19 21:37:03 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-25 16:24:36 +0800
commitdc277e086d67b4e5ae53211229368c1bd7572844 (patch)
tree4bdd141aa02ed3e1d79d1479b61f9d571fe9d54f
parenteaffceb6b4a5ea9d15a0aaa41885b258dcbc0cf2 (diff)
downloadgsoc2013-empathy-dc277e086d67b4e5ae53211229368c1bd7572844.tar
gsoc2013-empathy-dc277e086d67b4e5ae53211229368c1bd7572844.tar.gz
gsoc2013-empathy-dc277e086d67b4e5ae53211229368c1bd7572844.tar.bz2
gsoc2013-empathy-dc277e086d67b4e5ae53211229368c1bd7572844.tar.lz
gsoc2013-empathy-dc277e086d67b4e5ae53211229368c1bd7572844.tar.xz
gsoc2013-empathy-dc277e086d67b4e5ae53211229368c1bd7572844.tar.zst
gsoc2013-empathy-dc277e086d67b4e5ae53211229368c1bd7572844.zip
rename the chat handler to Empathy.Chat
-rw-r--r--data/.gitignore2
-rw-r--r--data/Empathy.Chat.client (renamed from data/Empathy.client)0
-rw-r--r--data/Makefile.am6
-rw-r--r--data/org.freedesktop.Telepathy.Client.Empathy.Chat.service.in3
-rw-r--r--data/org.freedesktop.Telepathy.Client.Empathy.service.in3
-rw-r--r--src/empathy-chat-manager.c2
6 files changed, 8 insertions, 8 deletions
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.client b/data/Empathy.Chat.client
index 3d0bd91fa..3d0bd91fa 100644
--- a/data/Empathy.client
+++ b/data/Empathy.Chat.client
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
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index d16be299d..b450a5198 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 */