Don't warn if sessions directories not present of lightdm.conf doesn't exist - this...

diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c
index 190379cfac063622648fdc10a17110e3624f67ff..949778f035852bf12f7c60ea2c6d45e642a09964 100644 (file)
--- 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 d20f2ad8454c99e3f9116a9820c6426b83b73584..5ee75193658ff5a67567bb25eb49c06eaa26bb44 100644 (file)
--- 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))