diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-09-16 16:31:03 +0200 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-09-16 16:31:03 +0200 |
| commit | 6aae5708e84425b101cf17f43baf9bb500dce943 (patch) | |
| tree | 793afde9dee677b4a6f9291d5e6240d7a800bc16 | |
| parent | e5d9e6c15a3b2a647387613c63398866510b0d35 (diff) | |
| parent | 9d18668df1f73ee797fa29e304b02373e21c9f1f (diff) | |
Merge branch 'master' of git+ssh://git.collabora.co.uk/git/telepathy-salut
| -rw-r--r-- | src/salut-tubes-manager.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c index 00e9743e..e4c529dc 100644 --- a/src/salut-tubes-manager.c +++ b/src/salut-tubes-manager.c @@ -208,7 +208,7 @@ iq_tube_request_filter (SalutXmppConnectionManager *xcm, static gboolean extract_tube_information (TpHandleRepoIface *contact_repo, GibberXmppStanza *stanza, - gboolean *close, + gboolean *close_out, TpTubeType *type, TpHandle *initiator_handle, const gchar **service, @@ -271,9 +271,9 @@ extract_tube_information (TpHandleRepoIface *contact_repo, } _close = (close_node != NULL); - if (close != NULL) + if (close_out != NULL) { - *close = _close; + *close_out = _close; } if (tube_id != NULL) @@ -390,7 +390,7 @@ iq_tube_request_cb (SalutXmppConnectionManager *xcm, GHashTable *parameters; guint tube_id; guint portnum = 0; - gboolean close; + gboolean close_; GError *error = NULL; SalutTubesChannel *chan; @@ -398,7 +398,7 @@ iq_tube_request_cb (SalutXmppConnectionManager *xcm, /* after this point, the message is for us, so in all cases we either handle * it or send an error reply */ - if (!extract_tube_information (contact_repo, stanza, &close, &tube_type, + if (!extract_tube_information (contact_repo, stanza, &close_, &tube_type, &initiator_handle, &service, ¶meters, &tube_id, &portnum, &error)) { @@ -417,7 +417,7 @@ iq_tube_request_cb (SalutXmppConnectionManager *xcm, chan = g_hash_table_lookup (priv->tubes_channels, GUINT_TO_POINTER (initiator_handle)); - if (close) + if (close_) { if (chan != NULL) { |