Merge remote-tracking branch 'asdil12/tray_config'

src/ui/console.c

@@ -1182,6 +1182,15 @@ cons_flash_setting(void)
         cons_show("Terminal flash (/flash)             : OFF");
 }
 
+void
+cons_tray_setting(void)
+{
+    if (prefs_get_boolean(PREF_TRAY))
+        cons_show("Tray icon (/tray)                   : ON");
+    else
+        cons_show("Tray icon (/tray)                   : OFF");
+}
+
 void
 cons_splash_setting(void)
 {
@@ -1611,6 +1620,7 @@ cons_show_desktop_prefs(void)
     cons_show("Desktop notification preferences:");
     cons_show("");
     cons_notify_setting();
+    cons_tray_setting();
 
     cons_alert();
 }

src/ui/ui.h

@@ -284,6 +284,7 @@ void cons_privileges_setting(void);
 void cons_beep_setting(void);
 void cons_console_setting(void);
 void cons_flash_setting(void);
+void cons_tray_setting(void);
 void cons_splash_setting(void);
 void cons_encwarn_setting(void);
 void cons_tlsshow_setting(void);