Select conversation on startup, placeholder for "No conversation selected", start services before UI

1 files changed, 5 insertions, 20 deletions

diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index e6f01822..e78fa90a 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -13,13 +13,12 @@ public class Dino.Ui.Application : Dino.Application {
         notifications.start();
         Environment.set_application_name("Dino");
         IconTheme.get_default().add_resource_path("/org/dino-im/icons");
-    }
 
-    public override void activate() {
-        create_set_app_menu();
-        window = new UnifiedWindow(this, stream_interaction);
-        window.show_all();
-        restore();
+        activate.connect(() => {
+            create_set_app_menu();
+            window = new UnifiedWindow(this, stream_interaction);
+            window.show();
+        });
     }
 
     private void show_accounts_window() {
@@ -55,19 +54,5 @@ public class Dino.Ui.Application : Dino.Application {
 
         set_app_menu(menu);
     }
-
-    private void restore() {
-        foreach (Account account in db.get_accounts()) {
-            if (account.enabled) add_connection(account);
-        }
-    }
-
-    private void add_connection(Account account) {
-        stream_interaction.connect(account);
-    }
-
-    private void remove_connection(Account account) {
-        stream_interaction.disconnect(account);
-    }
 }