mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-08-30 22:16:14 +00:00
Use some APIs from newer glibmm
This commit is contained in:
@@ -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));
|
||||
|
||||
|
@@ -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" \
|
||||
|
Submodule Telegram/lib_base updated: 7afbe96f01...986a867f85
Reference in New Issue
Block a user