[evolution-activesync: 5/6] Some updates in comments and documents

[dwmw2 <dwmw2 src gnome org>]

commit 9a24915f2718b5d49b0f7a2bd11ecf3f0a2aa75f
Author: Oliver Luo <lyc pku eecs gmail com>
Date:   Wed Jul 29 21:21:34 2015 +0800

    Some updates in comments and documents
    
    Some updates in comments and documents about the migration from GConf to
    GSettings.

 README                                |    2 +-
 TODO                                  |    4 +---
 check_tests/eas_connection_tests.c    |    2 +-
 eas-daemon/libeas/eas-2way-sync-req.c |    6 +++---
 eas-daemon/libeas/eas-connection.h    |   11 ++++++-----
 eas-daemon/libeas/eas-sync-req.c      |    6 +++---
 libeasclient/libeasmail.h             |    2 +-
 7 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/README b/README
index fe21b1f..5cfa68b 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ This project consists of five distinct parts:
  2. libeasmail/ libeassync/ libeasaccount/
 
     Client libraries used to access the above dæmon over DBus, and to
-    manage accounts in GConf. These libraries are licensed under
+    manage accounts in GSettings. These libraries are licensed under
     LGPLv2.1+.
 
  [ 3. syncevolution/ ]
diff --git a/TODO b/TODO
index edceb96..a825279 100644
--- a/TODO
+++ b/TODO
@@ -20,9 +20,7 @@
  - Password handling: try gnome-keyring and fall back to spawning an
    external tool to ask for the password
 
- - Move settings to GConf instead of accounts.cfg
-
- - Store policy key in GConf and don't reprovision every time
+ - Store policy key in GSettings and don't reprovision every time
 
  - Use GString for serialising; don't precalculate size. See commit 474ceb9.
 
diff --git a/check_tests/eas_connection_tests.c b/check_tests/eas_connection_tests.c
index bd2f690..36040ac 100644
--- a/check_tests/eas_connection_tests.c
+++ b/check_tests/eas_connection_tests.c
@@ -34,7 +34,7 @@ START_TEST (test_fetch_server_protocols)
        ret = eas_connection_fetch_server_protocols (cnc, &error);      
        mark_point();
        
-       // TODO verify that the server protocol list is in GConf
+       // TODO verify that the server protocol list is in GSettings 
        g_object_unref(cnc);
     mark_point ();
 }
diff --git a/eas-daemon/libeas/eas-2way-sync-req.c b/eas-daemon/libeas/eas-2way-sync-req.c
index 4509117..2a4d9b1 100644
--- a/eas-daemon/libeas/eas-2way-sync-req.c
+++ b/eas-daemon/libeas/eas-2way-sync-req.c
@@ -234,7 +234,7 @@ eas_2way_sync_req_Activate (Eas2WaySyncReq *self,
 
        // if Folder Id is not set, then for contacts, we get a default,
        // if the default has not been set yet, then call sync folder hierarchy,
-       // which will write them to gconf
+       // which will write them to GSettings 
        if (priv->folderID == NULL) {
                EasAccount *acc = eas_connection_get_account (eas_request_base_GetConnection 
(EAS_REQUEST_BASE (self)));
 
@@ -402,10 +402,10 @@ eas_2way_sync_req_MessageComplete (Eas2WaySyncReq *self, xmlDoc* doc, GError* er
                priv->state = Eas2WaySyncReqStep2;
                if (!priv->folderID) {
                        if (priv->ItemType == EAS_ITEM_CALENDAR) {
-                               // cannot get from gconf - as the update takes too long - get from sync msg 
response
+                               // cannot get from GSettings - as the update takes too long - get from sync 
msg response
                                priv->folderID = g_strdup (eas_sync_folder_msg_get_def_cal_folder 
(priv->syncFolderMsg));
                        } else {
-                               // cannot get from gconf - as the update takes too long - get from sync msg 
response
+                               // cannot get from GSettings - as the update takes too long - get from sync 
msg response
                                priv->folderID = g_strdup (eas_sync_folder_msg_get_def_con_folder 
(priv->syncFolderMsg));
                        }
                }
diff --git a/eas-daemon/libeas/eas-connection.h b/eas-daemon/libeas/eas-connection.h
index 41ac7ff..e3709cb 100644
--- a/eas-daemon/libeas/eas-connection.h
+++ b/eas-daemon/libeas/eas-connection.h
@@ -121,12 +121,13 @@ eas_connection_autodiscover (const gchar* email,
                              DBusGMethodInvocation* context);
 
 /**
- * Searches for an existing open connection for the GConf account details
+ * Searches for an existing open connection for the GSettings account details
  * identified by the accountId, or creates a new connection if the account
  * details are valid but no existing connection exists.
  *
  * @param[in] accountId
- *       Unique account identifier that maps on to a set of GConf account details.
+ *       Unique account identifier that maps on to a set of GSettings account
+ *  details.
  *
  * @return NULL or EasConnection GObject corresponding to the accountId.
  */
@@ -134,10 +135,10 @@ EasConnection* eas_connection_find (const gchar* accountId);
 
 /**
  * Create a new connection using the details supplied in the EasAccount object.
- * Note: The users details must be present in GConf.
+ * Note: The users details must be present in GSettings.
  *
  * @param[in] account
- *       GObject containing the account details of a GConf account.
+ *       GObject containing the account details of a GSettings account.
  * @param[out] error
  *       GError may be NULL if the caller wishes to ignore error details, otherwise
  *       will be populated with error details if the function returns NULL. Caller
@@ -260,7 +261,7 @@ gboolean eas_connection_cancel_request(EasConnection* self,
 
 /**
  * Get a list of activesync protocols supported by the exchange server
- * and store them in GConf
+ * and store them in GSettings 
  *
  * @param[in]   cnc
  *             instance of EasConnection
diff --git a/eas-daemon/libeas/eas-sync-req.c b/eas-daemon/libeas/eas-sync-req.c
index 13ab581..94e699f 100644
--- a/eas-daemon/libeas/eas-sync-req.c
+++ b/eas-daemon/libeas/eas-sync-req.c
@@ -205,7 +205,7 @@ eas_sync_req_Activate (EasSyncReq *self,
 
        // if Folder Id is not set, then for contacts, we get a default,
        // if the default has not been set yet, then call sync folder hierarchy,
-       // which will write them to gconf
+       // which will write them to GSettings 
        if (priv->folderID == NULL) {
                EasAccount *acc = eas_connection_get_account (eas_request_base_GetConnection 
(EAS_REQUEST_BASE (self)));
 
@@ -396,10 +396,10 @@ eas_sync_req_MessageComplete (EasSyncReq *self, xmlDoc* doc, GError* error_in)
                // below and in start_step3
                if (!priv->folderID) {
                        if (priv->ItemType == EAS_ITEM_CALENDAR) {
-                               // cannot get from gconf - as the update takes too long - get from sync msg 
response
+                               // cannot get from GSettings - as the update takes too long - get from sync 
msg response
                                priv->folderID = g_strdup (eas_sync_folder_msg_get_def_cal_folder 
(priv->syncFolderMsg));
                        } else {
-                               // cannot get from gconf - as the update takes too long - get from sync msg 
response
+                               // cannot get from GSettings - as the update takes too long - get from sync 
msg response
                                priv->folderID = g_strdup (eas_sync_folder_msg_get_def_con_folder 
(priv->syncFolderMsg));
                        }
                        g_debug ("retrieved default folder '%s' from sync folder msg", priv->folderID);
diff --git a/libeasclient/libeasmail.h b/libeasclient/libeasmail.h
index c68ffd3..a55867c 100644
--- a/libeasclient/libeasmail.h
+++ b/libeasclient/libeasmail.h
@@ -495,7 +495,7 @@ eas_mail_handler_autodiscover (EasEmailHandler *self,
  *                              the 2 tokens retrieved during a previous call to
  *                              eas_mail_handler_get_provision_list.
  *                              A side effect of this function is that the final
- *                              provisioning ID (PID) is written into GConf for the account.
+ *                              provisioning ID (PID) is written into Gsettings for the account.
  * return value:                TRUE if function success, FALSE if error
  * params:
  * EasEmailHandler* this (in):         use value returned from eas_mail_hander_new()