void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-16 14:17:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use some APIs from newer glibmm

Browse source
This commit is contained in:
Ilya Fedin 2022-11-02 18:52:43 +04:00 • committed by John Preston
parent 41192e5acd
commit ba9f5d138a
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
View file

@ -122,8 +122,6 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
}
});
const auto fdList = Gio::UnixFDList::create();
fdList->append(fd);
auto outFdList = Glib::RefPtr<Gio::UnixFDList>();
connection->call_sync(
@ -132,7 +130,7 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
"OpenFile",
Glib::VariantContainerBase::create_tuple({
Glib::Variant<Glib::ustring>::create(parentWindowId),
Glib::wrap(g_variant_new_handle(0)),
Glib::Variant<int>::create_handle(0),
Glib::Variant<std::map<
Glib::ustring,
Glib::VariantBase
@ -151,7 +149,7 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
},
}),
}),
fdList,
Gio::UnixFDList::create(std::vector<int>{ fd }),
outFdList,
std::string(base::Platform::XDP::kService));

5
Telegram/build/docker/centos_env/Dockerfile
View file

@ -53,7 +53,7 @@ ENV CXXFLAGS $CFLAGS
FROM builder AS patches
RUN git clone {{ GIT }}/desktop-app/patches.git \
&& cd patches \
&& git checkout 355c563138 \
&& git checkout c95e7f1bb7 \
&& rm -rf .git
FROM builder AS nasm
@ -655,8 +655,7 @@ FROM patches AS glibmm
COPY --link --from=mm-common {{ LibrariesPath }}/mm-common-cache /
COPY --link --from=libsigcplusplus {{ LibrariesPath }}/libsigcplusplus-cache /
# equals to glib version of Ubuntu 14.04
RUN git clone -b 2.40.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \
RUN git clone -b 2.56.1 --depth=1 {{ GIT }}/GNOME/glibmm.git \
&& cd glibmm \
&& git apply ../patches/glibmm.patch \
&& export ACLOCAL_PATH="/usr/local/share/aclocal" \

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 7afbe96f015c6facea90de1af5d61eac3389f308
Subproject commit 986a867f85716843eafbef6e2ae0820ea30d6cfc