isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

settings: Improve logging of enabled experimental features

Browse Source 
We didn't log what we enabled, just g_info():ed what failed to be
enabled. Change this to g_warning() what failed to be enabled, and
g_message() on what was enabled, so that both will be visible in the
logs.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1061
This commit is contained in:
Jonas Ådahl 2020-02-17 17:44:54 +01:00 committed by Florian Müllner
parent 560055fc97
commit 0e0afa240e
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/backends/meta-settings.c
View File

@ -248,7 +248,7 @@ experimental_features_handler (GVariant *features_variant,
{ {
MetaSettings *settings = data; MetaSettings *settings = data;
GVariantIter features_iter; GVariantIter features_iter;
char *feature; char *feature_str;
MetaExperimentalFeature features = META_EXPERIMENTAL_FEATURE_NONE; MetaExperimentalFeature features = META_EXPERIMENTAL_FEATURE_NONE;
if (settings->experimental_features_overridden) if (settings->experimental_features_overridden)
@ -258,18 +258,25 @@ experimental_features_handler (GVariant *features_variant,
} }
g_variant_iter_init (&features_iter, features_variant); g_variant_iter_init (&features_iter, features_variant);
while (g_variant_iter_loop (&features_iter, "s", &feature)) while (g_variant_iter_loop (&features_iter, "s", &feature_str))
{ {
if (g_str_equal (feature, "scale-monitor-framebuffer")) MetaExperimentalFeature feature = META_EXPERIMENTAL_FEATURE_NONE;
features |= META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER;
else if (g_str_equal (feature, "kms-modifiers")) if (g_str_equal (feature_str, "scale-monitor-framebuffer"))
features |= META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS; feature = META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER;
else if (g_str_equal (feature, "rt-scheduler")) else if (g_str_equal (feature_str, "kms-modifiers"))
features |= META_EXPERIMENTAL_FEATURE_RT_SCHEDULER; feature = META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS;
else if (g_str_equal (feature, "autostart-xwayland")) else if (g_str_equal (feature_str, "rt-scheduler"))
features |= META_EXPERIMENTAL_FEATURE_AUTOSTART_XWAYLAND; feature = META_EXPERIMENTAL_FEATURE_RT_SCHEDULER;
else if (g_str_equal (feature_str, "autostart-xwayland"))
feature = META_EXPERIMENTAL_FEATURE_AUTOSTART_XWAYLAND;
if (feature)
g_message ("Enabling experimental feature '%s'", feature_str);
else else
g_info ("Unknown experimental feature '%s'\n", feature); g_warning ("Unknown experimental feature '%s'", feature_str);
features |= feature;
} }
if (features != settings->experimental_features) if (features != settings->experimental_features)