Merge branch 'upstream' into dev

rabbitgramdesktop · Mar 8, 2024 · 63e7846 · 63e7846
2 parents 36145ef + 2cbc09d
commit 63e7846
Show file tree

Hide file tree

Showing 4 changed files with 238 additions and 195 deletions.
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
@@ -1693,6 +1693,12 @@ else()
         desktop-app::external_glibmm
     )
 
+<<<<<<< HEAD
+=======
+    include(${cmake_helpers_loc}/external/glib/generate_dbus.cmake)
+    generate_dbus(Telegram org.freedesktop.portal. XdpBackground ${third_party_loc}/xdg-desktop-portal/data/org.freedesktop.portal.Background.xml)
+
+>>>>>>> 3d5092f7ad58311fc31424f1aadae0be6134f8c1
     if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
         target_link_libraries(Telegram
         PRIVATE

diff --git a/Telegram/SourceFiles/api/api_sending.cpp b/Telegram/SourceFiles/api/api_sending.cpp
@@ -511,6 +511,7 @@ void SendConfirmedFile(
 			.date = HistoryItem::NewMessageDate(file->to.options),
 			.shortcutId = file->to.options.shortcutId,
 			.postAuthor = messagePostAuthor,
+			.groupedId = groupId,
 		}, caption, media);
 	}