diff options
Diffstat (limited to 'src/gs-window-x11.c')
| -rw-r--r-- | src/gs-window-x11.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c index b8df256..7d6c530 100644 --- a/src/gs-window-x11.c +++ b/src/gs-window-x11.c @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * * Copyright (C) 2004-2008 William Jon McCann <[email protected]> + * 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 published by @@ -55,6 +56,7 @@ enum #define MAX_QUEUED_EVENTS 16 #define INFO_BAR_SECONDS 30 +#define MATE_SCREENSAVER_DIALOG_PATH LIBEXECDIR "/mate-screensaver-dialog" struct GSWindowPrivate { @@ -505,7 +507,6 @@ static GdkVisual * get_best_visual_for_display (GdkDisplay *display) { GdkScreen *screen; - char *command; char *std_output; int exit_status; GError *error; @@ -517,19 +518,18 @@ get_best_visual_for_display (GdkDisplay *display) visual = NULL; screen = gdk_display_get_default_screen (display); - command = g_build_filename (LIBEXECDIR, "mate-screensaver-gl-helper", NULL); - error = NULL; std_output = NULL; res = spawn_command_line_on_display_sync (display, - command, + MATE_SCREENSAVER_GL_HELPER_PATH, &std_output, NULL, &exit_status, &error); if (! res) { - gs_debug ("Could not run command '%s': %s", command, error->message); + gs_debug ("Could not run command '%s': %s", + MATE_SCREENSAVER_GL_HELPER_PATH, error->message); g_error_free (error); goto out; } @@ -550,7 +550,6 @@ get_best_visual_for_display (GdkDisplay *display) } out: g_free (std_output); - g_free (command); return g_object_ref (visual); } @@ -616,11 +615,11 @@ remove_watchdog_timer (GSWindow *window) static void add_watchdog_timer (GSWindow *window, - glong timeout) + guint timeout) { window->priv->watchdog_timer_id = g_timeout_add (timeout, - (GSourceFunc)watchdog_timer, - window); + (GSourceFunc)watchdog_timer, + window); } static void @@ -1534,7 +1533,7 @@ window_set_dialog_up (GSWindow *window, return; } - window->priv->dialog_up = dialog_up; + window->priv->dialog_up = (dialog_up != FALSE); g_object_notify (G_OBJECT (window), "dialog-up"); } @@ -1696,14 +1695,11 @@ static void popup_dialog (GSWindow *window) { gboolean result; - char *tmp; GString *command; gs_debug ("Popping up dialog"); - tmp = g_build_filename (LIBEXECDIR, "mate-screensaver-dialog", NULL); - command = g_string_new (tmp); - g_free (tmp); + command = g_string_new (MATE_SCREENSAVER_DIALOG_PATH); if (is_logout_enabled (window)) { @@ -1818,7 +1814,7 @@ gs_window_set_lock_enabled (GSWindow *window, return; } - window->priv->lock_enabled = lock_enabled; + window->priv->lock_enabled = (lock_enabled != FALSE); g_object_notify (G_OBJECT (window), "lock-enabled"); } @@ -1836,7 +1832,7 @@ gs_window_set_keyboard_enabled (GSWindow *window, { g_return_if_fail (GS_IS_WINDOW (window)); - window->priv->keyboard_enabled = enabled; + window->priv->keyboard_enabled = (enabled != FALSE); } void @@ -1863,7 +1859,7 @@ gs_window_set_logout_enabled (GSWindow *window, { g_return_if_fail (GS_IS_WINDOW (window)); - window->priv->logout_enabled = logout_enabled; + window->priv->logout_enabled = (logout_enabled != FALSE); } void @@ -1872,7 +1868,7 @@ gs_window_set_user_switch_enabled (GSWindow *window, { g_return_if_fail (GS_IS_WINDOW (window)); - window->priv->user_switch_enabled = user_switch_enabled; + window->priv->user_switch_enabled = (user_switch_enabled != FALSE); } void @@ -2282,7 +2278,7 @@ window_set_obscured (GSWindow *window, return; } - window->priv->obscured = obscured; + window->priv->obscured = (obscured != FALSE); g_object_notify (G_OBJECT (window), "obscured"); } |