[evolution-data-server] source_registry_server_create_source(): Create parent directories.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] source_registry_server_create_source(): Create parent directories.
- Date: Fri, 10 Aug 2012 11:42:30 +0000 (UTC)
commit 08459ae64e1809ff5c5e75436c94a50bb9185dea
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Aug 9 21:55:17 2012 -0400
source_registry_server_create_source(): Create parent directories.
Same deal as the previous commit.
libebackend/e-source-registry-server.c | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/libebackend/e-source-registry-server.c b/libebackend/e-source-registry-server.c
index beca758..33a8afe 100644
--- a/libebackend/e-source-registry-server.c
+++ b/libebackend/e-source-registry-server.c
@@ -702,9 +702,11 @@ source_registry_server_create_source (ESourceRegistryServer *server,
{
ESource *source = NULL;
GFile *file;
+ GFile *parent;
GKeyFile *key_file;
gboolean success;
gsize length;
+ GError *local_error = NULL;
g_return_val_if_fail (uid != NULL, FALSE);
g_return_val_if_fail (data != NULL, FALSE);
@@ -746,6 +748,20 @@ source_registry_server_create_source (ESourceRegistryServer *server,
file = e_server_side_source_new_user_file (uid);
+ /* Create the directory where we'll be writing. */
+
+ parent = g_file_get_parent (file);
+ g_file_make_directory_with_parents (parent, NULL, &local_error);
+ g_object_unref (parent);
+
+ if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+ g_clear_error (&local_error);
+
+ if (local_error != NULL) {
+ g_propagate_error (error, local_error);
+ success = FALSE;
+ }
+
/* Write the data to disk. The file monitor should eventually
* notice the new file and call e_source_registry_server_load_file()
* per design, but we're going to beat it to the punch since we
@@ -754,9 +770,10 @@ source_registry_server_create_source (ESourceRegistryServer *server,
* it will simply get back the EDBusSourceObject we've already
* created and exported. */
- success = g_file_replace_contents (
- file, data, length, NULL, FALSE,
- G_FILE_CREATE_PRIVATE, NULL, NULL, error);
+ if (success)
+ success = g_file_replace_contents (
+ file, data, length, NULL, FALSE,
+ G_FILE_CREATE_PRIVATE, NULL, NULL, error);
if (success) {
ESourcePermissionFlags flags;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]