From d9e45071d0d3cd5a7a162908267c98c6366038bf Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Fri, 12 Apr 2019 16:24:43 +0200
Subject: Only use UI data for active converations cycling, clean up
 ConversationSelector

---
 main/data/conversation_selector/view.ui | 15 ---------------
 main/data/unified_main_content.ui       |  9 ++++++++-
 2 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 main/data/conversation_selector/view.ui

(limited to 'main/data')

diff --git a/main/data/conversation_selector/view.ui b/main/data/conversation_selector/view.ui
deleted file mode 100644
index c5560ad1..00000000
--- a/main/data/conversation_selector/view.ui
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-    <template class="DinoUiConversationSelectorView">
-        <property name="can_focus">True</property>
-        <property name="expand">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-            <object class="GtkScrolledWindow" id="scrolled">
-                <property name="expand">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="visible">True</property>
-            </object>
-        </child>
-    </template>
-</interface>
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
index b2f3a891..0fde37e8 100644
--- a/main/data/unified_main_content.ui
+++ b/main/data/unified_main_content.ui
@@ -5,8 +5,15 @@
         <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <child>
-            <object class="DinoUiConversationSelectorView" id="conversation_list">
+            <object class="GtkScrolledWindow" id="scrolled">
+                <property name="expand">True</property>
+                <property name="hscrollbar_policy">never</property>
                 <property name="visible">True</property>
+                <child>
+                    <object class="DinoUiConversationSelectorList" id="conversation_list">
+                        <property name="visible">True</property>
+                    </object>
+                </child>
             </object>
             <packing>
                 <property name="resize">False</property>
-- 
cgit v1.2.3-70-g09d2