diff options
| author | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2010-08-27 13:37:28 +0300 |
|---|---|---|
| committer | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2010-08-27 13:38:22 +0300 |
| commit | b80fdcb30fb9f37eeb042beade15e862f5d0b14c (patch) | |
| tree | c161196c6c84884ceacc881e1036fcf23e91f701 /src | |
| parent | 1cc6e028594f0d4a7e662bfb42f3a53b7b2cb77a (diff) | |
| parent | fa3ba5a5dd2b58e978e023a47093942516ab19c6 (diff) | |
Merge branch 'reject-with-extreme-prejudice' into master
Conflicts:
configure.ac
Diffstat (limited to 'src')
| -rw-r--r-- | src/debug.c | 2 | ||||
| -rw-r--r-- | src/sip-media-channel.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/debug.c b/src/debug.c index 5d5bec6..dc20fa5 100644 --- a/src/debug.c +++ b/src/debug.c @@ -80,7 +80,7 @@ debug_flag_to_domain (TpsipDebugFlags flag) flag_to_domains = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); - for (i = 0; tpsip_debug_keys[i].value; i++) + for (i = 0; i < G_N_ELEMENTS(tpsip_debug_keys); i++) { GDebugKey key = (GDebugKey) tpsip_debug_keys[i]; gchar *val; diff --git a/src/sip-media-channel.c b/src/sip-media-channel.c index 242c5a5..c6d6df5 100644 --- a/src/sip-media-channel.c +++ b/src/sip-media-channel.c @@ -1798,6 +1798,7 @@ tpsip_media_channel_remove_with_reason (GObject *obj, TpGroupMixin *mixin = TP_GROUP_MIXIN (obj); TpIntSet *set = NULL; TpHandle self_handle; + gboolean rejected; self_handle = mixin->self_handle; @@ -1818,6 +1819,9 @@ tpsip_media_channel_remove_with_reason (GObject *obj, return FALSE; } + rejected = (handle == self_handle + && tp_handle_set_is_member (mixin->local_pending, handle)); + /* We have excluded all the problem cases. * Now we always want to remove both members on behalf of the local user */ set = tp_intset_new (); @@ -1831,8 +1835,7 @@ tpsip_media_channel_remove_with_reason (GObject *obj, self_handle, 0); tp_intset_destroy (set); - if (handle == self_handle - && tp_handle_set_is_member (mixin->local_pending, handle)) + if (rejected) { /* The user has rejected the call */ |