Settings dialog: Fix account subpage for Adwaita < 1.4, other fixes

fixes #1592

5 files changed, 7 insertions, 6 deletions

diff --git a/main/data/gresource.xml b/main/data/gresource.xml
index 30d0e288..ddf7ccf9 100644
--- a/main/data/gresource.xml
+++ b/main/data/gresource.xml
@@ -11,6 +11,7 @@
     <file>chat_input.ui</file>
     <file>conversation_content_view/item_metadata_header.ui</file>
     <file>conversation_content_view/view.ui</file>
+    <file>conversation_details.css</file>
     <file>conversation_details.ui</file>
     <file>conversation_item_widget.ui</file>
     <file>conversation_list_titlebar.ui</file>
diff --git a/main/data/preferences_window_account.ui b/main/data/preferences_window_account.ui
index 4280422d..e0fa4f76 100644
--- a/main/data/preferences_window_account.ui
+++ b/main/data/preferences_window_account.ui
@@ -4,11 +4,10 @@
   <template class="DinoUiAccountPreferencesSubpage">
     <property name="orientation">vertical</property>
     <child>
-      <object class="AdwHeaderBar">
+      <object class="AdwHeaderBar" id="headerbar">
         <style>
           <class name="flat"/>
         </style>
-        <property name="show-title">False</property>
         <child>
           <object class="GtkButton" id="back_button">
             <property name="icon-name">go-previous-symbolic</property>
diff --git a/main/src/ui/main_window_controller.vala b/main/src/ui/main_window_controller.vala
index 7a3ebcb2..2e270663 100644
--- a/main/src/ui/main_window_controller.vala
+++ b/main/src/ui/main_window_controller.vala
@@ -69,7 +69,7 @@ public class MainWindowController : Object {
             dialog.set_transient_for(app.get_active_window());
             dialog.present();
         });
-        window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("accounts", null); });
+        window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("preferences", null); });
         window.conversation_selector.conversation_selected.connect((conversation) => select_conversation(conversation));
 
 //        ConversationListModel list_model = new ConversationListModel(stream_interactor);
diff --git a/main/src/windows/preferences_window/account_preferences_subpage.vala b/main/src/windows/preferences_window/account_preferences_subpage.vala
index 462fc8e1..01cf5584 100644
--- a/main/src/windows/preferences_window/account_preferences_subpage.vala
+++ b/main/src/windows/preferences_window/account_preferences_subpage.vala
@@ -8,6 +8,7 @@ using Gdk;
 [GtkTemplate (ui = "/im/dino/Dino/preferences_window_account.ui")]
 public class Dino.Ui.AccountPreferencesSubpage : Gtk.Box {
 
+    [GtkChild] public unowned Adw.HeaderBar headerbar;
     [GtkChild] public unowned Button back_button;
     [GtkChild] public unowned AvatarPicture avatar;
     [GtkChild] public unowned Adw.ActionRow xmpp_address;
@@ -30,6 +31,9 @@ public class Dino.Ui.AccountPreferencesSubpage : Gtk.Box {
     private ulong alias_entry_changed = 0;
 
     construct {
+#if Adw_1_4
+        headerbar.show_title = false;
+#endif
         button_container.layout_manager = new NaturalDirectionBoxLayout((BoxLayout)button_container.layout_manager);
         back_button.clicked.connect(() => {
             var window = (Adw.PreferencesWindow) this.get_root();
diff --git a/plugins/omemo/CMakeLists.txt b/plugins/omemo/CMakeLists.txt
index 9e290390..a8920d72 100644
--- a/plugins/omemo/CMakeLists.txt
+++ b/plugins/omemo/CMakeLists.txt
@@ -39,9 +39,6 @@ if(Adwaita_VERSION VERSION_GREATER_EQUAL "1.2")
     set(OMEMO_DEFINITIONS ${OMEMO_DEFINITIONS} Adw_1_2)
 endif()
 
-message(STATUS ${Adwaita_VERSION})
-message(STATUS ${Adw_1_2})
-
 vala_precompile(OMEMO_VALA_C
 SOURCES
     src/dtls_srtp_verification_draft.vala