diff options
Diffstat (limited to 'src/wayland/meta-wayland-gtk-shell.c')
| -rw-r--r-- | src/wayland/meta-wayland-gtk-shell.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c index 0ef9b83ff..474595b18 100644 --- a/src/wayland/meta-wayland-gtk-shell.c +++ b/src/wayland/meta-wayland-gtk-shell.c @@ -71,15 +71,13 @@ gtk_surface_set_dbus_properties (struct wl_client *client, { MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = gtk_surface->surface; + MetaWindow *window; - /* Broken client, let it die instead of us */ - if (!surface->window) - { - meta_warning ("meta-wayland-surface: set_dbus_properties called with invalid window!\n"); - return; - } + window = surface->window; + if (!window) + return; - meta_window_set_gtk_dbus_properties (surface->window, + meta_window_set_gtk_dbus_properties (window, application_id, unique_bus_name, app_menu_path, @@ -94,12 +92,17 @@ gtk_surface_set_modal (struct wl_client *client, { MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = gtk_surface->surface; + MetaWindow *window; + + window = surface->window; + if (!window) + return; if (gtk_surface->is_modal) return; gtk_surface->is_modal = TRUE; - meta_window_set_type (surface->window, META_WINDOW_MODAL_DIALOG); + meta_window_set_type (window, META_WINDOW_MODAL_DIALOG); } static void @@ -108,12 +111,17 @@ gtk_surface_unset_modal (struct wl_client *client, { MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = gtk_surface->surface; + MetaWindow *window; + + window = surface->window; + if (!window) + return; if (!gtk_surface->is_modal) return; gtk_surface->is_modal = FALSE; - meta_window_set_type (surface->window, META_WINDOW_NORMAL); + meta_window_set_type (window, META_WINDOW_NORMAL); } static void @@ -123,8 +131,9 @@ gtk_surface_present (struct wl_client *client, { MetaWaylandGtkSurface *gtk_surface = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = gtk_surface->surface; - MetaWindow *window = surface->window; + MetaWindow *window; + window = surface->window; if (!window) return; |