diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt index 20f2447a3a9..5639dd0125c 100644 --- a/Userland/Utilities/CMakeLists.txt +++ b/Userland/Utilities/CMakeLists.txt @@ -139,7 +139,7 @@ target_link_libraries(mount LibMain) target_link_libraries(nc LibMain) target_link_libraries(netstat LibMain) target_link_libraries(nl LibMain) -target_link_libraries(notify LibGUI) +target_link_libraries(notify LibGUI LibMain) target_link_libraries(nproc LibMain) target_link_libraries(open LibDesktop) target_link_libraries(pape LibGUI) diff --git a/Userland/Utilities/notify.cpp b/Userland/Utilities/notify.cpp index aaec57a8bc6..62b78458824 100644 --- a/Userland/Utilities/notify.cpp +++ b/Userland/Utilities/notify.cpp @@ -8,10 +8,11 @@ #include #include #include +#include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - auto app = GUI::Application::construct(argc, argv); + auto app = TRY(GUI::Application::try_create(arguments)); Core::ArgsParser args_parser; const char* title = nullptr; @@ -20,18 +21,13 @@ int main(int argc, char** argv) args_parser.add_positional_argument(title, "Title of the notification", "title"); args_parser.add_positional_argument(message, "Message to display in the notification", "message"); args_parser.add_positional_argument(icon_path, "Path of icon to display in the notification", "icon-path", Core::ArgsParser::Required::No); - args_parser.parse(argc, argv); + args_parser.parse(arguments); - auto notification = GUI::Notification::construct(); + auto notification = TRY(GUI::Notification::try_create()); notification->set_text(message); notification->set_title(title); if (icon_path) { - ErrorOr> icon_or_error = Gfx::Bitmap::try_load_from_file(icon_path); - if (icon_or_error.is_error()) { - warnln("Failed to load icon: {}", icon_or_error.error()); - return 1; - } - notification->set_icon(icon_or_error.release_value()); + notification->set_icon(TRY(Gfx::Bitmap::try_load_from_file(icon_path))); } notification->show();