diff options
Diffstat (limited to 'mate-session/main.c')
| -rw-r--r-- | mate-session/main.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mate-session/main.c b/mate-session/main.c index 56795ac..68e3864 100644 --- a/mate-session/main.c +++ b/mate-session/main.c @@ -2,6 +2,7 @@ * * Copyright (C) 2006 Novell, Inc. * Copyright (C) 2008 Red Hat, Inc. + * Copyright (C) 2012-2021 MATE Developers * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -21,7 +22,6 @@ #include <config.h> -#include <libintl.h> #include <signal.h> #include <stdlib.h> #include <string.h> @@ -83,7 +83,6 @@ static gboolean failsafe = FALSE; static gboolean show_version = FALSE; static gboolean debug = FALSE; static gboolean disable_acceleration_check = FALSE; -static char *gl_renderer = NULL; static gboolean initialize_gsettings (void) @@ -575,7 +574,7 @@ static void set_overlay_scroll (void) } static gboolean -check_gl (GError **error) +check_gl (gchar **gl_renderer, GError **error) { int status; char *argv[] = { LIBEXECDIR "/mate-session-check-accelerated", NULL }; @@ -585,7 +584,7 @@ check_gl (GError **error) return TRUE; } - if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &gl_renderer, NULL, + if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, gl_renderer, NULL, &status, error)) { return FALSE; } @@ -605,6 +604,7 @@ int main(int argc, char** argv) GSettings* accessibility_settings; MdmSignalHandler* signal_handler; static char** override_autostart_dirs = NULL; + char* gl_renderer = NULL; gboolean gl_failed = FALSE; static GOptionEntry entries[] = { @@ -622,9 +622,11 @@ int main(int argc, char** argv) gsm_util_init_error(TRUE, "%s", error->message); } +#ifdef ENABLE_NLS bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain(GETTEXT_PACKAGE); +#endif /* ENABLE_NLS */ sa.sa_handler = SIG_IGN; sa.sa_flags = 0; @@ -668,7 +670,7 @@ int main(int argc, char** argv) g_debug ("hardware acceleration check is disabled"); } else { /* Check GL, if it doesn't work out then force software fallback */ - if (!check_gl (&error)) { + if (!check_gl (&gl_renderer, &error)) { gl_failed = TRUE; g_debug ("hardware acceleration check failed: %s", @@ -676,7 +678,7 @@ int main(int argc, char** argv) g_clear_error (&error); if (g_getenv ("LIBGL_ALWAYS_SOFTWARE") == NULL) { g_setenv ("LIBGL_ALWAYS_SOFTWARE", "1", TRUE); - if (!check_gl (&error)) { + if (!check_gl (&gl_renderer, &error)) { g_warning ("software acceleration check failed: %s", error? error->message : ""); g_clear_error (&error); |