summaryrefslogtreecommitdiff
path: root/src/shared-data-manager.c
diff options
context:
space:
mode:
authorMichael Terry <michael.terry@canonical.com>2014-02-19 11:50:00 -0500
committerMichael Terry <michael.terry@canonical.com>2014-02-19 11:50:00 -0500
commitd460282f361b7e23df2265e0439b5acb6e691055 (patch)
tree5e484412ba2acca44573ae430e31ad345f112ef1 /src/shared-data-manager.c
parentd13aada929c7213c8168ea16a9cb4eb87343d21a (diff)
downloadlightdm-d460282f361b7e23df2265e0439b5acb6e691055.tar.gz
explicitly provide shared dir path to sessions
Diffstat (limited to 'src/shared-data-manager.c')
-rw-r--r--src/shared-data-manager.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c
index eb39a3d9..67971fff 100644
--- a/src/shared-data-manager.c
+++ b/src/shared-data-manager.c
@@ -81,12 +81,12 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data)
g_free (path);
}
-gboolean
+gchar *
shared_data_manager_ensure_user_dir (SharedDataManager *manager, const gchar *user)
{
struct passwd *entry = getpwnam (user);
if (!entry)
- return FALSE;
+ return NULL;
GError *error = NULL;
@@ -102,7 +102,7 @@ shared_data_manager_ensure_user_dir (SharedDataManager *manager, const gchar *us
g_error_free (error);
g_object_unref (file);
g_free (path);
- return FALSE;
+ return NULL;
}
g_error_free (error);
error = NULL;
@@ -126,13 +126,12 @@ shared_data_manager_ensure_user_dir (SharedDataManager *manager, const gchar *us
g_object_unref (info);
g_object_unref (file);
g_free (path);
- return FALSE;
+ return NULL;
}
g_object_unref (info);
g_object_unref (file);
- g_free (path);
- return TRUE;
+ return path;
}
static void
@@ -183,11 +182,6 @@ next_user_dirs_cb (GObject *object, GAsyncResult *res, gpointer user_data)
g_hash_table_destroy (manager->priv->starting_dirs);
manager->priv->starting_dirs = NULL;
- // Also set up our own greeter dir, so it has a place to dump its own files
- // (imagine it holding some large files temporarily before shunting them
- // to the next user to log in's specific directory).
- shared_data_manager_ensure_user_dir (manager, manager->priv->greeter_user);
-
g_object_unref (manager);
}
}