Added preferences for showing resource in titlebar and messages

4 files changed, 18 insertions, 3 deletions

diff --git a/src/ui/console.c b/src/ui/console.c
index 3d3a5d8b..52ccf990 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -841,6 +841,19 @@ cons_beep_setting(void)
 }
 
 void
+cons_resource_setting(void)
+{
+    if (prefs_get_boolean(PREF_RESOURCE_TITLE))
+        cons_show("Resource title (/resource)    : ON");
+    else
+        cons_show("Resource title (/resource)    : OFF");
+    if (prefs_get_boolean(PREF_RESOURCE_MESSAGE))
+        cons_show("Message title (/resource)     : ON");
+    else
+        cons_show("Message title (/resource)     : OFF");
+}
+
+void
 cons_wrap_setting(void)
 {
     if (prefs_get_boolean(PREF_WRAP))
@@ -991,6 +1004,7 @@ cons_show_ui_prefs(void)
     cons_splash_setting();
     cons_wrap_setting();
     cons_time_setting();
+    cons_resource_setting();
     cons_vercheck_setting();
     cons_mouse_setting();
     cons_statuses_setting();
diff --git a/src/ui/core.c b/src/ui/core.c
index 08f45fb5..4866a8f2 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -341,10 +341,10 @@ ui_incoming_msg(const char * const barejid, const char * const resource, const c
             g_string_append(user, barejid);
         }
     } else {
-        g_string_append(user,barejid);
+        g_string_append(user, barejid);
     }
 
-    if (resource) {
+    if (resource && prefs_get_boolean(PREF_RESOURCE_MESSAGE)) {
         g_string_append(user, "/");
         g_string_append(user, resource);
     }
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 21e904ac..326dbf8b 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -316,7 +316,7 @@ _show_contact_presence(ProfChatWin *chatwin)
     } else if (session && session->resource) {
         resource = session->resource;
     }
-    if (resource) {
+    if (resource && prefs_get_boolean(PREF_RESOURCE_TITLE)) {
         wprintw(win, "/");
         wprintw(win, resource);
     }
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 08d67ec6..0056b7af 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -286,6 +286,7 @@ void cons_show_received_subs(void);
 void cons_show_sent_subs(void);
 void cons_alert(void);
 void cons_theme_setting(void);
+void cons_resource_setting(void);
 void cons_privileges_setting(void);
 void cons_beep_setting(void);
 void cons_flash_setting(void);