Bug 79550

Summary: Fix some clang/tartan errors
Product: Wocky Reporter: Guillaume Desmottes <guillaume.desmottes>
Component: GeneralAssignee: Telepathy bugs list <telepathy-bugs>
Status: RESOLVED FIXED QA Contact: Telepathy bugs list <telepathy-bugs>
Severity: normal    
Priority: medium Keywords: patch
Version: unspecified   
Hardware: Other   
OS: All   
URL: http://cgit.collabora.com/git/user/cassidy/wocky/log/?h=tartan
Whiteboard:
i915 platform: i915 features:

Comment 1 Simon McVittie 2014-06-03 10:58:39 UTC 
+ 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;
  }
Comment 2 Simon McVittie 2014-06-03 10:59:18 UTC 
Also, wocky_jingle_state_machine_dance() should ideally return boolean, although I assume it isn't API anyway.
Comment 3 Guillaume Desmottes 2014-06-03 11:29:42 UTC 
(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.
Comment 4 Simon McVittie 2014-06-03 14:39:43 UTC 
Looks good
Comment 5 Guillaume Desmottes 2014-06-03 14:41:30 UTC 
Merged thanks.

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.