From 270e7e119ccc2e49b5ff1af99cd1761698cd471c Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Thu, 16 Nov 2023 16:16:14 +0100
Subject: [PATCH] Update quasar

---
 flake.lock                                           | 6 +++---
 quasar-wayland/src/Quasar/Wayland/Client/XdgShell.hs | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6964bd3..7501b51 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,11 +21,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1700099359,
-        "narHash": "sha256-2/zFR7d8TrA+jf30186Wyuel00Zy0u73ZlWhryk2pcI=",
+        "lastModified": 1700147410,
+        "narHash": "sha256-4j4UzRFbhVCfhPDfCy7CPmvln++wxKreE4HfKJTg+p4=",
         "owner": "queezle42",
         "repo": "quasar",
-        "rev": "1d07e2e18c3834f3095ee045bb775260f4fe23ee",
+        "rev": "ff01c2032a9db04e8d9b200747be5db4616cdd49",
         "type": "github"
       },
       "original": {
diff --git a/quasar-wayland/src/Quasar/Wayland/Client/XdgShell.hs b/quasar-wayland/src/Quasar/Wayland/Client/XdgShell.hs
index bb3e123..4c898dc 100644
--- a/quasar-wayland/src/Quasar/Wayland/Client/XdgShell.hs
+++ b/quasar-wayland/src/Quasar/Wayland/Client/XdgShell.hs
@@ -22,7 +22,7 @@ module Quasar.Wayland.Client.XdgShell (
 import Quasar.Observable.Core (attachSimpleObserver)
 import Quasar.Prelude
 import Quasar.Resources (Disposable (getDisposer), TSimpleDisposer)
-import Quasar.Resources.DisposableTVar
+import Quasar.Resources.DisposableVar
 import Quasar.Wayland.Client
 import Quasar.Wayland.Client.Surface
 import Quasar.Wayland.Protocol
@@ -49,7 +49,7 @@ data ClientXdgToplevelState b = ClientXdgToplevelState {
   configurationAccumulator :: TVar WindowConfiguration
 }
 
-newtype ClientXdgToplevel b = ClientXdgToplevel (DisposableTVar (ClientXdgToplevelState b))
+newtype ClientXdgToplevel b = ClientXdgToplevel (DisposableVar (ClientXdgToplevelState b))
 
 instance ClientBufferBackend b => IsWindow b (ClientXdgToplevel b) where
   setFullscreen w fullscreen =
@@ -70,7 +70,7 @@ disposeClientXdgToplevel state = do
   -- TODO do we have to release a buffer?
 
 withState :: MonadSTMc NoRetry '[] m => ClientXdgToplevel b -> (ClientXdgToplevelState b -> m ()) -> m ()
-withState (ClientXdgToplevel var) action = tryReadDisposableTVar var >>= mapM_ action
+withState (ClientXdgToplevel var) action = tryReadDisposableVar var >>= mapM_ action
 
 
 
@@ -142,7 +142,7 @@ newClientXdgToplevel ClientWindowManager{client, wlXdgWmBase} properties configu
     propertiesDisposer
   }
 
-  ClientXdgToplevel <$> newDisposableTVar state disposeClientXdgToplevel
+  ClientXdgToplevel <$> newDisposableVar state disposeClientXdgToplevel
 
 commitClientXdgToplevel :: forall b. ClientBufferBackend b => ClientXdgToplevel b -> ConfigureSerial -> SurfaceCommit b -> STMc NoRetry '[SomeException] ()
 commitClientXdgToplevel toplevel configureSerial surfaceCommit = do