diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/main.vala | 24 | ||||
| -rw-r--r-- | main/src/ui/application.vala | 3 |
2 files changed, 16 insertions, 11 deletions
diff --git a/main/src/main.vala b/main/src/main.vala index dfaa661e..bec2d752 100644 --- a/main/src/main.vala +++ b/main/src/main.vala @@ -4,18 +4,22 @@ using Dino.Ui; namespace Dino { void main(string[] args) { - Gtk.init(ref args); - Dino.Ui.Application app = new Dino.Ui.Application(); - Plugins.Loader loader = new Plugins.Loader(); - foreach(string plugin in new string[]{"omemo", "openpgp"}) { - try { - loader.load(plugin, app); - } catch (Error e) { - print(@"Error loading plugin $plugin: $(e.message)\n"); + try{ + Plugins.Loader loader = new Plugins.Loader(args.length > 0 ? args[0] : null); + Gtk.init(ref args); + Dino.Ui.Application app = new Dino.Ui.Application(); + foreach (string plugin in new string[]{"omemo", "openpgp"}) { + try { + loader.load(plugin, app); + } catch (Error e) { + print(@"Error loading plugin $plugin: $(e.message)\n"); + } } + app.run(args); + loader.shutdown(); + } catch (Error e) { + print(@"Fatal error: $(e.message)\n"); } - app.run(args); - loader.shutdown(); } }
\ No newline at end of file diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala index 1adccf8e..fe930b82 100644 --- a/main/src/ui/application.vala +++ b/main/src/ui/application.vala @@ -11,10 +11,11 @@ public class Dino.Ui.Application : Dino.Application { private ConversationSummary.View? conversation_frame; private ChatInput? chat_input; - public Application() { + public Application() throws Error { Notify.init("dino"); notifications = new Notifications(stream_interaction); notifications.start(); + Environment.set_application_name("Dino"); load_css(); } |