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/call-muc-channel.c | |
| parent | a2a603bdfb12bc9aa80726bf1f822cc22c76917e (diff) | |
| parent | 035a6b0a6e8ce1787abf2583bb918436282026fe (diff) | |
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/call-muc-channel.c')
| -rw-r--r-- | src/call-muc-channel.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/call-muc-channel.c b/src/call-muc-channel.c index 33392e301..f07088f21 100644 --- a/src/call-muc-channel.c +++ b/src/call-muc-channel.c @@ -296,9 +296,7 @@ static void call_muc_do_update (GabbleCallMucChannel *self) { GabbleCallMucChannelPrivate *priv = self->priv; -#ifdef ENABLE_DEBUG MucCallState old = priv->state; -#endif switch (priv->state) { @@ -757,7 +755,7 @@ call_muc_channel_got_participant_presence (GabbleCallMucChannel *self, static void call_muc_channel_presence_cb (WockyMuc *wmuc, WockyStanza *stanza, - GHashTable *code, + guint codes, WockyMucMember *who, gpointer user_data) { @@ -769,7 +767,7 @@ call_muc_channel_presence_cb (WockyMuc *wmuc, static void call_muc_channel_left_cb (GObject *source, WockyStanza *stanza, - GHashTable *code, + guint codes, WockyMucMember *member, const gchar *actor_jid, const gchar *why, @@ -820,7 +818,7 @@ call_muc_channel_update_all_members (GabbleCallMucChannel *self) static void call_muc_channel_joined_cb (WockyMuc *muc, WockyStanza *stanza, - GHashTable *code, + guint codes, gpointer user_data) { GabbleCallMucChannel *self = GABBLE_CALL_MUC_CHANNEL (user_data); @@ -845,7 +843,7 @@ call_muc_channel_pre_presence_cb (WockyMuc *wmuc, static void call_muc_channel_own_presence_cb (WockyMuc *wmuc, WockyStanza *stanza, - GHashTable *code, + guint codes, gpointer user_data) { GabbleCallMucChannel *self = GABBLE_CALL_MUC_CHANNEL (user_data); |