AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'work/tidy' into 'master'

Browse Source 
wayland: miscellaneous minor tidy ups

See merge request GNOME/gtk!4066
This commit is contained in:
Jonas Ådahl 2021-10-18 13:44:52 +00:00
commit 6a07a853b0
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/wayland/gdkdisplay-wayland.c
View File

@ -697,11 +697,7 @@ gdk_wayland_display_finalize (GObject *object)
g_free (display_wayland->cursor_theme_name);
xkb_context_unref (display_wayland->xkb_context);
if (display_wayland->cursor_theme)
{
wl_cursor_theme_destroy (display_wayland->cursor_theme);
display_wayland->cursor_theme = NULL;
}
g_clear_pointer (&display_wayland->cursor_theme, wl_cursor_theme_destroy);
g_list_store_remove_all (display_wayland->monitors);
g_object_unref (display_wayland->monitors);

8
gdk/wayland/gdksurface-wayland.c
View File

@ -150,7 +150,6 @@ struct _GdkWaylandSurface
int shadow_right;
int shadow_top;
int shadow_bottom;
gboolean shadow_dirty;
struct wl_output *initial_fullscreen_output;
@ -169,8 +168,6 @@ struct _GdkWaylandSurface
int saved_width;
int saved_height;
gulong parent_surface_committed_handler;
struct {
GdkToplevelLayout *layout;
} toplevel;
@ -2306,10 +2303,7 @@ gdk_wayland_toplevel_uninhibit_idle (GdkToplevel *toplevel)
g_assert (impl->idle_inhibitor && impl->idle_inhibitor_refcount > 0);
if (--impl->idle_inhibitor_refcount == 0)
{
zwp_idle_inhibitor_v1_destroy (impl->idle_inhibitor);
impl->idle_inhibitor = NULL;
}
g_clear_pointer (&impl->idle_inhibitor, zwp_idle_inhibitor_v1_destroy);
}
static void