From b1a3d09ca6a4be59b57e2f7b1cdc8a245d60a858 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 14 Mar 2014 22:40:56 +0100
Subject: use conference subject to identiy room

---
 res/layout/otr_fingerprint.xml | 1 -
 res/xml/preferences.xml        | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml
index 28b6a5558..666dadcd1 100644
--- a/res/layout/otr_fingerprint.xml
+++ b/res/layout/otr_fingerprint.xml
@@ -10,7 +10,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="20sp"
-        android:textStyle="bold"
         android:typeface="monospace"
         android:text="@string/no_otr_fingerprint"/>
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index f47439c84..904ea07e0 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -49,5 +49,10 @@
             android:title="Use Phones self contact picture"
             android:summary="You may no longer be able to distinguish which account you are using in a conversation"
             android:defaultValue="true"/>
+        <CheckBoxPreference 
+            android:key="use_subject_in_muc"
+            android:title="Conference Name"
+            android:summary="Use room’s subject to identify Conferences"
+            android:defaultValue="true"/>
     </PreferenceCategory>
 </PreferenceScreen>
-- 
cgit v1.2.3