Merge branch 'master' into osx-functional

src/command/commands.c

@@ -1019,7 +1019,8 @@ cmd_help(ProfWin *window, const char *const command, gchar **args)
 gboolean
 cmd_about(ProfWin *window, const char *const command, gchar **args)
 {
-    ui_about();
+    cons_show("");
+    cons_about();
     return TRUE;
 }
 

src/config/preferences.c

@@ -203,7 +203,6 @@ prefs_free_string(char *pref)
     if (pref) {
         g_free(pref);
     }
-    pref = NULL;
 }
 
 

src/muc.c

@@ -976,6 +976,5 @@ _occupant_free(Occupant *occupant)
         free(occupant->jid);
         free(occupant->status);
         free(occupant);
-        occupant = NULL;
     }
 }

src/ui/buffer.c

@@ -76,7 +76,6 @@ buffer_free(ProfBuff buffer)
 {
     g_slist_free_full(buffer->entries, (GDestroyNotify)_free_entry);
     free(buffer);
-    buffer = NULL;
 }
 
 void

src/ui/core.c

@@ -151,13 +151,6 @@ ui_update(void)
     }
 }
 
-void
-ui_about(void)
-{
-    cons_show("");
-    cons_about();
-}
-
 unsigned long
 ui_get_idle_time(void)
 {

src/ui/inputwin.c

@@ -299,7 +299,7 @@ static int
 _inp_printable(const wint_t ch)
 {
     char bytes[MB_CUR_MAX+1];
-    size_t utf_len = wcrtomb(bytes, ch, NULL);
+    size_t utf_len = wcrtomb(bytes, ch, (mbstate_t*)NULL);
     bytes[utf_len] = '\0';
     gunichar unichar = g_utf8_get_char(bytes);
 

src/ui/ui.h

@@ -230,7 +230,6 @@ void ui_titlebar_presence(contact_presence_t presence);
 void ui_handle_login_account_success(ProfAccount *account, int secured);
 void ui_update_presence(const resource_presence_t resource_presence,
     const char *const message, const char *const show);
-void ui_about(void);
 void ui_statusbar_new(const int win);
 
 char* ui_readline(void);

tests/unittests/helpers.c

@@ -63,6 +63,7 @@ void load_preferences(void **state)
     if (f) {
         prefs_load();
     }
+    fclose(f);
 }
 
 void close_preferences(void **state)

tests/unittests/ui/stub_ui.c

@@ -319,7 +319,6 @@ void ui_titlebar_presence(contact_presence_t presence) {}
 void ui_handle_login_account_success(ProfAccount *account, int secured) {}
 void ui_update_presence(const resource_presence_t resource_presence,
     const char * const message, const char * const show) {}
-void ui_about(void) {}
 void ui_statusbar_new(const int win) {}
 
 char*  ui_readline(void)