Attachment #768907 for bug #836831

View | Details | Raw Unified | Return to bug 836831
Collapse All | Expand All

Lines 64-70 endif Link Here

(-)shotwell-0.30.15-orig/meson.build (-1 / +1 lines)
64	libraw = dependency('libraw', version : '>= 0.13.2')	64	libraw = dependency('libraw', version : '>= 0.13.2')
65	libexif = dependency('libexif', version : '>= 0.6.16')	65	libexif = dependency('libexif', version : '>= 0.6.16')
66	unity = dependency('unity', required : false)	66	unity = dependency('unity', required : false)
67	gdk = [ dependency('gdk-x11-3.0'), dependency('gdk-wayland-3.0') ]	67	gdk = [ dependency('gdk-x11-3.0'), dependency('gdk-wayland-3.0', required: false) ]
68		68
69	unity_available = false	69	unity_available = false
70	if unity.found() and get_option('unity-support')	70	if unity.found() and get_option('unity-support')




    private static async string get_parent_window () {
        var window = AppWindow.get_instance().get_window ();

        if (window is Gdk.X11.Window) {
            var handle = "wayland:";
            ((Gdk.Wayland.Window) window).export_handle ((w, h) => {
                handle += h;
                get_parent_window.callback ();
            });
            yield;
            return handle;
        } else if (window is Gdk.X11.Window) {
            return "x11:%x".printf ((uint) ((Gdk.X11.Window) window).get_xid ());
        } else {
            warning ("Could not get parent window");

Lines 1-10 Link Here

(-)shotwell-0.30.15-orig/vapi/gdk-wayland-3.0.vapi (-10 lines)
1	[CCode (cheader_filename = "gdk/gdkwayland.h")]
2	namespace Gdk.Wayland {
3	[CCode (type_id = "GDK_TYPE_WAYLAND_WINDOW", type_check_function = "GDK_IS_WAYLAND_WINDOW")]
4	public class Window : Gdk.Window {
5	public bool export_handle (owned WindowExported callback);
6	}
7
8	[CCode (instance_pos = 2.9)]
9	public delegate void WindowExported (Gdk.Window window, string handle);
10	}

Return to bug 836831

Lines 53-67 public class Portal : GLib.Object { Link Here

(-)shotwell-0.30.15-orig/src/Portal.vala (-9 / +1 lines)
53	private static async string get_parent_window () {	53	private static async string get_parent_window () {
54	var window = AppWindow.get_instance().get_window ();	54	var window = AppWindow.get_instance().get_window ();
55		55
56	if (window is Gdk.Wayland.Window) {	56	if (window is Gdk.X11.Window) {
57	var handle = "wayland:";
58	((Gdk.Wayland.Window) window).export_handle ((w, h) => {
59	handle += h;
60	get_parent_window.callback ();
61	});
62	yield;
63	return handle;
64	} else if (window is Gdk.X11.Window) {
65	return "x11:%x".printf ((uint) ((Gdk.X11.Window) window).get_xid ());	57	return "x11:%x".printf ((uint) ((Gdk.X11.Window) window).get_xid ());
66	} else {	58	} else {
67	warning ("Could not get parent window");	59	warning ("Could not get parent window");