Make compile

.github/workflows/main.yml

@@ -24,9 +24,8 @@ jobs:
  - name: Install Dependencies
  run: |
  apt update
- apt install -y libgala-dev libgee-0.8-dev libglib2.0-dev libgranite-dev libgtk-3-dev libhandy-1-dev libcanberra-dev
  apt install -y libcloudproviders-dev libdbus-glib-1-dev libnotify-dev libpango1.0-dev libplank-dev
- apt install -y libsqlite3-dev libunity-dev libzeitgeist-2.0-dev policykit-1 libgit2-glib-1.0-dev
+ apt install -y libgala-dev libgee-0.8-dev libglib2.0-dev libgranite-7-dev libgtk-4-dev libadwaita-1-dev libcanberra-dev libsqlite3-dev
  apt install -y meson valac
  - name: Build
  env:

README.md

@@ -16,9 +16,9 @@ You'll need the following dependencies:
 * libgee-0.8-dev
 * libgit2-glib-1.0-dev
 * libglib2.0-dev
-* libgranite-dev >= 6.1.0
-* libgtk-3-dev
-* libhandy-1-dev >= 0.83.0
+* libgranite-7-dev
+* libgtk-4-dev
+* libadwaita-1-dev
 * libnotify-dev
 * libpango1.0-dev
 * libplank-dev

filechooser-portal/ExternalWindow.vala

@@ -20,7 +20,7 @@
  */
 
 public interface ExternalWindow : GLib.Object {
- public abstract void set_parent_of (Gdk.Window child_window);
+ public abstract void set_parent_of (Gdk.Surface child_window);
 
  public static ExternalWindow? from_handle (string handle) {
  const string X11_PREFIX = "x11:";
@@ -52,7 +52,7 @@ public interface ExternalWindow : GLib.Object {
 public class ExternalWindowX11 : ExternalWindow, GLib.Object {
  private static Gdk.Display? x11_display = null;
 
- private Gdk.Window foreign_gdk_window;
+ private Gdk.Surface foreign_gdk_window;
 
  public ExternalWindowX11 (string handle) throws GLib.IOError {
  var display = get_x11_display ();
@@ -62,12 +62,12 @@ public class ExternalWindowX11 : ExternalWindow, GLib.Object {
 
  int xid;
  if (!int.try_parse (handle, out xid, null, 16)) {
- throw new IOError.FAILED ("Failed to reference external X11 window, invalid XID %s", handle);
+ throw new IOError.FAILED ("Failed to reference external X11 surface, invalid XID %s", handle);
  }
 
- foreign_gdk_window = new Gdk.X11.Window.foreign_for_display ((Gdk.X11.Display)display, xid);
+ foreign_gdk_window = Gdk.X11.Surface.lookup_for_display ((Gdk.X11.Display)display, xid);
  if (foreign_gdk_window == null) {
- throw new IOError.FAILED ("Failed to create foreign window for XID %d", xid);
+ throw new IOError.FAILED ("Failed to create X11 Surface for XID %d", xid);
  }
  }
 
@@ -77,7 +77,9 @@ public class ExternalWindowX11 : ExternalWindow, GLib.Object {
  }
 
  Gdk.set_allowed_backends ("x11");
+ //FIXME This should not have a null parameter
  x11_display = Gdk.Display.open (null);
+ //FIXME This should not have a null parameter
  Gdk.set_allowed_backends (null);
 
  if (x11_display == null) {
@@ -87,8 +89,10 @@ public class ExternalWindowX11 : ExternalWindow, GLib.Object {
  return x11_display;
  }
 
- public void set_parent_of (Gdk.Window child_window) {
- child_window.set_transient_for (foreign_gdk_window);
+ public void set_parent_of (Gdk.Surface child_window) {
+ if (child_window is Gdk.Toplevel) {
+ ((Gdk.Toplevel)child_window).set_transient_for (foreign_gdk_window);
+ }
  }
 }
 
@@ -112,7 +116,9 @@ public class ExternalWindowWayland : ExternalWindow, GLib.Object {
  }
 
  Gdk.set_allowed_backends ("wayland");
+ //FIXME This should not have a null parameter
  wayland_display = Gdk.Display.open (null);
+ //FIXME This should not have a null parameter
  Gdk.set_allowed_backends (null);
 
  if (wayland_display == null) {
@@ -122,8 +128,8 @@ public class ExternalWindowWayland : ExternalWindow, GLib.Object {
  return wayland_display;
  }
 
- public void set_parent_of (Gdk.Window child_window) {
- if (!((Gdk.Wayland.Window) child_window).set_transient_for_exported (handle)) {
+ public void set_parent_of (Gdk.Surface child_window) {
+ if (!((Gdk.Wayland.Toplevel) child_window).set_transient_for_exported (handle)) {
  warning ("Failed to set portal window transient for external parent");
  }
  }

filechooser-portal/FileChooserChoice.vala

@@ -26,7 +26,7 @@ public class Files.FileChooserChoice : Gtk.Box {
 
  var label = new Gtk.Label (label);
  bind_property ("label", label, "label", BindingFlags.DEFAULT);
- add (label);
+ append (label);
 
  if (options.n_children () == 0) {
  var check = new Gtk.CheckButton ();
@@ -42,7 +42,7 @@ public class Files.FileChooserChoice : Gtk.Box {
  }
  );
 
- add (check);
+ append (check);
  } else {
  var combo = new Gtk.ComboBoxText ();
  var iter = options.iterator ();
@@ -53,7 +53,7 @@ public class Files.FileChooserChoice : Gtk.Box {
  }
 
  bind_property ("selected", combo, "active-id", BindingFlags.BIDIRECTIONAL);
- add (combo);
+ append (combo);
  }
  }
 }