[next] telepathy-mission-control: rename crash recovery file to . mc6_connections
Guillaume Desmottes
gdesmott at kemper.freedesktop.org
Thu Oct 31 17:03:18 CET 2013
Module: telepathy-mission-control
Branch: next
Commit: 503e305dcadbbfa3a2fc0e3055f45f63ed0519f5
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=503e305dcadbbfa3a2fc0e3055f45f63ed0519f5
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Thu Oct 31 11:37:20 2013 +0100
rename crash recovery file to .mc6_connections
---
.gitignore | 2 +-
src/mcd-account-manager.c | 2 +-
tests/twisted/Makefile.am | 2 +-
tests/twisted/account-manager/auto-connect.py | 2 +-
tests/twisted/account-manager/avatar-refresh.py | 2 +-
tests/twisted/account-manager/make-valid.py | 2 +-
tests/twisted/crash-recovery/crash-recovery.py | 2 +-
tests/twisted/dispatcher/create-at-startup.py | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 97f3a9e..c211756 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,7 +84,7 @@ TAGS
/tests/test-*
tests/mc-client
tests/twisted/with-session-bus-*.dbus-monitor-logs
-/tests/twisted/accounts/.mc_connections
+/tests/twisted/accounts/.mc6_connections
/tests/twisted/accounts/accounts.cfg
/tests/twisted/mc-debug-server
tests/twisted/mc-twisted-tests.list
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index b6890ec..7d9cdbc 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -1556,7 +1556,7 @@ _mcd_account_manager_constructed (GObject *obj)
priv->account_connections_dir = g_strdup (get_connections_cache_dir ());
priv->account_connections_file =
- g_build_filename (priv->account_connections_dir, ".mc_connections",
+ g_build_filename (priv->account_connections_dir, ".mc6_connections",
NULL);
DEBUG ("loading plugins");
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 7f1651f..81e896b 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -269,7 +269,7 @@ EXTRA_DIST = \
CLEANFILES = \
accounts/accounts.cfg \
- accounts/.mc_connections \
+ accounts/.mc6_connections \
mc-[1-9]*.log \
missioncontrol.log \
*.pyc \
diff --git a/tests/twisted/account-manager/auto-connect.py b/tests/twisted/account-manager/auto-connect.py
index a05f2c9..23f0eb7 100644
--- a/tests/twisted/account-manager/auto-connect.py
+++ b/tests/twisted/account-manager/auto-connect.py
@@ -73,7 +73,7 @@ def preseed(q, bus, fake_accounts_service):
avatar_bin.write('Deus Ex')
avatar_bin.close()
- account_connections_file = open(accounts_dir + '/.mc_connections', 'w')
+ account_connections_file = open(accounts_dir + '/.mc6_connections', 'w')
account_connections_file.write("")
account_connections_file.close()
diff --git a/tests/twisted/account-manager/avatar-refresh.py b/tests/twisted/account-manager/avatar-refresh.py
index e1c7051..20057dd 100644
--- a/tests/twisted/account-manager/avatar-refresh.py
+++ b/tests/twisted/account-manager/avatar-refresh.py
@@ -326,7 +326,7 @@ def preseed(q, bus, fake_accounts_service):
except OSError:
pass
- account_connections_file = open(accounts_dir + '/.mc_connections', 'w')
+ account_connections_file = open(accounts_dir + '/.mc6_connections', 'w')
account_connections_file.write("")
account_connections_file.close()
diff --git a/tests/twisted/account-manager/make-valid.py b/tests/twisted/account-manager/make-valid.py
index 39980d2..dc5b79c 100644
--- a/tests/twisted/account-manager/make-valid.py
+++ b/tests/twisted/account-manager/make-valid.py
@@ -90,7 +90,7 @@ def preseed(q, bus, fake_accounts_service):
avatar_bin.write('Invisible War')
avatar_bin.close()
- account_connections_file = open(accounts_dir + '/.mc_connections', 'w')
+ account_connections_file = open(accounts_dir + '/.mc6_connections', 'w')
account_connections_file.write("")
account_connections_file.close()
diff --git a/tests/twisted/crash-recovery/crash-recovery.py b/tests/twisted/crash-recovery/crash-recovery.py
index 2bc4534..b6420fa 100644
--- a/tests/twisted/crash-recovery/crash-recovery.py
+++ b/tests/twisted/crash-recovery/crash-recovery.py
@@ -53,7 +53,7 @@ def preseed(q, bus, fake_accounts_service):
'password': 'ionstorm',
})
- account_connections_file = open(accounts_dir + '/.mc_connections', 'w')
+ account_connections_file = open(accounts_dir + '/.mc6_connections', 'w')
account_connections_file.write("%s\t%s\t%s\n" %
(cs.tp_path_prefix + '/Connection/fakecm/fakeprotocol/jc',
diff --git a/tests/twisted/dispatcher/create-at-startup.py b/tests/twisted/dispatcher/create-at-startup.py
index 58ef7b5..1b79bc2 100644
--- a/tests/twisted/dispatcher/create-at-startup.py
+++ b/tests/twisted/dispatcher/create-at-startup.py
@@ -56,7 +56,7 @@ def preseed(q, bus, fake_accounts_service):
'password': 'ionstorm',
})
- account_connections_file = open(accounts_dir + '/.mc_connections', 'w')
+ account_connections_file = open(accounts_dir + '/.mc6_connections', 'w')
account_connections_file.write("")
account_connections_file.close()
More information about the telepathy-commits
mailing list