eion/purple-hangouts

Clear out 'mood' message when clearing out status message
draft
2017-04-01, Eion Robb
9f02a61d3df4
Parents 658a936219b0
Children 43d593e040d0
Clear out 'mood' message when clearing out status message
Fixes issue #130
1 files changed, 10 insertions(+), 12 deletions(-)
  • +10 -12
    hangouts_conversation.c
    • --- a/hangouts_conversation.c Mon Mar 13 22:13:45 2017 +1300
    +++ b/hangouts_conversation.c Sat Apr 01 22:32:36 2017 +1300
    @@ -2025,20 +2025,18 @@
    //has message?
    mood_setting__init(&mood_setting);
    + mood_message__init(&mood_message);
    + mood_content__init(&mood_content);
    +
    message = purple_status_get_attr_string(status, "message");
    - if (message != NULL) {
    - mood_message__init(&mood_message);
    - mood_content__init(&mood_content);
    -
    - if (*message) {
    - segments = hangouts_convert_html_to_segments(ha, message, &n_segments);
    - mood_content.segment = segments;
    - mood_content.n_segment = n_segments;
    - }
    -
    - mood_message.mood_content = &mood_content;
    - mood_setting.mood_message = &mood_message;
    + if (message && *message) {
    + segments = hangouts_convert_html_to_segments(ha, message, &n_segments);
    + mood_content.segment = segments;
    + mood_content.n_segment = n_segments;
    }
    +
    + mood_message.mood_content = &mood_content;
    + mood_setting.mood_message = &mood_message;
    request.mood_setting = &mood_setting;
    hangouts_pblite_set_presence(ha, &request, (HangoutsPbliteSetPresenceResponseFunc)hangouts_default_response_dump, NULL);