From d9b91206c0291fa8aa58df572292784a4f8ff878 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Sat, 28 Oct 2017 22:02:32 +0200
Subject: Keep MUC join dialog open until joined, show errors

---
 main/data/add_conversation/add_groupchat_dialog.ui | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'main/data/add_conversation/add_groupchat_dialog.ui')

diff --git a/main/data/add_conversation/add_groupchat_dialog.ui b/main/data/add_conversation/add_groupchat_dialog.ui
index 1a027200..79c92947 100644
--- a/main/data/add_conversation/add_groupchat_dialog.ui
+++ b/main/data/add_conversation/add_groupchat_dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiAddConversationConferenceAddGroupchatDialog">
+    <template class="DinoUiAddGroupchatDialog">
         <property name="default_width">400</property>
         <property name="modal">True</property>
         <child type="titlebar">
@@ -170,20 +170,6 @@
                                 <property name="height">1</property>
                             </packing>
                         </child>
-                        <child>
-                            <object class="GtkCheckButton" id="autojoin_checkbutton">
-                                <property name="active">False</property>
-                                <property name="label" translatable="yes">Join on startup</property>
-                                <property name="xalign">0</property>
-                                <property name="visible">True</property>
-                            </object>
-                            <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">5</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                            </packing>
-                        </child>
                         <child>
                             <object class="GtkLabel" id="alias_label">
                                 <property name="label" translatable="yes">Alias</property>
@@ -192,7 +178,7 @@
                             </object>
                             <packing>
                                 <property name="left_attach">0</property>
-                                <property name="top_attach">6</property>
+                                <property name="top_attach">5</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                             </packing>
@@ -206,7 +192,7 @@
                             </object>
                             <packing>
                                 <property name="left_attach">1</property>
-                                <property name="top_attach">6</property>
+                                <property name="top_attach">5</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                             </packing>
-- 
cgit v1.2.3-54-g00ecf