From bc8dbcbf685e9037ac23c321f5478b2ea398d973 Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Tue, 29 Sep 2026 14:01:46 +0800
Subject: [PATCH] [fix] avoid X11 macro conflict in announcement requests

---
 apps/desktop/src/gui/application/gui_application.cpp | 2 +-
 apps/desktop/src/gui/runtime/announcement_inbox.cpp  | 2 +-
 apps/desktop/src/gui/runtime/announcement_inbox.h    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/desktop/src/gui/application/gui_application.cpp b/apps/desktop/src/gui/application/gui_application.cpp
index babd0dab..fe58f9a0 100644
--- a/apps/desktop/src/gui/application/gui_application.cpp
+++ b/apps/desktop/src/gui/application/gui_application.cpp
@@ -2315,7 +2315,7 @@ void GuiApplication::SyncAnnouncements() {
     announcements_.Configure(params_.signal_server_ip,
                              params_.signal_server_port, client_id_);
   }
-  const auto request = announcements_.NextRequest();
+  const auto request = announcements_.TakePendingRequest();
   if (!request.is_null()) {
     const auto payload = request.dump();
     if (!peer_ || SendSignalMessage(peer_, payload.data(), payload.size()) != 0)
diff --git a/apps/desktop/src/gui/runtime/announcement_inbox.cpp b/apps/desktop/src/gui/runtime/announcement_inbox.cpp
index 93e2606c..4c9e26a6 100644
--- a/apps/desktop/src/gui/runtime/announcement_inbox.cpp
+++ b/apps/desktop/src/gui/runtime/announcement_inbox.cpp
@@ -142,7 +142,7 @@ void AnnouncementInbox::Fail() {
   state_.failed = true;
   ++state_.version;
 }
-nlohmann::json AnnouncementInbox::NextRequest(
+nlohmann::json AnnouncementInbox::TakePendingRequest(
     std::chrono::steady_clock::time_point now) {
   std::lock_guard<std::mutex> lock(mutex_);
   if (!connected_ || scope_.empty()) return nullptr;
diff --git a/apps/desktop/src/gui/runtime/announcement_inbox.h b/apps/desktop/src/gui/runtime/announcement_inbox.h
index 1db53df9..4705cb89 100644
--- a/apps/desktop/src/gui/runtime/announcement_inbox.h
+++ b/apps/desktop/src/gui/runtime/announcement_inbox.h
@@ -35,7 +35,7 @@ class AnnouncementInbox {
   void SetConnected(bool connected);
   void Refresh(int offset = -1);
   bool Read(int64_t id, int64_t revision);
-  nlohmann::json NextRequest(std::chrono::steady_clock::time_point now =
+  nlohmann::json TakePendingRequest(std::chrono::steady_clock::time_point now =
                                  std::chrono::steady_clock::now());
   void Failed(const std::string& request_id);
   void Receive(const nlohmann::json& message);
@@ -63,4 +63,4 @@ class AnnouncementInbox {
 };
 }  // namespace crossdesk
 
-#endif
\ No newline at end of file
+#endif