diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-11-12 19:02:41 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-11-12 19:02:41 +0800 |
| commit | 6813535e6591f6714c1a4edd6ae22d65eb726ad0 (patch) | |
| tree | b3584047e187c3e03b60163d9dc82ede7444a673 /src | |
| parent | 0caebce32692700cd26c25b4ddd83a182273da3c (diff) | |
| download | gsoc2013-empathy-6813535e6591f6714c1a4edd6ae22d65eb726ad0.tar gsoc2013-empathy-6813535e6591f6714c1a4edd6ae22d65eb726ad0.tar.gz gsoc2013-empathy-6813535e6591f6714c1a4edd6ae22d65eb726ad0.tar.bz2 gsoc2013-empathy-6813535e6591f6714c1a4edd6ae22d65eb726ad0.tar.lz gsoc2013-empathy-6813535e6591f6714c1a4edd6ae22d65eb726ad0.tar.xz gsoc2013-empathy-6813535e6591f6714c1a4edd6ae22d65eb726ad0.tar.zst gsoc2013-empathy-6813535e6591f6714c1a4edd6ae22d65eb726ad0.zip | |
Don't use the same bus name for filter and chandler programs.
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.
svn path=/trunk/; revision=431
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-chandler.c | 4 | ||||
| -rw-r--r-- | src/empathy-call.chandler | 4 | ||||
| -rw-r--r-- | src/empathy-chat-chandler.c | 4 | ||||
| -rw-r--r-- | src/empathy-chat.chandler | 4 | ||||
| -rw-r--r-- | src/org.gnome.Empathy.Call.service.in | 2 | ||||
| -rw-r--r-- | src/org.gnome.Empathy.Chat.service.in | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/empathy-call-chandler.c b/src/empathy-call-chandler.c index 8833bcbcc..3a1b51137 100644 --- a/src/empathy-call-chandler.c +++ b/src/empathy-call-chandler.c @@ -39,8 +39,8 @@ #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, diff --git a/src/empathy-call.chandler b/src/empathy-call.chandler index 190494d3c..88ad9e747 100644 --- a/src/empathy-call.chandler +++ b/src/empathy-call.chandler @@ -1,5 +1,5 @@ [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 diff --git a/src/empathy-chat-chandler.c b/src/empathy-chat-chandler.c index c178f7b72..2064f16d6 100644 --- a/src/empathy-chat-chandler.c +++ b/src/empathy-chat-chandler.c @@ -45,8 +45,8 @@ #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, diff --git a/src/empathy-chat.chandler b/src/empathy-chat.chandler index 4cfe75b01..7de2f28d6 100644 --- a/src/empathy-chat.chandler +++ b/src/empathy-chat.chandler @@ -1,5 +1,5 @@ [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 diff --git a/src/org.gnome.Empathy.Call.service.in b/src/org.gnome.Empathy.Call.service.in index 9262dc7bf..1c4b95fb4 100644 --- a/src/org.gnome.Empathy.Call.service.in +++ b/src/org.gnome.Empathy.Call.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.gnome.Empathy.Call +Name=org.gnome.Empathy.CallChandler Exec=@libexecdir@/empathy-call-chandler diff --git a/src/org.gnome.Empathy.Chat.service.in b/src/org.gnome.Empathy.Chat.service.in index 89031f3dc..291e95f96 100644 --- a/src/org.gnome.Empathy.Chat.service.in +++ b/src/org.gnome.Empathy.Chat.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.gnome.Empathy.Chat +Name=org.gnome.Empathy.ChatChandler Exec=@libexecdir@/empathy-chat-chandler |