Remove room legacy names

briar-gtk/briar_gtk/containers/main_window.py

@@ -31,8 +31,8 @@ class MainWindowContainer(Container):
         return self.builder.get_object("main_window_leaflet")
 
     @property
-    def room_name_label(self):
-        return self.builder.get_object("room_name")
+    def contact_name_label(self):
+        return self.builder.get_object("contact_name")
 
     @property
     def contacts_list_box(self):
@@ -79,7 +79,7 @@ class MainWindowContainer(Container):
         self.chat_placeholder.show()
         self._clear_history_container()
         self.contacts_list_box.unselect_all()
-        self.room_name_label.set_text("")
+        self.contact_name_label.set_text("")
 
     def _prepare_chat_view(self, contact_name):
         if self._no_chat_opened():
@@ -90,7 +90,7 @@ class MainWindowContainer(Container):
         self.chat_view.show()
         self.main_window_leaflet.set_visible_child(
             self.main_content_container)
-        self.room_name_label.set_text(contact_name)
+        self.contact_name_label.set_text(contact_name)
 
     def _setup_private_chat_widget(self, contact_name, contact_id):
         private_chat_widget = PrivateChatContainer(contact_name, contact_id)
@@ -123,7 +123,7 @@ class MainWindowContainer(Container):
 
         self._setup_main_window_stack()
         self._setup_headerbar_stack_holder()
-        self.room_name_label.set_text("")
+        self.contact_name_label.set_text("")
 
     def _setup_main_window_stack(self):
         main_window_stack = self.builder.get_object("main_window_stack")

briar-gtk/data/ui/main_window.ui

@@ -92,7 +92,6 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkBox">
-                    <property name="name">room</property>
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkBox">
@@ -297,7 +296,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkHeaderBar" id="room_header_bar"> <!--right titlebar-->
+              <object class="GtkHeaderBar" id="chat_header_bar"> <!--right titlebar-->
                 <property name="show-close-button">True</property>
                 <property name="has-subtitle">False</property>
                 <property name="hexpand">true</property>
@@ -343,15 +342,13 @@
                     <property name="propagate_natural_height">True</property>
                     <property name="propagate_natural_width">False</property>
                     <child>
-                      <object class="GtkBox" id="room_info">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <child>
-                          <object class="GtkLabel" id="room_name">
+                          <object class="GtkLabel" id="contact_name">
                             <property name="can_focus">False</property>
-                            <!-- Translators: This string is replaced not user-visible -->
-                            <property name="label">Room name</property>
                             <property name="ellipsize">end</property>
                             <style>
                               <class name="title"/>
@@ -459,7 +456,7 @@
     <property name="mode">horizontal</property>
     <widgets>
       <widget name="main_content_container"/>
-      <widget name="room_header_bar"/>
+      <widget name="chat_header_bar"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
@@ -472,7 +469,7 @@
   <object class="HdyHeaderGroup">
     <headerbars>
       <headerbar name="left-header"/>
-      <headerbar name="room_header_bar"/>
+      <headerbar name="chat_header_bar"/>
     </headerbars>
   </object>
 </interface>