Merge branch 'master' into pgp

2015-05-04 23:40:58 +01:00
parent 176fba84a0 6f3750c6aa
commit 3fd9692aec
35 changed files with 643 additions and 643 deletions
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -115,14 +115,14 @@ prof_handle_idle(void)
        GSList *recipients = ui_get_chat_recipients();
        GSList *curr = recipients;

-        while (curr != NULL) {
+        while (curr) {
            char *barejid = curr->data;
            ProfChatWin *chatwin = wins_get_chat(barejid);
            chat_state_handle_idle(chatwin->barejid, chatwin->state);
            curr = g_slist_next(curr);
        }

-        if (recipients != NULL) {
+        if (recipients) {
            g_slist_free(recipients);
        }
    }