[evolution-activesync/for-master/pohly: 2/2] libeas: more debug output for default folder ID

[Patrick Ohly <pohly src gnome org>]

commit a1cb5cf43d66165949e30a682f9c18747ab27f50
Author: Patrick Ohly <patrick ohly intel com>
Date:   Wed Sep 5 12:21:08 2012 +0000

    libeas: more debug output for default folder ID
    
    Added some more debug output to track down the random
    "unset folder ID" problem.

 eas-daemon/libeas/eas-sync-folder-msg.c |   14 ++++++++++----
 eas-daemon/libeas/eas-sync-req.c        |    2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/eas-daemon/libeas/eas-sync-folder-msg.c b/eas-daemon/libeas/eas-sync-folder-msg.c
index d584fb0..667f1c6 100644
--- a/eas-daemon/libeas/eas-sync-folder-msg.c
+++ b/eas-daemon/libeas/eas-sync-folder-msg.c
@@ -367,19 +367,21 @@ eas_sync_folder_msg_parse_fs_add_or_update (EasSyncFolderMsg *self, xmlNode *nod
 				 eas_account_get_contact_folder (acc));
 
 			if (f->type == EAS_FOLDER_TYPE_DEFAULT_CALENDAR && eas_account_get_calendar_folder (acc) == NULL) {
-				g_debug ("setting default calendar account");
+				g_debug ("setting default calendar account %s in sync folder msg %p (priv %p)",
+					 f->folder_id, self, priv);
 				eas_account_set_calendar_folder (acc, f->folder_id);
 				eas_account_list_save_item (account_list,
 							    acc,
 							    EAS_ACCOUNT_CALENDAR_FOLDER);
-				priv->def_cal_folder = g_strdup (serverId);
+				priv->def_cal_folder = g_strdup (f->folder_id);
 			} else if (f->type == EAS_FOLDER_TYPE_DEFAULT_CONTACTS && eas_account_get_contact_folder (acc) == NULL) {
-				g_debug ("setting default contact account");
+				g_debug ("setting default contact account %s in sync folder msg %p (priv %p)",
+					 f->folder_id, self, priv);
 				eas_account_set_contact_folder (acc, f->folder_id);
 				eas_account_list_save_item (account_list,
 							    acc,
 							    EAS_ACCOUNT_CONTACT_FOLDER);
-				priv->def_con_folder = g_strdup (serverId);
+				priv->def_con_folder = g_strdup (f->folder_id);
 			}
 
 			if (!g_strcmp0 ("Add", topNodeName)) {
@@ -434,6 +436,8 @@ gchar*
 eas_sync_folder_msg_get_def_con_folder (EasSyncFolderMsg* self)
 {
 	EasSyncFolderMsgPrivate *priv = self->priv;
+	g_debug ("returning default contact folder %s from sync folder msg %p (priv %p)",
+		 priv->def_con_folder, self, priv);
 	return priv->def_con_folder;
 }
 
@@ -441,5 +445,7 @@ gchar*
 eas_sync_folder_msg_get_def_cal_folder (EasSyncFolderMsg* self)
 {
 	EasSyncFolderMsgPrivate *priv = self->priv;
+	g_debug ("returning default calendar folder %s from sync folder msg %p (priv %p)",
+		 priv->def_cal_folder, self, priv);
 	return priv->def_cal_folder;
 }
diff --git a/eas-daemon/libeas/eas-sync-req.c b/eas-daemon/libeas/eas-sync-req.c
index 8973289..13ab581 100644
--- a/eas-daemon/libeas/eas-sync-req.c
+++ b/eas-daemon/libeas/eas-sync-req.c
@@ -403,6 +403,8 @@ eas_sync_req_MessageComplete (EasSyncReq *self, xmlDoc* doc, GError* error_in)
 				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);
+		} else {
+			g_debug ("continue to use default folder '%s'", priv->folderID);
 		}
 		//clean up old message
 		if (priv->syncFolderMsg) {