[Pkg-telepathy-commits] [telepathy-mission-control-6] 74/280: Merge branch 'master' into next
Simon McVittie
smcv at debian.org
Thu Mar 27 20:07:07 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 b1d129e4127178b2e49e19cab3881492a233ad75
Merge: 5c879c5 481874e
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Wed Oct 16 14:04:30 2013 +0100
Merge branch 'master' into next
Tests pass with telepathy-glib 0.99.2.
Conflicts:
src/Makefile.am
src/mcd-account-manager-priv.h
src/mcd-account-manager.c
src/mcd-account-priv.h
src/mcd-account.c
src/mcd.xml
tests/twisted/account-manager/hidden.py
tests/twisted/constants.py
tests/twisted/mctest.py
xml/Account_Interface_Hidden1.xml
xml/Account_Manager_Interface_Hidden1.xml
xml/Makefile.am
xml/nmc5.xml
configure.ac | 14 --
src/Makefile.am | 25 ----
src/mcd-account-conditions.c | 160 ---------------------
src/mcd-account-conditions.h | 34 -----
src/mcd-account-config.h | 4 +-
src/mcd-account-manager-priv.h | 3 -
src/mcd-account-manager.c | 82 ++---------
src/mcd-account-priv.h | 9 --
src/mcd-account.c | 94 ------------
src/mcd-master.c | 1 -
src/mcd-storage-ag-hidden.c | 99 -------------
src/mcd-storage-ag-hidden.h | 59 --------
src/mcd-storage.c | 11 --
src/mcd.xml | 4 -
tests/twisted/Makefile.am | 1 -
tests/twisted/account-manager/account-basics.py | 37 -----
.../account-manager/create-with-properties.py | 8 --
tests/twisted/account-manager/hidden.py | 110 --------------
tests/twisted/constants.py | 3 -
tests/twisted/mctest.py | 12 +-
xml/Account_Interface_Conditions.xml | 99 -------------
xml/Account_Interface_Hidden1.xml | 65 ---------
xml/Account_Manager_Interface_Hidden1.xml | 100 -------------
xml/Makefile.am | 3 -
xml/nmc5.xml | 3 -
25 files changed, 13 insertions(+), 1027 deletions(-)
diff --cc src/mcd-account-manager.c
index 8fc8704,55da9cb..d7aef4a
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@@ -562,17 -551,9 +555,9 @@@ on_account_usability_changed (McdAccoun
object_path = mcd_account_get_object_path (account);
- if (_mcd_account_is_hidden (account))
- {
- mc_svc_account_manager_interface_hidden_emit_hidden_account_usability_changed (
- account_manager, object_path, usable);
- }
- else
- {
- tp_svc_account_manager_emit_account_usability_changed (account_manager,
- object_path,
- usable);
- }
- tp_svc_account_manager_emit_account_validity_changed (account_manager,
++ tp_svc_account_manager_emit_account_usability_changed (account_manager,
+ object_path,
- valid);
++ usable);
}
static void
@@@ -934,17 -906,7 +911,7 @@@ account_manager_iface_init (TpSvcAccoun
}
static void
- account_manager_hidden_iface_init (
- McSvcAccountManagerInterfaceHiddenClass *iface,
- gpointer iface_data)
- {
- }
-
- static void
- accounts_to_gvalue (GHashTable *accounts,
- gboolean usable,
- gboolean hidden,
- GValue *value)
-accounts_to_gvalue (GHashTable *accounts, gboolean valid, GValue *value)
++accounts_to_gvalue (GHashTable *accounts, gboolean usable, GValue *value)
{
static GType ao_type = G_TYPE_INVALID;
GPtrArray *account_array;
@@@ -962,8 -924,7 +929,7 @@@
while (g_hash_table_iter_next (&iter, &k, (gpointer)&account))
{
- if (mcd_account_is_usable (account) == usable &&
- _mcd_account_is_hidden (account) == hidden)
- if (mcd_account_is_valid (account) == valid)
++ if (mcd_account_is_usable (account) == usable)
{
g_ptr_array_add (account_array,
g_strdup (mcd_account_get_object_path (account)));
diff --cc src/mcd-account.c
index 0d7f739,98300b8..810b7bc
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@@ -3745,14 -3664,9 +3664,9 @@@ mcd_account_class_init (McdAccountClas
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
- g_object_class_install_property
- (object_class, PROP_HIDDEN,
- g_param_spec_boolean ("hidden", "Hidden?", "Is this account hidden?",
- FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/* Signals */
- _mcd_account_signals[VALIDITY_CHANGED] =
- g_signal_new ("validity-changed",
+ _mcd_account_signals[USABILITY_CHANGED] =
+ g_signal_new ("usability-changed",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
0,
diff --cc tests/twisted/constants.py
index 59cc46e,f06b496..32693d2
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@@ -554,10 -589,8 +554,8 @@@ HANDLER = PREFIX + '.Client.Handler
CLIENT_IFACE_REQUESTS = CLIENT + '.Interface.Requests'
ACCOUNT = PREFIX + '.Account'
-ACCOUNT_IFACE_AVATAR = ACCOUNT + '.Interface.Avatar'
-ACCOUNT_IFACE_ADDRESSING = ACCOUNT + '.Interface.Addressing'
+ACCOUNT_IFACE_AVATAR = ACCOUNT + '.Interface.Avatar1'
+ACCOUNT_IFACE_ADDRESSING = ACCOUNT + '.Interface.Addressing1'
- ACCOUNT_IFACE_HIDDEN = ACCOUNT + '.Interface.Hidden1'
- ACCOUNT_IFACE_NOKIA_CONDITIONS = 'com.nokia.Account.Interface.Conditions'
ACCOUNT_PATH_PREFIX = PATH_PREFIX + '/Account/'
AM = PREFIX + '.AccountManager'
diff --cc tests/twisted/mctest.py
index 7e0350b,653cba1..b33c3ac
--- a/tests/twisted/mctest.py
+++ b/tests/twisted/mctest.py
@@@ -922,16 -1031,8 +922,8 @@@ def create_fakecm_account(q, bus, mc, p
servicetest.call_async(q, account_manager, 'CreateAccount',
'fakecm', 'fakeprotocol', 'fakeaccount', params, properties)
- # Check whether the account being created is to be hidden; if so, then
- # expect a different signal. It annoys me that this has to be in here, but,
- # eh.
- if properties.get(cs.ACCOUNT_IFACE_HIDDEN + '.Hidden', False):
- usability_changed_pattern = servicetest.EventPattern('dbus-signal',
- path=cs.AM_PATH, signal='HiddenAccountUsabilityChanged',
- interface=cs.AM_IFACE_HIDDEN)
- else:
- usability_changed_pattern = servicetest.EventPattern('dbus-signal',
- path=cs.AM_PATH, signal='AccountUsabilityChanged', interface=cs.AM)
- validity_changed_pattern = servicetest.EventPattern('dbus-signal',
- path=cs.AM_PATH, signal='AccountValidityChanged', interface=cs.AM)
++ usability_changed_pattern = servicetest.EventPattern('dbus-signal',
++ path=cs.AM_PATH, signal='AccountUsabilityChanged', interface=cs.AM)
# The spec has no order guarantee here.
# FIXME: MC ought to also introspect the CM and find out that the params
--
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