From 2238bab907a11db2c858b87255e067173e8a6623 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 20 Mar 2014 15:12:03 +0000
Subject: [PATCH 2/4] mcd_account_delete_async: remove #if 0 code to delete old
 account storage

We're not going to delete Telepathy-0 account data in Telepathy-1.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=70991
---
 src/mcd-account.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index f28b0a1..cabc4f7 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -571,9 +571,6 @@ mcd_account_delete_async (McdAccount *account,
     gpointer user_data)
 {
     McdAccountPrivate *priv = account->priv;
-#if 0
-    gchar *data_dir_str;
-#endif
     GError *error = NULL;
     const gchar *name = mcd_account_get_unique_name (account);
     GTask *task;
@@ -610,33 +607,6 @@ mcd_account_delete_async (McdAccount *account,
     if ((flags & MCD_DBUS_PROP_SET_FLAG_ALREADY_IN_STORAGE) == 0)
         mcd_storage_delete_account (priv->storage, name);
 
-#if 0
-    data_dir_str = get_old_account_data_path (priv);
-
-    if (data_dir_str != NULL)
-    {
-        GDir *data_dir = g_dir_open (data_dir_str, 0, NULL);
-
-        if (data_dir)
-        {
-            const gchar *filename;
-
-            while ((filename = g_dir_read_name (data_dir)) != NULL)
-            {
-                gchar *path = g_build_filename (data_dir_str, filename, NULL);
-
-                g_remove (path);
-                g_free (path);
-            }
-
-            g_dir_close (data_dir);
-            g_rmdir (data_dir_str);
-        }
-
-        g_free (data_dir_str);
-    }
-#endif
-
     if (!priv->removed)
     {
         DEBUG ("emitting Account.Removed for %s", name);
-- 
1.9.1