+ if (e != NULL)
+ {
+ if (error != NULL)
+ *error = e;
+ else
+ g_error_free (e);
+
+ return FALSE;
+ }

should be

if (e != NULL)
  {
    g_propagate_error (error, e);
    return FALSE;
  }

Also, wocky_jingle_state_machine_dance() should ideally return boolean, although I assume it isn't API anyway.

(In reply to comment #1)
> + if (e != NULL)
> + {
> + if (error != NULL)
> + *error = e;
> + else
> + g_error_free (e);
> +
> + return FALSE;
> + }
> 
> should be
> 
> if (e != NULL)
>   {
>     g_propagate_error (error, e);
>     return FALSE;
>   }

Oh yeah I forgot about this API; thanks.

(In reply to comment #2)
> Also, wocky_jingle_state_machine_dance() should ideally return boolean,
> although I assume it isn't API anyway.

You're right that's better; done.

Branch has been updated.

Looks good

Merged thanks.