3 files changed, 9 insertions, 23 deletions
diff --git a/src/ui/console.c b/src/ui/console.c
index bda808c7..e9d089de 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1170,18 +1170,7 @@ cons_show_ui_prefs(void)
 void
 cons_notify_setting(void)
 {
-    gboolean notify_enabled = FALSE;
-#ifdef HAVE_OSXNOTIFY
-    notify_enabled = TRUE;
-#endif
-#ifdef HAVE_LIBNOTIFY
-    notify_enabled = TRUE;
-#endif
-#ifdef PLATFORM_CYGWIN
-    notify_enabled = TRUE;
-#endif
-
-    if (notify_enabled) {
+    if (is_notify_enabled()) {
         if (prefs_get_boolean(PREF_NOTIFY_MESSAGE))
             cons_show("Messages (/notify message)          : ON");
         else
diff --git a/src/ui/core.c b/src/ui/core.c
index 3fda21e8..68cbbae9 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -2586,12 +2586,9 @@ ui_handle_room_configuration_form_error(const char * const roomjid, const char *
 void
 ui_handle_room_config_submit_result(const char * const roomjid)
 {
-    ProfWin *muc_window = NULL;
-    ProfWin *form_window = NULL;
-    int num;
-
     if (roomjid) {
-        muc_window = (ProfWin*)wins_get_muc(roomjid);
+        ProfWin *form_window = NULL;
+        ProfWin *muc_window = (ProfWin*)wins_get_muc(roomjid);
 
         GString *form_recipient = g_string_new(roomjid);
         g_string_append(form_recipient, " config");
@@ -2599,7 +2596,7 @@ ui_handle_room_config_submit_result(const char * const roomjid)
         g_string_free(form_recipient, TRUE);
 
         if (form_window) {
-            num = wins_get_num(form_window);
+            int num = wins_get_num(form_window);
             wins_close_by_num(num);
         }
 
@@ -2620,10 +2617,9 @@ void
 ui_handle_room_config_submit_result_error(const char * const roomjid, const char * const message)
 {
     ProfWin *console = wins_get_console();
-    ProfWin *muc_window = NULL;
-    ProfWin *form_window = NULL;
-
     if (roomjid) {
+        ProfWin *muc_window = NULL;
+        ProfWin *form_window = NULL;
         muc_window = (ProfWin*)wins_get_muc(roomjid);
 
         GString *form_recipient = g_string_new(roomjid);
diff --git a/src/ui/window.c b/src/ui/window.c
index 8579b02f..82073b40 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -471,12 +471,12 @@ win_clear(ProfWin *window)
 void
 win_resize(ProfWin *window)
 {
-    int subwin_cols = 0;
     int cols = getmaxx(stdscr);
 
     if (window->layout->type == LAYOUT_SPLIT) {
         ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
         if (layout->subwin) {
+            int subwin_cols = 0;
             if (window->type == WIN_CONSOLE) {
                 subwin_cols = win_roster_cols();
             } else if (window->type == WIN_MUC) {
@@ -506,11 +506,11 @@ win_update_virtual(ProfWin *window)
 {
     int rows, cols;
     getmaxyx(stdscr, rows, cols);
-    int subwin_cols = 0;
 
     if (window->layout->type == LAYOUT_SPLIT) {
         ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
         if (layout->subwin) {
+            int subwin_cols = 0;
             if (window->type == WIN_MUC) {
                 subwin_cols = win_occpuants_cols();
             } else {
@@ -905,6 +905,7 @@ win_vprint(ProfWin *window, const char show_char, int pad_indent, GDateTime *tim
     g_string_vprintf(fmt_msg, message, arg);
     win_print(window, show_char, pad_indent, timestamp, flags, theme_item, from, fmt_msg->str);
     g_string_free(fmt_msg, TRUE);
+    va_end(arg);
 }
 
 void