From c9347d8e9b55c0c95f48411fbd08ae63bb8e11b0 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Wed, 6 Sep 2023 19:07:41 +0200
Subject: [PATCH] fix warnings

---
 src/portals/Screencopy.cpp      | 30 +++---------------------------
 src/shared/ScreencopyShared.hpp |  3 +++
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/portals/Screencopy.cpp b/src/portals/Screencopy.cpp
index 46f61b4..e4c8857 100644
--- a/src/portals/Screencopy.cpp
+++ b/src/portals/Screencopy.cpp
@@ -280,30 +280,6 @@ static const hyprland_toplevel_export_frame_v1_listener hyprlandFrameListener =
 
 // --------------------------------------------------------- //
 
-static void onCloseRequest(sdbus::MethodCall& call, CScreencopyPortal::SSession* sess) {
-    Debug::log(TRACE, "[screencopy] Close Request {}", (void*)sess);
-
-    if (!sess || !sess->request)
-        return;
-
-    auto r = call.createReply();
-    r.send();
-
-    sess->request.release();
-}
-
-static void onCloseSession(sdbus::MethodCall& call, CScreencopyPortal::SSession* sess) {
-    Debug::log(TRACE, "[screencopy] Close Session {}", (void*)sess);
-
-    if (!sess || !sess->session)
-        return;
-
-    auto r = call.createReply();
-    r.send();
-
-    sess->session.release();
-}
-
 void CScreencopyPortal::onCreateSession(sdbus::MethodCall& call) {
     sdbus::ObjectPath requestHandle, sessionHandle;
 
@@ -445,8 +421,8 @@ void CScreencopyPortal::onSelectSources(sdbus::MethodCall& call) {
                 if (windowHandle != 0 || !windowClass.empty()) {
                     if (windowHandle != 0) {
                         for (auto& h : g_pPortalManager->m_sHelpers.toplevel->m_vToplevels) {
-                            if (h->handle == windowHandle) {
-                                restoreData.windowHandle = h->handle;
+                            if ((uint64_t)h->handle == windowHandle) {
+                                restoreData.windowHandle = (uint64_t)h->handle;
                                 Debug::log(LOG, "[screencopy] token v3 window found by handle {}", (void*)windowHandle);
                                 break;
                             }
@@ -457,7 +433,7 @@ void CScreencopyPortal::onSelectSources(sdbus::MethodCall& call) {
                         // try class
                         for (auto& h : g_pPortalManager->m_sHelpers.toplevel->m_vToplevels) {
                             if (h->windowClass == windowClass) {
-                                restoreData.windowHandle = h->handle;
+                                restoreData.windowHandle = (uint64_t)h->handle;
                                 Debug::log(LOG, "[screencopy] token v3 window found by class {}", windowClass);
                                 break;
                             }
diff --git a/src/shared/ScreencopyShared.hpp b/src/shared/ScreencopyShared.hpp
index 0ae48dd..d626da6 100644
--- a/src/shared/ScreencopyShared.hpp
+++ b/src/shared/ScreencopyShared.hpp
@@ -4,6 +4,8 @@
 #include <cstdint>
 extern "C" {
 #include <spa/pod/builder.h>
+
+#undef SPA_VERSION_POD_BUILDER_CALLBACKS
 #define SPA_VERSION_POD_BUILDER_CALLBACKS .version = 0
 #include <spa/buffer/meta.h>
 #include <spa/utils/result.h>
@@ -11,6 +13,7 @@ extern "C" {
 #include <spa/param/format-utils.h>
 #include <spa/param/video/format-utils.h>
 #include <spa/pod/dynamic.h>
+#undef SPA_VERSION_POD_BUILDER_CALLBACKS
 #define SPA_VERSION_POD_BUILDER_CALLBACKS 0
 }
 #include <wayland-client.h>