summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Mardegan <mardy@users.sourceforge.net>2008-03-12 12:46:13 +0000
committerAlberto Mardegan <mardy@users.sourceforge.net>2008-03-12 12:46:13 +0000
commitcf51504d1b182c5a35f8a7899a9a005a59b8c5b0 (patch)
tree91dcd9d407bd87f3e9ca96e624c1321aef213de8
parent391ad943d2f10858d107966e5ca6a9725549ac1b (diff)
downloadtelepathy-mission-control-cf51504d1b182c5a35f8a7899a9a005a59b8c5b0.tar.gz
Fix a crash when dispatching a channel to external filters.
Fixes: #1912653, bugs.freedesktop.org#14968. git-svn-id: https://mission-control.svn.sourceforge.net/svnroot/mission-control/trunk@308 d91c8aed-3f2b-0410-a83d-924a1c20a0ba
-rw-r--r--ChangeLog6
-rw-r--r--src/mcd-service.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3eca1dd6..421e0e68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-12 Alberto Mardegan <mardy@users.sourceforge.net>
+
+ * src/mcd-service.c:
+ Fix a crash when dispatching a channel to external filters.
+ Fixes: #1912653, bugs.freedesktop.org#14968.
+
=== telepathy-mission-control 4.63 ===
2008-03-10 Alberto Mardegan <alberto.mardegan@nokia.com>
diff --git a/src/mcd-service.c b/src/mcd-service.c
index 18cd3851..ecf6983e 100644
--- a/src/mcd-service.c
+++ b/src/mcd-service.c
@@ -413,8 +413,8 @@ _on_filter_new_channel (McdDispatcherContext *ctx, DBusGProxy *proxy)
g_debug ("%s: Filtering new channel", __FUNCTION__);
dbus_g_proxy_call_no_reply (proxy, "FilterChannel",
- G_TYPE_STRING, dbus_g_proxy_get_bus_name (DBUS_G_PROXY(tp_conn)),
- DBUS_TYPE_G_OBJECT_PATH, dbus_g_proxy_get_path (DBUS_G_PROXY(tp_conn)),
+ G_TYPE_STRING, TP_PROXY (tp_conn)->bus_name,
+ DBUS_TYPE_G_OBJECT_PATH, TP_PROXY (tp_conn)->object_path,
G_TYPE_STRING, mcd_channel_get_channel_type (channel),
DBUS_TYPE_G_OBJECT_PATH, mcd_channel_get_object_path (channel),
G_TYPE_UINT, mcd_channel_get_handle_type (channel),