From 2832200f399eb46dd533ce3bf3d35ef388a70999 Mon Sep 17 00:00:00 2001
From: Tobias Bernard <tbernard@gnome.org>
Date: Sun, 8 Dec 2024 12:03:21 +0100
Subject: [PATCH 01/15] ui: fix share popover word wrapping

---
 src/window.ui | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/window.ui b/src/window.ui
index 2f4658e..30738b7 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -74,14 +74,18 @@
           <object class="GtkLabel">
             <property name="wrap">True</property>
             <property name="justify">GTK_JUSTIFY_CENTER</property>
-            <property name="max-width-chars">30</property>
+            <property name="max-width-chars">25</property>
             <property name="natural-wrap-mode">GTK_NATURAL_WRAP_WORD</property>
             <property name="label" translatable="true">Give others access to this document by sharing this invite code with them:</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="label" translatable="true">sdf032jbn39aw0y23l0nd9dkeb200b21m289he </property>
+            <property name="wrap">True</property>
+            <property name="wrap-mode">char</property>
+            <property name="justify">GTK_JUSTIFY_CENTER</property>
+            <property name="max-width-chars">25</property>
+            <property name="label" translatable="true">sdf0398p2jbytc6n4wpq339aw0y23l0nd9dk032jbn39accw0y23bl0n78deb200b21m289he </property>
             <style>
               <class name="invite-code" />
               <class name="monospace" />

From e908d3ac695891d059ba457bf9cd82cfaa0f6f95 Mon Sep 17 00:00:00 2001
From: adz <x12@adz.garden>
Date: Sun, 8 Dec 2024 12:26:04 +0100
Subject: [PATCH 02/15] Make channels async

---
 src/network.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/network.rs b/src/network.rs
index c2b00f8..dfc5253 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::sync::mpsc::{Receiver, Sender};
 use std::sync::{Arc, RwLock};
 use std::thread::JoinHandle;
 
@@ -14,6 +13,7 @@ use p2panda_sync::log_sync::LogSyncProtocol;
 use p2panda_sync::{TopicMap, TopicQuery};
 use serde::{Deserialize, Serialize};
 use tokio::runtime::Builder;
+use tokio::sync::mpsc;
 
 #[derive(Clone, Default, Debug, PartialEq, Eq, std::hash::Hash, Serialize, Deserialize)]
 struct TextDocument([u8; 32]);
@@ -78,11 +78,11 @@ impl TopicMap<TextDocument, HashMap<PublicKey, Vec<LogId>>> for TextDocumentStor
     }
 }
 
-pub fn run() -> Result<(Sender<Vec<u8>>, Receiver<Vec<u8>>)> {
-    let (to_network, from_app) = std::sync::mpsc::channel::<Vec<u8>>();
-    let (to_app, from_network) = std::sync::mpsc::channel();
+pub fn run() -> Result<(mpsc::Sender<Vec<u8>>, mpsc::Receiver<Vec<u8>>)> {
+    let (to_network, mut from_app) = mpsc::channel::<Vec<u8>>(512);
+    let (to_app, from_network) = mpsc::channel(512);
 
-    let rt_handle: JoinHandle<Result<()>> = std::thread::spawn(|| {
+    let _rt_handle: JoinHandle<Result<()>> = std::thread::spawn(|| {
         let runtime = Builder::new_current_thread()
             .enable_all()
             .build()
@@ -129,12 +129,12 @@ pub fn run() -> Result<(Sender<Vec<u8>>, Receiver<Vec<u8>>)> {
                     // 3) persist the operation
                     // 4) forward the payload onto the app
 
-                    to_app.send(bytes).expect("can send on channel");
+                    to_app.send(bytes).await.expect("can send on channel");
                 }
             });
 
             tokio::task::spawn(async move {
-                while let Ok(bytes) = from_app.recv() {
+                while let Some(bytes) = from_app.recv().await {
                     println!("New message from app");
 
                     // 1) encode operation

From 5db1001a8b7bd3389053325ad4a937153d291fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Sun, 8 Dec 2024 12:23:40 +0100
Subject: [PATCH 03/15] Send text updates to p2panda

---
 src/application.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/application.rs b/src/application.rs
index 68c79f6..2ba0853 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -32,6 +32,7 @@ use automerge::transaction::Transactable;
 use automerge::ObjType;
 use std::cell::RefCell;
 use automerge::ObjId;
+use tokio::sync::mpsc;
 
 mod imp {
     use super::*;
@@ -40,6 +41,8 @@ mod imp {
     pub struct AardvarkApplication {
         automerge: RefCell<AutoCommit>,
         root: ObjId,
+        tx: mpsc::Sender<Vec<u8>>,
+        rx: mpsc::Receiver<Vec<u8>>,
     }
 
     impl AardvarkApplication {
@@ -47,6 +50,7 @@ mod imp {
             println!("app: {}", text);
             let mut doc = self.automerge.borrow_mut();
             doc.update_text(&self.root, text).unwrap();
+            self.tx.send(doc.save());
         }
     }
 
@@ -60,9 +64,12 @@ mod imp {
             let mut am = AutoCommit::new();
             let root = am.put_object(automerge::ROOT, "root", ObjType::Text).unwrap();
             let automerge = RefCell::new(am);
+            let (tx, rx) = network::run().expect("running p2p backend");
             AardvarkApplication {
                 automerge,
                 root,
+                tx,
+                rx,
             }
         }
     }
@@ -97,8 +104,6 @@ mod imp {
                 window.upcast()
             });
 
-            network::run().expect("running p2p backend");
-
             // Ask the window manager/compositor to present the window
             window.present();
         }

From 632cdea678fa1b08f8b74256c36d254a0e23da44 Mon Sep 17 00:00:00 2001
From: adz <x12@adz.garden>
Date: Sun, 8 Dec 2024 12:49:50 +0100
Subject: [PATCH 04/15] Do not close backend thread prematurely, add shutdown
 signal

---
 src/network.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/network.rs b/src/network.rs
index dfc5253..a9fe0a0 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -13,7 +13,7 @@ use p2panda_sync::log_sync::LogSyncProtocol;
 use p2panda_sync::{TopicMap, TopicQuery};
 use serde::{Deserialize, Serialize};
 use tokio::runtime::Builder;
-use tokio::sync::mpsc;
+use tokio::sync::{mpsc, oneshot};
 
 #[derive(Clone, Default, Debug, PartialEq, Eq, std::hash::Hash, Serialize, Deserialize)]
 struct TextDocument([u8; 32]);
@@ -81,6 +81,7 @@ impl TopicMap<TextDocument, HashMap<PublicKey, Vec<LogId>>> for TextDocumentStor
 pub fn run() -> Result<(mpsc::Sender<Vec<u8>>, mpsc::Receiver<Vec<u8>>)> {
     let (to_network, mut from_app) = mpsc::channel::<Vec<u8>>(512);
     let (to_app, from_network) = mpsc::channel(512);
+    let (shutdown_tx, shutdown_rx) = oneshot::channel::<()>();
 
     let _rt_handle: JoinHandle<Result<()>> = std::thread::spawn(|| {
         let runtime = Builder::new_current_thread()
@@ -145,6 +146,8 @@ pub fn run() -> Result<(mpsc::Sender<Vec<u8>>, mpsc::Receiver<Vec<u8>>)> {
                 }
             });
 
+            shutdown_rx.await?;
+
             Ok(())
         })
     });

From 9e5dd9b1baac74dca0eeb591f5a5b015d53d0d0c Mon Sep 17 00:00:00 2001
From: glyph <glyph@mycelial.technology>
Date: Sun, 8 Dec 2024 11:50:59 +0000
Subject: [PATCH 05/15] Add section with setup steps

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index ed40f6f..663363f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,25 @@
 # Aardvark
 
 MVP local-first text editor :)
+
+## Getting Started
+
+[Builder](https://flathub.org/apps/org.gnome.Builder) (an IDE for GNOME) is
+required to build and run the project. It can be installed with flatpak.
+You can find the documentation [here](https://builder.readthedocs.io/).
+
+1. [Install flatpak](https://flatpak.org/setup/) for your distribution.A
+
+2. Install [Builder](https://flathub.org/apps/org.gnome.Builder) for GNOME:
+
+`flatpak install flathub org.gnome.Builder`
+
+3. Clone the repo:
+
+`git clone git@github.com:p2panda/aardvark.git && cd aardvark`
+
+4. Open the Builder application and navigate to the `aardvark` repo.
+   - You may be prompted to install or update the SDK in Builder.
+
+5. Run the project with `Shift+Ctrl+Space` or click the ► icon (top-middle
+   of the Builder appication).

From 45822846d6e8951e7e300cb93ca7fde3804340c3 Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian@sebastianwick.net>
Date: Sun, 8 Dec 2024 12:52:50 +0100
Subject: [PATCH 06/15] Send updates blocking

---
 src/application.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/application.rs b/src/application.rs
index 2ba0853..0a9de01 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -50,7 +50,9 @@ mod imp {
             println!("app: {}", text);
             let mut doc = self.automerge.borrow_mut();
             doc.update_text(&self.root, text).unwrap();
-            self.tx.send(doc.save());
+            if let Err(e) = self.tx.blocking_send(doc.save()) {
+                println!("{}", e);
+            }
         }
     }
 

From cd3012a6eac036aaefe83400fd8ab09c665f1855 Mon Sep 17 00:00:00 2001
From: glyph <glyph@mycelial.technology>
Date: Sun, 8 Dec 2024 11:56:07 +0000
Subject: [PATCH 07/15] Cleanup

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 663363f..4da26f5 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,11 @@ MVP local-first text editor :)
 
 ## Getting Started
 
-[Builder](https://flathub.org/apps/org.gnome.Builder) (an IDE for GNOME) is
+The [GNOME Builder IDE](https://flathub.org/apps/org.gnome.Builder) is
 required to build and run the project. It can be installed with flatpak.
 You can find the documentation [here](https://builder.readthedocs.io/).
 
-1. [Install flatpak](https://flatpak.org/setup/) for your distribution.A
+1. [Install flatpak](https://flatpak.org/setup/) for your distribution.
 
 2. Install [Builder](https://flathub.org/apps/org.gnome.Builder) for GNOME:
 

From ec00359593b4b3dec5c952b381557ac2cafd3f69 Mon Sep 17 00:00:00 2001
From: glyph <glyph@mycelial.technology>
Date: Sun, 8 Dec 2024 12:00:53 +0000
Subject: [PATCH 08/15] More tweaking

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4da26f5..d4c589e 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ MVP local-first text editor :)
 
 ## Getting Started
 
-The [GNOME Builder IDE](https://flathub.org/apps/org.gnome.Builder) is
+The [GNOME Builder IDE](https://flathub.org/apps/org.gnome.Builder)
+[docs](https://builder.readthedocs.io/) is
 required to build and run the project. It can be installed with flatpak.
-You can find the documentation [here](https://builder.readthedocs.io/).
 
 1. [Install flatpak](https://flatpak.org/setup/) for your distribution.
 
@@ -14,11 +14,11 @@ You can find the documentation [here](https://builder.readthedocs.io/).
 
 `flatpak install flathub org.gnome.Builder`
 
-3. Clone the repo:
+3. Clone the aardvark repo:
 
 `git clone git@github.com:p2panda/aardvark.git && cd aardvark`
 
-4. Open the Builder application and navigate to the `aardvark` repo.
+4. Open the Builder application and navigate to the aardvark repo.
    - You may be prompted to install or update the SDK in Builder.
 
 5. Run the project with `Shift+Ctrl+Space` or click the ► icon (top-middle

From f1dad651ded99e4b1c78230fd3c86a9a0adf301e Mon Sep 17 00:00:00 2001
From: glyph <glyph@mycelial.technology>
Date: Sun, 8 Dec 2024 12:02:32 +0000
Subject: [PATCH 09/15] Link cleanup

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d4c589e..e6991cf 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,7 @@ MVP local-first text editor :)
 
 ## Getting Started
 
-The [GNOME Builder IDE](https://flathub.org/apps/org.gnome.Builder)
-[docs](https://builder.readthedocs.io/) is
+The [GNOME Builder IDE](https://builder.readthedocs.io/) is
 required to build and run the project. It can be installed with flatpak.
 
 1. [Install flatpak](https://flatpak.org/setup/) for your distribution.

From 2af485a1b336f741f7abda0ee0663d0476c109b2 Mon Sep 17 00:00:00 2001
From: Dominic Letz <dominic.letz@berlin.de>
Date: Sun, 8 Dec 2024 13:10:29 +0100
Subject: [PATCH 10/15] Print error description

---
 src/application.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/application.rs b/src/application.rs
index 0a9de01..a32ce64 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -32,7 +32,7 @@ use automerge::transaction::Transactable;
 use automerge::ObjType;
 use std::cell::RefCell;
 use automerge::ObjId;
-use tokio::sync::mpsc;
+use tokio::sync::mpsc::{Receiver, Sender};
 
 mod imp {
     use super::*;
@@ -41,8 +41,8 @@ mod imp {
     pub struct AardvarkApplication {
         automerge: RefCell<AutoCommit>,
         root: ObjId,
-        tx: mpsc::Sender<Vec<u8>>,
-        rx: mpsc::Receiver<Vec<u8>>,
+        tx: Sender<Vec<u8>>,
+        rx: Receiver<Vec<u8>>,
     }
 
     impl AardvarkApplication {
@@ -50,8 +50,9 @@ mod imp {
             println!("app: {}", text);
             let mut doc = self.automerge.borrow_mut();
             doc.update_text(&self.root, text).unwrap();
-            if let Err(e) = self.tx.blocking_send(doc.save()) {
-                println!("{}", e);
+            let ret = self.tx.blocking_send(doc.save());
+            if ret.is_err() {
+                println!("error sending message to network: {:?}", ret.err().unwrap().to_string());
             }
         }
     }

From 7b174d9468807bca145286cfa4b5d10bb5988cc7 Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian@sebastianwick.net>
Date: Sun, 8 Dec 2024 13:18:19 +0100
Subject: [PATCH 11/15] Print received data from the backend

---
 src/application.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/application.rs b/src/application.rs
index a32ce64..29716b2 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -42,7 +42,6 @@ mod imp {
         automerge: RefCell<AutoCommit>,
         root: ObjId,
         tx: Sender<Vec<u8>>,
-        rx: Receiver<Vec<u8>>,
     }
 
     impl AardvarkApplication {
@@ -67,12 +66,19 @@ mod imp {
             let mut am = AutoCommit::new();
             let root = am.put_object(automerge::ROOT, "root", ObjType::Text).unwrap();
             let automerge = RefCell::new(am);
-            let (tx, rx) = network::run().expect("running p2p backend");
+
+            let (tx, mut rx) = network::run().expect("running p2p backend");
+
+            glib::spawn_future_local(async move {
+                while let Some(msg) = rx.recv().await {
+                    println!("got {:?}", msg);
+                }
+            });
+
             AardvarkApplication {
                 automerge,
                 root,
                 tx,
-                rx,
             }
         }
     }

From 96d6d58fa077462e82d271aef1cd4573428ace8c Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian@sebastianwick.net>
Date: Sun, 8 Dec 2024 13:45:52 +0100
Subject: [PATCH 12/15] Send data async

---
 src/application.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/application.rs b/src/application.rs
index 29716b2..022405c 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -49,10 +49,13 @@ mod imp {
             println!("app: {}", text);
             let mut doc = self.automerge.borrow_mut();
             doc.update_text(&self.root, text).unwrap();
-            let ret = self.tx.blocking_send(doc.save());
-            if ret.is_err() {
-                println!("error sending message to network: {:?}", ret.err().unwrap().to_string());
-            }
+            let data = doc.save();
+            let tx = self.tx.clone();
+            glib::spawn_future_local(async move {
+                if let Err(e) = tx.send(data).await {
+                    println!("error sending message to network: {:?}", e.to_string());
+                }
+            });
         }
     }
 

From 44c6d8e9bd127081a367a4d36b86fd15bac0a2d5 Mon Sep 17 00:00:00 2001
From: adz <x12@adz.garden>
Date: Sun, 8 Dec 2024 13:58:12 +0100
Subject: [PATCH 13/15] Make sure shutdown signal sender doesn't get dropped
 too early

---
 src/application.rs | 44 +++++++++++++++++++++++++++-----------------
 src/network.rs     | 26 +++++++++++++++-----------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/src/application.rs b/src/application.rs
index 022405c..33b2541 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -18,21 +18,24 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+use std::cell::RefCell;
+use std::thread::JoinHandle;
+
 use adw::prelude::*;
 use adw::subclass::prelude::*;
-use automerge::AutoCommit;
+use anyhow::Result;
+use automerge::transaction::Transactable;
+use automerge::{AutoCommit, ObjId, ObjType};
 use gettextrs::gettext;
 use gtk::{gio, glib};
+use tokio::sync::mpsc::{Receiver, Sender};
+use tokio::sync::{mpsc, oneshot};
 
 use crate::config::VERSION;
+use crate::glib::closure_local;
+use crate::glib::closure_local;
 use crate::network;
 use crate::AardvarkWindow;
-use crate::glib::closure_local;
-use automerge::transaction::Transactable;
-use automerge::ObjType;
-use std::cell::RefCell;
-use automerge::ObjId;
-use tokio::sync::mpsc::{Receiver, Sender};
 
 mod imp {
     use super::*;
@@ -41,7 +44,8 @@ mod imp {
     pub struct AardvarkApplication {
         automerge: RefCell<AutoCommit>,
         root: ObjId,
-        tx: Sender<Vec<u8>>,
+        backend_shutdown_tx: oneshot::Sender<()>,
+        tx: mpsc::Sender<Vec<u8>>,
     }
 
     impl AardvarkApplication {
@@ -49,13 +53,16 @@ mod imp {
             println!("app: {}", text);
             let mut doc = self.automerge.borrow_mut();
             doc.update_text(&self.root, text).unwrap();
-            let data = doc.save();
-            let tx = self.tx.clone();
-            glib::spawn_future_local(async move {
-                if let Err(e) = tx.send(data).await {
-                    println!("error sending message to network: {:?}", e.to_string());
-                }
-            });
+
+            {
+                let bytes = doc.save();
+                let tx = self.tx.clone();
+                glib::spawn_future_local(async move {
+                    if let Err(e) = tx.send(bytes).await {
+                        println!("{}", e);
+                    }
+                });
+            }
         }
     }
 
@@ -67,10 +74,12 @@ mod imp {
 
         fn new() -> Self {
             let mut am = AutoCommit::new();
-            let root = am.put_object(automerge::ROOT, "root", ObjType::Text).unwrap();
+            let root = am
+                .put_object(automerge::ROOT, "root", ObjType::Text)
+                .unwrap();
             let automerge = RefCell::new(am);
 
-            let (tx, mut rx) = network::run().expect("running p2p backend");
+            let (backend_shutdown_tx, tx, mut rx) = network::run().expect("running p2p backend");
 
             glib::spawn_future_local(async move {
                 while let Some(msg) = rx.recv().await {
@@ -81,6 +90,7 @@ mod imp {
             AardvarkApplication {
                 automerge,
                 root,
+                backend_shutdown_tx,
                 tx,
             }
         }
diff --git a/src/network.rs b/src/network.rs
index a9fe0a0..b7db13b 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -78,18 +78,23 @@ impl TopicMap<TextDocument, HashMap<PublicKey, Vec<LogId>>> for TextDocumentStor
     }
 }
 
-pub fn run() -> Result<(mpsc::Sender<Vec<u8>>, mpsc::Receiver<Vec<u8>>)> {
+pub fn run() -> Result<(
+    oneshot::Sender<()>,
+    mpsc::Sender<Vec<u8>>,
+    mpsc::Receiver<Vec<u8>>,
+)> {
     let (to_network, mut from_app) = mpsc::channel::<Vec<u8>>(512);
     let (to_app, from_network) = mpsc::channel(512);
+
     let (shutdown_tx, shutdown_rx) = oneshot::channel::<()>();
 
-    let _rt_handle: JoinHandle<Result<()>> = std::thread::spawn(|| {
+    std::thread::spawn(move || {
         let runtime = Builder::new_current_thread()
             .enable_all()
             .build()
             .expect("backend runtime ready to spawn tasks");
 
-        runtime.block_on(async {
+        runtime.block_on(async move {
             let network_id = Hash::new(b"aardvark <3");
             let private_key = PrivateKey::new();
 
@@ -102,12 +107,13 @@ pub fn run() -> Result<(mpsc::Sender<Vec<u8>>, mpsc::Receiver<Vec<u8>>)> {
             let mut network = NetworkBuilder::new(*network_id.as_bytes())
                 .sync(sync_config)
                 .private_key(private_key)
-                .discovery(LocalDiscovery::new()?)
+                .discovery(LocalDiscovery::new().unwrap())
                 .build()
-                .await?;
+                .await
+                .unwrap();
 
             let test_document = TextDocument(Hash::new(b"my first doc <3").into());
-            let (topic_tx, mut topic_rx, ready) = network.subscribe(test_document).await?;
+            let (topic_tx, mut topic_rx, ready) = network.subscribe(test_document).await.unwrap();
 
             tokio::task::spawn(async move {
                 while let Some(message) = topic_rx.recv().await {
@@ -146,11 +152,9 @@ pub fn run() -> Result<(mpsc::Sender<Vec<u8>>, mpsc::Receiver<Vec<u8>>)> {
                 }
             });
 
-            shutdown_rx.await?;
-
-            Ok(())
-        })
+            shutdown_rx.await.unwrap();
+        });
     });
 
-    Ok((to_network, from_network))
+    Ok((shutdown_tx, to_network, from_network))
 }

From 8a9231156770947d61e653c6ad8234072fc62452 Mon Sep 17 00:00:00 2001
From: adz <x12@adz.garden>
Date: Sun, 8 Dec 2024 14:03:30 +0100
Subject: [PATCH 14/15] Oups

---
 src/application.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/application.rs b/src/application.rs
index 33b2541..b1e3819 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -33,7 +33,6 @@ use tokio::sync::{mpsc, oneshot};
 
 use crate::config::VERSION;
 use crate::glib::closure_local;
-use crate::glib::closure_local;
 use crate::network;
 use crate::AardvarkWindow;
 

From a17507032478bde19d7e94a6812e6d67819e3fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Sun, 8 Dec 2024 14:17:15 +0100
Subject: [PATCH 15/15] Add set_text() API on the window to update the text
 view

---
 src/window.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/window.rs b/src/window.rs
index 8577784..ec5b4b1 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -88,4 +88,10 @@ impl AardvarkWindow {
             .property("application", application)
             .build()
     }
+
+    pub fn set_text(&self, text: &str) {
+        let window = self.imp();
+        let buffer = window.text_view.buffer();
+        buffer.set_text(text);
+    }
 }