Skip to content

Required components default fallback #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
2387skju wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Required components default fallback #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fbf3b6
Fallback to default of required components, if wrong set by user
2387skju Apr 1, 2026
98da258
mate-wm: ignore wrong user setting from dconf
2387skju Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions data/mate-wm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ if [ "x$WINDOW_MANAGER" = "xcompiz" -o "x$DEFWM" = "xcompiz" ]; then
fi
fi

# Check WINDOW_MANAGER exists
if [ -n "$WINDOW_MANAGER" ] ; then
if ! command -v "$WINDOW_MANAGER" > /dev/null 2>&1; then
echo "Window manager $WINDOW_MANAGER executable not found."
WINDOW_MANAGER=""
fi
fi

# Avoid looping if the session configuration tells us to use mate-wm or if
# the user forces mate-wm via WINDOW_MANAGER
if [ "x$WINDOW_MANAGER" = "xmate-wm" ]; then
Expand Down
86 changes: 57 additions & 29 deletions mate-session/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,62 @@ static void append_default_apps(GsmManager* manager, const char* default_session
g_strfreev (default_apps);
}

static void append_required_apps_add_component (GsmManager* manager, GSettings* settings_required_components, const char* component, gboolean is_recursive_call)
{
char* default_provider;

default_provider = g_settings_get_string (settings_required_components, component);

g_debug ("main: %s looking for component: '%s'", component, default_provider);

if (default_provider != NULL)
{
char* app_path;

app_path = gsm_util_find_desktop_file_for_app_name (default_provider, NULL);

if (app_path != NULL)
{
gsm_manager_add_autostart_app (manager, app_path, component);
}
else
{
g_warning ("Unable to find provider '%s' of required component '%s'", default_provider, component);

if (default_provider[0] != '\0' && !is_recursive_call)
{
// possible reset component to default

const char *default_default_provider;
GVariant *schema_default;
schema_default = g_settings_get_default_value (settings_required_components, component);

if (schema_default != NULL)
{
default_default_provider = g_variant_get_string (schema_default, NULL);

if (default_default_provider[0] != '\0' && strcmp (default_default_provider, default_provider) != 0)
{
g_warning ("Reset required component '%s' to default", component);
g_settings_reset (settings_required_components, component);

append_required_apps_add_component (manager, settings_required_components, component, TRUE);
}

g_variant_unref (schema_default);
}

g_variant_unref (g_settings_default_default);
}

}

g_free (app_path);
}

g_free (default_provider);
}

static void append_required_apps(GsmManager* manager)
{
gchar** required_components;
Expand All @@ -257,39 +313,11 @@ static void append_required_apps(GsmManager* manager)
{
for (i = 0; required_components[i]; i++)
{
char* default_provider;
const char* component;

if (IS_STRING_EMPTY((char*) required_components[i]))
{
continue;
}

component = required_components[i];

default_provider = g_settings_get_string (settings_required_components, component);

g_debug ("main: %s looking for component: '%s'", component, default_provider);

if (default_provider != NULL)
{
char* app_path;

app_path = gsm_util_find_desktop_file_for_app_name(default_provider, NULL);

if (app_path != NULL)
{
gsm_manager_add_autostart_app(manager, app_path, component);
}
else
{
g_warning("Unable to find provider '%s' of required component '%s'", default_provider, component);
}

g_free(app_path);
}

g_free(default_provider);
append_required_apps_add_component(manager, settings_required_components, required_components[i], FALSE);
}
}

Expand Down