diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-02-29 15:36:48 -0500 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-02-29 15:36:48 -0500 |
| commit | a7f90f99a38181ab05353296f0c7b6eaf3b664f4 (patch) | |
| tree | 704ff382234b2d1d54a90b4c4da001b13a18d6f6 /src/im-manager.c | |
| parent | a842971ca3c1aa11c3495fd88ddcad89eee321c0 (diff) | |
| parent | 5a78e81a093ed320f1a3ed4a3018fefd60bc6f46 (diff) | |
| download | telepathy-salut-a7f90f99a38181ab05353296f0c7b6eaf3b664f4.tar.gz | |
Merge branch 'cleanups'
Diffstat (limited to 'src/im-manager.c')
| -rw-r--r-- | src/im-manager.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/im-manager.c b/src/im-manager.c index 01b1489c..e0f6bf18 100644 --- a/src/im-manager.c +++ b/src/im-manager.c @@ -35,6 +35,7 @@ #include <telepathy-glib/dbus.h> #include <telepathy-glib/gtypes.h> #include <telepathy-glib/interfaces.h> +#include <telepathy-glib/base-channel.h> #define DEBUG_FLAG DEBUG_IM #include "debug.h" @@ -554,10 +555,11 @@ salut_im_manager_new_channel (SalutImManager *mgr, chan = g_object_new (SALUT_TYPE_IM_CHANNEL, "connection", priv->connection, "contact", contact, - "object-path", path, "handle", handle, "initiator-handle", initiator, + "requested", (handle != initiator), NULL); + tp_base_channel_register ((TpBaseChannel *) chan); g_object_unref (contact); g_free (path); g_hash_table_insert (priv->channels, GUINT_TO_POINTER (handle), chan); |