muc-channel: take WockyMuc object as first signal cb arg

Makes Tartan happier.

1 files changed, 16 insertions, 19 deletions

diff --git a/src/muc-channel.c b/src/muc-channel.c
index 78f79c74d..2df7b319d 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -267,12 +267,12 @@ static void handle_fill_presence (WockyMuc *muc,
     WockyStanza *stanza,
     gpointer user_data);
 
-static void handle_renamed (GObject *source,
+static void handle_renamed (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     gpointer data);
 
-static void handle_error (GObject *source,
+static void handle_error (WockyMuc *muc,
     WockyStanza *stanza,
     WockyXmppErrorType errtype,
     const GError *error,
@@ -283,7 +283,7 @@ static void handle_join (WockyMuc *muc,
     guint codes,
     gpointer data);
 
-static void handle_parted (GObject *source,
+static void handle_parted (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     const gchar *actor_jid,
@@ -291,7 +291,7 @@ static void handle_parted (GObject *source,
     const gchar *msg,
     gpointer data);
 
-static void handle_left (GObject *source,
+static void handle_left (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     WockyMucMember *who,
@@ -300,13 +300,13 @@ static void handle_left (GObject *source,
     const gchar *msg,
     gpointer data);
 
-static void handle_presence (GObject *source,
+static void handle_presence (WockyMuc *source,
     WockyStanza *stanza,
     guint codes,
     WockyMucMember *who,
     gpointer data);
 
-static void handle_perms (GObject *source,
+static void handle_perms (WockyMuc *source,
     WockyStanza *stanza,
     GHashTable *code,
     const gchar *actor,
@@ -314,7 +314,7 @@ static void handle_perms (GObject *source,
     gpointer data);
 
 /* signatures for message handlers */
-static void handle_message (GObject *source,
+static void handle_message (WockyMuc *muc,
     WockyStanza *stanza,
     WockyMucMsgType type,
     const gchar *xmpp_id,
@@ -325,7 +325,7 @@ static void handle_message (GObject *source,
     WockyMucMsgState state,
     gpointer data);
 
-static void handle_errmsg (GObject *source,
+static void handle_errmsg (WockyMuc *muc,
     WockyStanza *stanza,
     WockyMucMsgType type,
     const gchar *xmpp_id,
@@ -1883,7 +1883,7 @@ update_permissions (GabbleMucChannel *chan)
 
 /* connect to wocky-muc:SIG_PRESENCE_ERROR */
 static void
-handle_error (GObject *source,
+handle_error (WockyMuc *muc,
     WockyStanza *stanza,
     WockyXmppErrorType errtype,
     const GError *error,
@@ -2358,7 +2358,7 @@ muc_status_codes_to_change_reason (guint codes)
 /* connect to wocky-muc:SIG_PARTED, which we will receive when the MUC tells *
  * us that we have left the channel                                          */
 static void
-handle_parted (GObject *source,
+handle_parted (WockyMuc *wmuc,
     WockyStanza *stanza,
     guint codes,
     const gchar *actor_jid,
@@ -2366,7 +2366,6 @@ handle_parted (GObject *source,
     const gchar *msg,
     gpointer data)
 {
-  WockyMuc *wmuc = WOCKY_MUC (source);
   GabbleMucChannel *gmuc = GABBLE_MUC_CHANNEL (data);
   TpBaseChannel *base = TP_BASE_CHANNEL (gmuc);
   GabbleMucChannelPrivate *priv = gmuc->priv;
@@ -2429,7 +2428,7 @@ handle_parted (GObject *source,
 /* connect to wocky-muc:SIG_LEFT, which we will receive when the MUC informs *
  * us someone [else] has left the channel                                    */
 static void
-handle_left (GObject *source,
+handle_left (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     WockyMucMember *who,
@@ -2482,14 +2481,13 @@ handle_left (GObject *source,
 /* connect to wocky-muc:SIG_PERM_CHANGE, which we will receive when the *
  * MUC informs us our role/affiliation has been altered                 */
 static void
-handle_perms (GObject *source,
+handle_perms (WockyMuc *wmuc,
     WockyStanza *stanza,
     GHashTable *code,
     const gchar *actor,
     const gchar *why,
     gpointer data)
 {
-  WockyMuc *wmuc = WOCKY_MUC (source);
   GabbleMucChannel *gmuc = GABBLE_MUC_CHANNEL (data);
   GabbleMucChannelPrivate *priv = gmuc->priv;
   TpHandle myself = TP_GROUP_MIXIN (gmuc)->self_handle;
@@ -2542,12 +2540,11 @@ handle_fill_presence (WockyMuc *muc,
 /* connect to wocky-muc:SIG_NICK_CHANGE, which we will receive when the *
  * MUC informs us our nick has been changed for some reason             */
 static void
-handle_renamed (GObject *source,
+handle_renamed (WockyMuc *wmuc,
     WockyStanza *stanza,
     guint codes,
     gpointer data)
 {
-  WockyMuc *wmuc = WOCKY_MUC (source);
   GabbleMucChannel *gmuc = GABBLE_MUC_CHANNEL (data);
   TpBaseChannel *base = TP_BASE_CHANNEL (gmuc);
   TpHandleRepoIface *contact_repo =
@@ -2683,7 +2680,7 @@ handle_join (WockyMuc *muc,
 /* connect to wocky-muc:SIG_PRESENCE, which is fired for presences that are *
  * NOT our own after the initial roster has been received:                  */
 static void
-handle_presence (GObject *source,
+handle_presence (WockyMuc *muc,
     WockyStanza *stanza,
     guint codes,
     WockyMucMember *who,
@@ -2755,7 +2752,7 @@ handle_presence (GObject *source,
 /* message signal handlers */
 
 static void
-handle_message (GObject *source,
+handle_message (WockyMuc *muc,
     WockyStanza *stanza,
     WockyMucMsgType type,
     const gchar *xmpp_id,
@@ -2844,7 +2841,7 @@ handle_message (GObject *source,
 }
 
 static void
-handle_errmsg (GObject *source,
+handle_errmsg (WockyMuc *muc,
     WockyStanza *stanza,
     WockyMucMsgType type,
     const gchar *xmpp_id,