diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-01-26 13:09:47 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-01-26 13:09:47 +0000 |
| commit | e142bebe3e112d715af2b4784b24730eb9c310a0 (patch) | |
| tree | 594393ed618bf82b4600f61c624de58ad3340ca1 /src/bytestream-factory.c | |
| parent | a2a603bdfb12bc9aa80726bf1f822cc22c76917e (diff) | |
| parent | 035a6b0a6e8ce1787abf2583bb918436282026fe (diff) | |
| download | telepathy-gabble-e142bebe3e112d715af2b4784b24730eb9c310a0.tar.gz | |
Merge branch 'master' into BYE-BYE-LOUDMOUTH
Conflicts:
src/connection.c
src/connection.h
src/ft-manager.c
src/jingle-content.c
src/jingle-factory.c
src/jingle-session.c
src/message-util.c
src/muc-channel.c
src/muc-channel.h
Diffstat (limited to 'src/bytestream-factory.c')
| -rw-r--r-- | src/bytestream-factory.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c index 64696f79b..57d8509a0 100644 --- a/src/bytestream-factory.c +++ b/src/bytestream-factory.c @@ -26,6 +26,7 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> #include <loudmouth/loudmouth.h> +#include <wocky/wocky-utils.h> #include <telepathy-glib/interfaces.h> #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM @@ -679,16 +680,16 @@ gabble_bytestream_factory_dispose (GObject *object) priv->iq_socks5_cb, LM_MESSAGE_TYPE_IQ); lm_message_handler_unref (priv->iq_socks5_cb); - g_hash_table_destroy (priv->ibb_bytestreams); + g_hash_table_unref (priv->ibb_bytestreams); priv->ibb_bytestreams = NULL; - g_hash_table_destroy (priv->muc_bytestreams); + g_hash_table_unref (priv->muc_bytestreams); priv->muc_bytestreams = NULL; - g_hash_table_destroy (priv->socks5_bytestreams); + g_hash_table_unref (priv->socks5_bytestreams); priv->socks5_bytestreams = NULL; - g_hash_table_destroy (priv->multiple_bytestreams); + g_hash_table_unref (priv->multiple_bytestreams); priv->multiple_bytestreams = NULL; proxies = g_slist_concat (priv->socks5_proxies, @@ -1150,7 +1151,7 @@ bytestream_factory_iq_si_cb (LmMessageHandler *handler, { /* jid is not a muc jid so we need contact's resource */ - if (!gabble_decode_jid (from, NULL, NULL, &peer_resource)) + if (!wocky_decode_jid (from, NULL, NULL, &peer_resource)) { DEBUG ("Got an SI IQ response from a bad JID. Ignoring."); goto out; @@ -1272,11 +1273,13 @@ bytestream_factory_iq_si_cb (LmMessageHandler *handler, si_tube_received (self, msg, si, bytestream, peer_handle, room_handle, stream_id); } +#ifdef ENABLE_FILE_TRANSFER else if (!tp_strdiff (profile, NS_FILE_TRANSFER)) { gabble_ft_manager_handle_si_request (priv->conn->ft_manager, bytestream, peer_handle, stream_id, msg); } +#endif else { GError e = { WOCKY_SI_ERROR, WOCKY_SI_ERROR_BAD_PROFILE, "" }; @@ -2081,7 +2084,7 @@ streaminit_reply_cb (GabbleConnection *conn, { /* jid is not a muc jid so we need contact's resource */ - if (!gabble_decode_jid (from, NULL, NULL, &peer_resource)) + if (!wocky_decode_jid (from, NULL, NULL, &peer_resource)) { DEBUG ("Got an SI request with a bad JID"); goto END; |