procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Use unique_ptr for GtkSelectionData

Browse source
This commit is contained in:
Ilya Fedin 2021-07-08 20:10:13 +04:00 committed by John Preston
parent 75090dedaa
commit 2c6e4eed19
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp
View file

@ -68,6 +68,16 @@ constexpr auto kIntrospectionXML = R"INTROSPECTION(<node>
</interface>
</node>)INTROSPECTION"_cs;
struct GtkSelectionDataDeleter {
void operator()(GtkSelectionData *gsel) {
if (gsel) {
gtk_selection_data_free(gsel);
}
}
};
using GtkSelectionDataPointer = std::unique_ptr<GtkSelectionData, GtkSelectionDataDeleter>;
Glib::ustring ServiceName;
bool GetImageFromClipboardSupported() {
@ -96,11 +106,11 @@ std::vector<uchar> GetImageFromClipboard() {
gdk_atom_intern("image/bmp", true),
};
const auto gsel = [&]() -> GtkSelectionData* {
const auto gsel = [&]() -> GtkSelectionDataPointer {
for (const auto &format : supportedFormats) {
if (const auto result = gtk_clipboard_wait_for_contents(
clipboard,
format); gtk_selection_data_get_length(result) > 0) {
if (auto result = GtkSelectionDataPointer(
gtk_clipboard_wait_for_contents(clipboard, format))
; gtk_selection_data_get_length(result.get()) > 0) {
return result;
}
}
@ -111,12 +121,8 @@ std::vector<uchar> GetImageFromClipboard() {
return {};
}
const auto guard = gsl::finally([&] {
gtk_selection_data_free(gsel);
});
const auto data = gtk_selection_data_get_data(gsel);
const auto length = gtk_selection_data_get_length(gsel);
const auto data = gtk_selection_data_get_data(gsel.get());
const auto length = gtk_selection_data_get_length(gsel.get());
return std::vector<uchar>(data, data + length);
}