[tracker/miner-gdata: 3/3] libtracker-miner: Don't print a critical if password file does not exist
- From: Adrien Bustany <abustany src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/miner-gdata: 3/3] libtracker-miner: Don't print a critical if password file does not exist
- Date: Tue, 19 Jul 2011 05:36:38 +0000 (UTC)
commit e2888e550d63cd2e992a98de1c501dbbaa29613d
Author: Adrien Bustany <abustany gnome org>
Date: Tue Jul 19 08:34:32 2011 +0300
libtracker-miner: Don't print a critical if password file does not exist
The keyfile provider would print a critical message (but still work) at first
load, when the passwords file was not created yet. This commit alters the load
function to first check that the file exists.
.../tracker-password-provider-keyfile.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-password-provider-keyfile.c b/src/libtracker-miner/tracker-password-provider-keyfile.c
index 95cb71a..712c79c 100644
--- a/src/libtracker-miner/tracker-password-provider-keyfile.c
+++ b/src/libtracker-miner/tracker-password-provider-keyfile.c
@@ -22,6 +22,7 @@
#include <sys/mman.h>
#include <glib-object.h>
+#include <gio/gio.h>
#include "tracker-password-provider.h"
@@ -353,6 +354,17 @@ load_password_file (TrackerPasswordProviderKeyfile *kf,
filename = g_build_filename (directory, KEYFILE_FILENAME, NULL);
g_free (directory);
+ GFile *password_file = g_file_new_for_path (filename);
+
+ if (!g_file_query_exists (password_file, NULL)) {
+ g_object_unref (password_file);
+ g_free (filename);
+
+ return TRUE;
+ }
+
+ g_object_unref (password_file);
+
priv = TRACKER_PASSWORD_PROVIDER_KEYFILE_GET_PRIVATE (kf);
g_key_file_load_from_file (priv->password_file,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]