Reduce GTK dependency to 3.16, fix dark theme

20 files changed, 3 insertions, 22 deletions

diff --git a/main/data/add_conversation/add_contact_dialog.ui b/main/data/add_conversation/add_contact_dialog.ui
index 58c13e7f..1ac2745c 100644
--- a/main/data/add_conversation/add_contact_dialog.ui
+++ b/main/data/add_conversation/add_contact_dialog.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiAddConversationChatAddContactDialog">
         <property name="default_width">300</property>
         <property name="modal">True</property>
diff --git a/main/data/add_conversation/add_groupchat_dialog.ui b/main/data/add_conversation/add_groupchat_dialog.ui
index c6390374..4c58ed89 100644
--- a/main/data/add_conversation/add_groupchat_dialog.ui
+++ b/main/data/add_conversation/add_groupchat_dialog.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiAddConversationConferenceAddGroupchatDialog">
         <property name="default_width">400</property>
         <property name="modal">True</property>
diff --git a/main/data/add_conversation/conference_details_fragment.ui b/main/data/add_conversation/conference_details_fragment.ui
index 403d9a94..c9431728 100644
--- a/main/data/add_conversation/conference_details_fragment.ui
+++ b/main/data/add_conversation/conference_details_fragment.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiAddConversationConferenceConferenceDetailsFragment">
         <property name="visible">True</property>
         <child>
diff --git a/main/data/add_conversation/list_row.ui b/main/data/add_conversation/list_row.ui
index 8f011bb8..9b662412 100644
--- a/main/data/add_conversation/list_row.ui
+++ b/main/data/add_conversation/list_row.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiAddConversationListRow" parent="GtkListBoxRow">
         <property name="visible">True</property>
         <child>
diff --git a/main/data/add_conversation/select_jid_fragment.ui b/main/data/add_conversation/select_jid_fragment.ui
index 612f1597..6384edb0 100644
--- a/main/data/add_conversation/select_jid_fragment.ui
+++ b/main/data/add_conversation/select_jid_fragment.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiAddConversationSelectJidFragment">
         <property name="height_request">500</property>
         <property name="width_request">460</property>
diff --git a/main/data/conversation_list_titlebar.ui b/main/data/conversation_list_titlebar.ui
index 6a5996df..6be6ffc7 100644
--- a/main/data/conversation_list_titlebar.ui
+++ b/main/data/conversation_list_titlebar.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiConversationListTitlebar" parent="GtkHeaderBar">
         <property name="hexpand">False</property>
         <property name="visible">True</property>
diff --git a/main/data/conversation_selector/chat_row_tooltip.ui b/main/data/conversation_selector/chat_row_tooltip.ui
index 90fbd712..6596cd62 100644
--- a/main/data/conversation_selector/chat_row_tooltip.ui
+++ b/main/data/conversation_selector/chat_row_tooltip.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <object class="GtkBox" id="main_box">
         <property name="orientation">vertical</property>
         <property name="visible">True</property>
diff --git a/main/data/conversation_selector/conversation_row.ui b/main/data/conversation_selector/conversation_row.ui
index 5f8498e9..a932ed85 100644
--- a/main/data/conversation_selector/conversation_row.ui
+++ b/main/data/conversation_selector/conversation_row.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiConversationSelectorConversationRow">
         <property name="visible">True</property>
         <style>
diff --git a/main/data/conversation_selector/view.ui b/main/data/conversation_selector/view.ui
index 4bac39bc..0dd2d00f 100644
--- a/main/data/conversation_selector/view.ui
+++ b/main/data/conversation_selector/view.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiConversationSelectorView">
         <property name="can_focus">True</property>
         <property name="width_request">40</property>
diff --git a/main/data/conversation_summary/message_item.ui b/main/data/conversation_summary/message_item.ui
index f21b4969..eac97279 100644
--- a/main/data/conversation_summary/message_item.ui
+++ b/main/data/conversation_summary/message_item.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiConversationSummaryMergedMessageItem">
         <property name="hexpand">True</property>
         <property name="column-spacing">7</property>
diff --git a/main/data/conversation_summary/view.ui b/main/data/conversation_summary/view.ui
index 74fb507e..88905268 100644
--- a/main/data/conversation_summary/view.ui
+++ b/main/data/conversation_summary/view.ui
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiConversationSummaryView">
         <property name="expand">True</property>
         <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">0</property>
         <child>
             <object class="GtkScrolledWindow" id="scrolled">
                 <property name="visible">True</property>
diff --git a/main/data/conversation_titlebar.ui b/main/data/conversation_titlebar.ui
index e173bdf3..30779079 100644
--- a/main/data/conversation_titlebar.ui
+++ b/main/data/conversation_titlebar.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiConversationTitlebar" parent="GtkHeaderBar">
         <property name="title"></property>
         <property name="hexpand">True</property>
diff --git a/main/data/manage_accounts/account_row.ui b/main/data/manage_accounts/account_row.ui
index ab700daa..154c7ae4 100644
--- a/main/data/manage_accounts/account_row.ui
+++ b/main/data/manage_accounts/account_row.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiManageAccountsAccountRow">
         <property name="visible">True</property>
         <child>
diff --git a/main/data/manage_accounts/add_account_dialog.ui b/main/data/manage_accounts/add_account_dialog.ui
index dd5264f1..c38f624a 100644
--- a/main/data/manage_accounts/add_account_dialog.ui
+++ b/main/data/manage_accounts/add_account_dialog.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiManageAccountsAddAccountDialog">
         <property name="default_width">300</property>
         <property name="modal">True</property>
diff --git a/main/data/menu_encryption.ui b/main/data/menu_encryption.ui
index 216bdd92..7aae53ee 100644
--- a/main/data/menu_encryption.ui
+++ b/main/data/menu_encryption.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.20"/>
+    <requires lib="gtk+" version="3.16"/>
     <object class="GtkPopoverMenu" id="menu_encryption">
         <property name="can_focus">False</property>
         <child>
diff --git a/main/data/occupant_list.ui b/main/data/occupant_list.ui
index deb4716e..60fb2dac 100644
--- a/main/data/occupant_list.ui
+++ b/main/data/occupant_list.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiOccupantList">
         <property name="visible">True</property>
         <child>
diff --git a/main/data/occupant_list_item.ui b/main/data/occupant_list_item.ui
index aabe8a05..34f4107f 100644
--- a/main/data/occupant_list_item.ui
+++ b/main/data/occupant_list_item.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiOccupantListRow" parent="GtkListBoxRow">
         <property name="visible">True</property>
         <child>
diff --git a/main/data/settings_dialog.ui b/main/data/settings_dialog.ui
index 3b939216..51619c29 100644
--- a/main/data/settings_dialog.ui
+++ b/main/data/settings_dialog.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiSettingsDialog">
         <property name="modal">True</property>
         <property name="visible">True</property>
diff --git a/main/data/style.css b/main/data/style.css
deleted file mode 100644
index d143ffd3..00000000
--- a/main/data/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-scrolledwindow {
-    background-color: white;
-}
\ No newline at end of file
diff --git a/main/data/unified_window.ui b/main/data/unified_window.ui
index 289c00cf..5ae01493 100644
--- a/main/data/unified_window.ui
+++ b/main/data/unified_window.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <requires lib="gtk+" version="3.0"/>
     <template class="DinoUiWindow">
         <property name="default-width">1200</property>
         <property name="default-height">700</property>