settings: Avoid warning when clearing xwayland grab access lists

On the first run, they are NULL, so don't try to free them.

https://bugzilla.gnome.org/show_bug.cgi?id=792853
This commit is contained in:
Jonas Ådahl 2018-01-22 16:59:09 +08:00
parent c063d43be8
commit dbd053020a

View File

@ -348,11 +348,13 @@ update_xwayland_grab_access_rules (MetaSettings *settings)
int i; int i;
/* Free previous patterns and create new arrays */ /* Free previous patterns and create new arrays */
g_ptr_array_free (settings->xwayland_grab_whitelist_patterns, TRUE); g_clear_pointer (&settings->xwayland_grab_whitelist_patterns,
g_ptr_array_unref);
settings->xwayland_grab_whitelist_patterns = settings->xwayland_grab_whitelist_patterns =
g_ptr_array_new_with_free_func ((GDestroyNotify) g_pattern_spec_free); g_ptr_array_new_with_free_func ((GDestroyNotify) g_pattern_spec_free);
g_ptr_array_free (settings->xwayland_grab_blacklist_patterns, TRUE); g_clear_pointer (&settings->xwayland_grab_blacklist_patterns,
g_ptr_array_unref);
settings->xwayland_grab_blacklist_patterns = settings->xwayland_grab_blacklist_patterns =
g_ptr_array_new_with_free_func ((GDestroyNotify) g_pattern_spec_free); g_ptr_array_new_with_free_func ((GDestroyNotify) g_pattern_spec_free);