From 87e768f0e3e2c6207341e1f705306b904d9f6378 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 23 Sep 2019 09:36:25 +0200 Subject: [PATCH] Userland: Unbreak "copy" and "paste" after GEventLoop removal Have these programs instantiate a GApplication to ensure they get a connection to the WindowServer, otherwise the clipboard will not work. Sorry Sergey! :^) --- Userland/copy.cpp | 8 +++++--- Userland/paste.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Userland/copy.cpp b/Userland/copy.cpp index 2887bec3fc..ca92102ae4 100644 --- a/Userland/copy.cpp +++ b/Userland/copy.cpp @@ -1,8 +1,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -86,10 +86,12 @@ Options parse_options(int argc, char* argv[]) int main(int argc, char* argv[]) { - Options options = parse_options(argc, argv); + GApplication app(argc, argv); - CEventLoop loop; + Options options = parse_options(argc, argv); GClipboard& clipboard = GClipboard::the(); clipboard.set_data(options.data, options.type); + + return 0; } diff --git a/Userland/paste.cpp b/Userland/paste.cpp index 947463dd37..78c91e4ced 100644 --- a/Userland/paste.cpp +++ b/Userland/paste.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include @@ -62,9 +62,9 @@ Options parse_options(int argc, char* argv[]) int main(int argc, char* argv[]) { - Options options = parse_options(argc, argv); + GApplication app(argc, argv); - CEventLoop loop; + Options options = parse_options(argc, argv); GClipboard& clipboard = GClipboard::the(); auto data_and_type = clipboard.data_and_type(); @@ -78,4 +78,6 @@ int main(int argc, char* argv[]) } else { printf("%s\n", data_and_type.type.characters()); } + + return 0; }