Merge branch 'adapt-upstream-changes'

5 files changed, 12 insertions, 71 deletions

diff --git a/examples/vala/simple-bar/app.in.vala b/examples/vala/simple-bar/app.in.vala
index aece979..b04a1fa 100644
--- a/examples/vala/simple-bar/app.in.vala
+++ b/examples/vala/simple-bar/app.in.vala
@@ -3,7 +3,7 @@ class App : Astal.Application {
 
     public override void request (string msg, SocketConnection conn) {
         print(@"$msg\n");
-        Astal.write_sock.begin(conn, "hello");
+        AstalIO.write_sock.begin(conn, "ok");
     }
 
     public override void activate () {
@@ -14,16 +14,17 @@ class App : Astal.Application {
     }
 
     public static void main(string[] args) {
-        var instance_name = "simple-bar";
+        var instance_name = "vala";
 
         App.instance = new App() {
             instance_name = instance_name
         };
 
-        if (App.instance.acquire_socket()) {
+        try {
+            App.instance.acquire_socket();
             App.instance.run(null);
-        } else {
-            print(Astal.Application.send_message(instance_name, string.joinv(" ", args)));
+        } catch (Error err) {
+            print(AstalIO.send_message(instance_name, string.joinv(" ", args)));
         }
     }
 }
diff --git a/examples/vala/simple-bar/flake.lock b/examples/vala/simple-bar/flake.lock
deleted file mode 100644
index 06f572f..0000000
--- a/examples/vala/simple-bar/flake.lock
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "nodes": {
-    "astal": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1727022015,
-        "narHash": "sha256-ka7aRbReUE6ImjQV8KabMHoojUgb3gtn1/9drMFTtBk=",
-        "owner": "aylur",
-        "repo": "astal",
-        "rev": "8cab7d039e2cf783033a5f1f26cf8be42b0d158e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aylur",
-        "repo": "astal",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1716293225,
-        "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1726937504,
-        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "astal": "astal",
-        "nixpkgs": "nixpkgs_2"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/examples/vala/simple-bar/flake.nix b/examples/vala/simple-bar/flake.nix
index 78bfb62..d13c649 100644
--- a/examples/vala/simple-bar/flake.nix
+++ b/examples/vala/simple-bar/flake.nix
@@ -27,7 +27,8 @@
         ];
 
         buildInputs = [
-          astal.packages.${system}.astal
+          astal.packages.${system}.io
+          astal.packages.${system}.astal3
           astal.packages.${system}.battery
           astal.packages.${system}.wireplumber
           astal.packages.${system}.network
diff --git a/examples/vala/simple-bar/meson.build b/examples/vala/simple-bar/meson.build
index d0ef209..10f5dd2 100644
--- a/examples/vala/simple-bar/meson.build
+++ b/examples/vala/simple-bar/meson.build
@@ -8,7 +8,8 @@ pkgconfig_deps = [
   dependency('gobject-2.0'),
   dependency('gtk+-3.0'),
   dependency('libnm'),
-  dependency('astal-0.1'),
+  dependency('astal-io-0.1'),
+  dependency('astal-3.0'),
   dependency('astal-battery-0.1'),
   dependency('astal-wireplumber-0.1'),
   dependency('astal-network-0.1'),
diff --git a/examples/vala/simple-bar/widget/Bar.vala b/examples/vala/simple-bar/widget/Bar.vala
index 6e99327..17db831 100644
--- a/examples/vala/simple-bar/widget/Bar.vala
+++ b/examples/vala/simple-bar/widget/Bar.vala
@@ -191,7 +191,7 @@ class Battery : Gtk.Box {
 
 class Time : Astal.Label {
     string format;
-    Astal.Time interval;
+    AstalIO.Time interval;
 
     void sync() {
         label = new DateTime.now_local().format(format);
@@ -199,7 +199,7 @@ class Time : Astal.Label {
 
     public Time(string format = "%H:%M - %A %e.") {
         this.format = format;
-        interval = Astal.Time.interval(1000, null);
+        interval = AstalIO.Time.interval(1000, null);
         interval.now.connect(sync);
         destroy.connect(interval.cancel);
         Astal.widget_set_class_names(this, {"Time"});