From 3cf4a7d81f58c6ffe876bb10a7c8001bc7872ee2 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 13 Dec 2013 09:32:47 +1300 Subject: [PATCH] Don't warn if sessions directories not present of lightdm.conf doesn't exist - this is valid --- liblightdm-gobject/session.c | 4 ++-- liblightdm-gobject/user.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c index 190379cf..949778f0 100644 --- a/liblightdm-gobject/session.c +++ b/liblightdm-gobject/session.c @@ -119,7 +119,7 @@ load_sessions_dir (GList *sessions, const gchar *sessions_dir) GError *error = NULL; directory = g_dir_open (sessions_dir, 0, &error); - if (error) + if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) g_warning ("Failed to open sessions directory: %s", error->message); g_clear_error (&error); if (!directory) @@ -209,7 +209,7 @@ update_sessions (void) config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL); config_key_file = g_key_file_new (); result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error); - if (error) + if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) g_warning ("Failed to open configuration file: %s", error->message); g_clear_error (&error); if (result) diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c index d20f2ad8..5ee75193 100644 --- a/liblightdm-gobject/user.c +++ b/liblightdm-gobject/user.c @@ -253,7 +253,7 @@ load_passwd_file (LightDMUserList *user_list, gboolean emit_add_signal) config = g_key_file_new (); g_key_file_load_from_file (config, USER_CONFIG_FILE, G_KEY_FILE_NONE, &error); if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) - g_warning ("Failed to load configuration from %s: %s", USER_CONFIG_FILE, error->message); // FIXME: Don't make warning on no file, just info + g_warning ("Failed to load configuration from %s: %s", USER_CONFIG_FILE, error->message); g_clear_error (&error); if (g_key_file_has_key (config, "UserList", "minimum-uid", NULL)) -- 2.39.2