[Pkg-telepathy-commits] [telepathy-mission-control-6] 106/280: Store all files (accounts, etc) to ${XDG_DATA_DIRS}/telepathy-1/mission-control
Simon McVittie
smcv at debian.org
Thu Mar 27 20:07:11 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.
commit af35f4ced522793870d685cb07ceee69b43ae1b0
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Thu Oct 31 12:21:46 2013 +0100
Store all files (accounts, etc) to ${XDG_DATA_DIRS}/telepathy-1/mission-control
---
src/mcd-account-manager-default.c | 4 ++--
src/mcd-account.c | 4 ++--
tests/account-store-default.c | 2 +-
tests/twisted/account-manager/avatar-refresh.py | 10 +++++-----
tests/twisted/account-manager/avatar.py | 2 +-
tests/twisted/account-storage/default-keyring-storage.py | 4 ++--
tests/twisted/account-storage/diverted-storage.py | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/mcd-account-manager-default.c b/src/mcd-account-manager-default.c
index 0a89fe1..4e9c7ca 100644
--- a/src/mcd-account-manager-default.c
+++ b/src/mcd-account-manager-default.c
@@ -67,8 +67,8 @@ get_old_filename (void)
static gchar *
account_filename_in (const gchar *dir)
{
- return g_build_filename (dir, "telepathy", "mission-control", "accounts.cfg",
- NULL);
+ return g_build_filename (dir, "telepathy-1", "mission-control",
+ "accounts.cfg", NULL);
}
static void
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 8bff915..43fc862 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -3015,7 +3015,7 @@ get_avatar_paths (McdAccount *account,
gchar *dir = NULL;
dir = g_build_filename (g_get_user_data_dir (),
- "telepathy", "mission-control", NULL);
+ "telepathy-1", "mission-control", NULL);
if (account == NULL)
{
@@ -4239,7 +4239,7 @@ _mcd_account_get_avatar (McdAccount *account, GArray **avatar,
iter != NULL && *iter != NULL;
iter++)
{
- gchar *candidate = g_build_filename (*iter, "telepathy",
+ gchar *candidate = g_build_filename (*iter, "telepathy-1",
"mission-control",
basename, NULL);
diff --git a/tests/account-store-default.c b/tests/account-store-default.c
index 7f4c8c3..eded20d 100644
--- a/tests/account-store-default.c
+++ b/tests/account-store-default.c
@@ -27,7 +27,7 @@
static const gchar *default_config (void)
{
- return g_build_filename (g_get_user_data_dir (), "telepathy",
+ return g_build_filename (g_get_user_data_dir (), "telepathy-1",
"mission-control", "accounts.cfg", NULL);
}
diff --git a/tests/twisted/account-manager/avatar-refresh.py b/tests/twisted/account-manager/avatar-refresh.py
index 20057dd..2740f3d 100644
--- a/tests/twisted/account-manager/avatar-refresh.py
+++ b/tests/twisted/account-manager/avatar-refresh.py
@@ -83,7 +83,7 @@ class Account(object):
self.avatar_location = 'datadir'
avatar_filename = self.id
datadir = os.environ['XDG_DATA_DIRS'].split(':')[0]
- datadir += '/telepathy/mission-control'
+ datadir += '/telepathy-1/mission-control'
avatar_filename = (
avatar_filename.replace('/', '-') + '.avatar')
if not os.path.isdir(datadir):
@@ -106,7 +106,7 @@ class Account(object):
self.avatar_location = 'home'
avatar_filename = self.id
datadir = os.environ['XDG_DATA_HOME']
- datadir += '/telepathy/mission-control'
+ datadir += '/telepathy-1/mission-control'
avatar_filename = (
avatar_filename.replace('/', '-') + '.avatar')
if not os.path.isdir(datadir):
@@ -268,7 +268,7 @@ class Account(object):
avatar_filename = self.id
avatar_filename = avatar_filename.replace('/', '-') + '.avatar'
avatar_filename = (os.environ['XDG_DATA_HOME'] +
- '/telepathy/mission-control/' + avatar_filename)
+ '/telepathy-1/mission-control/' + avatar_filename)
assertEquals(conn.avatar[0], ''.join(open(avatar_filename,
'r').readlines()))
elif self.avatar_location == 'datadir' and self.winner == 'service':
@@ -281,7 +281,7 @@ class Account(object):
avatar_filename = self.id
avatar_filename = avatar_filename.replace('/', '-') + '.avatar'
avatar_filename = (os.environ['XDG_DATA_HOME'] +
- '/telepathy/mission-control/' + avatar_filename)
+ '/telepathy-1/mission-control/' + avatar_filename)
assertEquals(self.remote_avatar, ''.join(open(avatar_filename,
'r').readlines()))
@@ -289,7 +289,7 @@ class Account(object):
low_prio_filename = self.id
low_prio_filename = low_prio_filename.replace('/', '-') + '.avatar'
low_prio_filename = (datadirs[0] +
- '/telepathy/mission-control/' + low_prio_filename)
+ '/telepathy-1/mission-control/' + low_prio_filename)
assertEquals(self.local_avatar, ''.join(open(low_prio_filename,
'r').readlines()))
diff --git a/tests/twisted/account-manager/avatar.py b/tests/twisted/account-manager/avatar.py
index 9677e8a..82ffb3e 100644
--- a/tests/twisted/account-manager/avatar.py
+++ b/tests/twisted/account-manager/avatar.py
@@ -39,7 +39,7 @@ def test(q, bus, mc):
avatar_filename = account.object_path[len(cs.ACCOUNT_PATH_PREFIX):]
avatar_filename = avatar_filename.replace('/', '-') + '.avatar'
avatar_filename = (os.environ['XDG_DATA_HOME'] +
- '/telepathy/mission-control/' + avatar_filename)
+ '/telepathy-1/mission-control/' + avatar_filename)
call_async(q, account_props, 'Set', cs.ACCOUNT_IFACE_AVATAR, 'Avatar',
dbus.Struct((dbus.ByteArray('AAAA'), 'image/jpeg')))
diff --git a/tests/twisted/account-storage/default-keyring-storage.py b/tests/twisted/account-storage/default-keyring-storage.py
index bc41db6..b2c6216 100644
--- a/tests/twisted/account-storage/default-keyring-storage.py
+++ b/tests/twisted/account-storage/default-keyring-storage.py
@@ -62,7 +62,7 @@ def test(q, bus, mc):
ctl_dir = os.environ['MC_ACCOUNT_DIR']
old_key_file_name = os.path.join(ctl_dir, 'accounts.cfg')
new_key_file_name = os.path.join(os.environ['XDG_DATA_HOME'],
- 'telepathy', 'mission-control', 'accounts.cfg')
+ 'telepathy-1', 'mission-control', 'accounts.cfg')
group = 'fakecm/fakeprotocol/dontdivert_40example_2ecom0'
account_manager, properties, interfaces = connect_to_mc(q, bus, mc)
@@ -146,7 +146,7 @@ def test(q, bus, mc):
low_prio_key_file_name = os.path.join(
os.environ['XDG_DATA_DIRS'].split(':')[0],
- 'telepathy', 'mission-control', 'accounts.cfg')
+ 'telepathy-1', 'mission-control', 'accounts.cfg')
os.makedirs(os.path.dirname(low_prio_key_file_name), 0700)
# This is deliberately a lower-priority location
diff --git a/tests/twisted/account-storage/diverted-storage.py b/tests/twisted/account-storage/diverted-storage.py
index c9fa379..9a33409 100644
--- a/tests/twisted/account-storage/diverted-storage.py
+++ b/tests/twisted/account-storage/diverted-storage.py
@@ -40,7 +40,7 @@ def test(q, bus, mc):
pass
empty_key_file_name = os.path.join(os.environ['XDG_DATA_HOME'],
- 'telepathy', 'mission-control', 'accounts.cfg')
+ 'telepathy-1', 'mission-control', 'accounts.cfg')
group = 'fakecm/fakeprotocol/someguy_40example_2ecom0'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git
More information about the Pkg-telepathy-commits
mailing list