From c20ca2c4b4c096b12d7d5a0b7df401dfb9f9f500 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 10 Oct 2011 16:45:48 -0400 Subject: Use a temporary variable to defeat G_DISABLE_CHECKS --- src/settings-helper.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/settings-helper.c') diff --git a/src/settings-helper.c b/src/settings-helper.c index b8f482f..55411da 100644 --- a/src/settings-helper.c +++ b/src/settings-helper.c @@ -51,31 +51,36 @@ build_settings (void) { gboolean supress_confirmations (void) { - g_return_val_if_fail(build_settings(), FALSE); + gboolean settings_built = build_settings(); + g_return_val_if_fail(settings_built, FALSE); return g_settings_get_boolean (settings, SUPPRESS_KEY) ; } gboolean should_show_user_menu (void) { - g_return_val_if_fail(build_settings(), TRUE); + gboolean settings_built = build_settings(); + g_return_val_if_fail(settings_built, TRUE); return g_settings_get_boolean (settings, SHOW_USER_MENU) ; } gboolean show_logout (void) { - g_return_val_if_fail(build_settings(), TRUE); + gboolean settings_built = build_settings(); + g_return_val_if_fail(settings_built, TRUE); return !g_settings_get_boolean (settings, LOGOUT_KEY) ; } gboolean show_restart (void) { - g_return_val_if_fail(build_settings(), TRUE); + gboolean settings_built = build_settings(); + g_return_val_if_fail(settings_built, TRUE); return !g_settings_get_boolean (settings, RESTART_KEY) ; } gboolean show_shutdown (void) { - g_return_val_if_fail(build_settings(), TRUE); + gboolean settings_built = build_settings(); + g_return_val_if_fail(settings_built, TRUE); return !g_settings_get_boolean (settings, SHUTDOWN_KEY) ; } -- cgit v1.2.3