~online-accounts/signon/trunk

« back to all changes in this revision

Viewing changes to lib/SignOn/authsession.h

  • Committer: CI Train Bot
  • Author(s): Alberto Mardegan
  • Date: 2015-06-16 11:34:19 UTC
  • mfrom: (625.1.2 packaging)
  • Revision ID: ci-train-bot@canonical.com-20150616113419-a94pjst39dg6mzas
* Merge from upstream

- lib: reset the DBus proxy when registration failed
- Fix build with Qt 5.5 (LP: #1447175)
 Fixes: #1415492
Approved by: PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 * This file is part of signon
3
3
 *
4
4
 * Copyright (C) 2009-2010 Nokia Corporation.
 
5
 * Copyright (C) 2011-2015 Canonical Ltd.
5
6
 *
6
7
 * Contact: Aurel Popirtac <ext-aurel.popirtac@nokia.com>
7
8
 * Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
40
41
 
41
42
namespace SignOnTests {
42
43
    class AccessControlTest;
43
 
};
 
44
}
44
45
 
45
46
namespace SignOn {
46
47