summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-05-02Use quintptr instead of intptr_t.HEADmasterGeorge Kiagiadakis4-4/+4
This fixes FTBFS with gcc-4.7, which requires <stdint.h> to be included for intptr_t to be available. However, since stdint.h is not part of the C++03 standard, it is better to use Qt's types. Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-13tests: Fix a race condition with createAccount() in test-account-basics and ↵George Kiagiadakis2-2/+17
test-dbus-properties Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-13Update NEWSGeorge Kiagiadakis1-0/+7
2012-04-13AccountManager: Rename accountForPath and accountsForPaths to ↵George Kiagiadakis4-9/+27
accountForObjectPath and accountsForObjectPaths respectively. It turns out that the accountForPath name is not very intuitive, when the path is accessed from the objectPath() method. Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-13Merge branch 'svc-fixes'Andre Moreira Magalhaes (andrunko)15-91/+173
Reviewed-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
2012-04-13Only generate adaptors for non-deprecated stable interfaces.Andre Moreira Magalhaes (andrunko)2-11/+14
2012-04-13qt-svc-gen.py: Properly generate adaptee methods/signals/properties names in ↵Andre Moreira Magalhaes (andrunko)13-80/+159
lowerCamelCase. Also renamed all places using vCard to vcard for consistency as the generated code will generate vcard for VCard when appropriate.
2012-04-13Merge branch 'cmake-fixes'George Kiagiadakis1-9/+8
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-13cmake: Fix service-side compilation with -jXGeorge Kiagiadakis1-9/+8
2012-04-13Merge branch 'presence-additions'George Kiagiadakis4-6/+207
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-13Merge branch 'test-base-protocol'George Kiagiadakis10-78/+778
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-13Merge branch 'test-base-cm'George Kiagiadakis8-13/+325
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-13PresenceSpecList: Declare metatypeGeorge Kiagiadakis1-0/+1
2012-04-13test-base-protocol: Properly test the presence interfaceGeorge Kiagiadakis1-6/+28
2012-04-13test-presence: Test the new Presence constructorsGeorge Kiagiadakis1-0/+10
2012-04-13Presence: Add constructors for the rest of the possible presence statusesGeorge Kiagiadakis2-0/+12
2012-04-13test-presence: Add tests for the high-level constructors of PresenceSpecGeorge Kiagiadakis1-0/+25
2012-04-13PresenceSpec: Add high-level API for easily creating PresenceSpec objectsGeorge Kiagiadakis2-0/+131
The default flags are based on telepathy-gabble's PresenceSpec flags.
2012-04-12tests: Add a unit test for BaseProtocol and its interfacesGeorge Kiagiadakis2-0/+667
2012-04-12BaseProtocolPresenceInterface: Add Statuses as immutable propertyGeorge Kiagiadakis1-2/+4
2012-04-12Base*::immutableProperties: Re-wrap lines for readability and use ↵George Kiagiadakis2-17/+34
QVariant::fromValue() qVariantFromValue() is obsolete since Qt 4.8
2012-04-12Make the create<Subclass>() methods of the service-side API return a ↵George Kiagiadakis3-19/+25
SharedPtr<Subclass> This avoids unnecessary casting after the new instance has been created.
2012-04-12BaseProtocol: Add missing Q_OBJECT macro in the protocol interface classesGeorge Kiagiadakis1-0/+4
2012-04-12BaseProtocol: Add a new convenience interface(interfaceName) methodGeorge Kiagiadakis2-2/+18
2012-04-12ProtocolParameter: Fix typo in the constructor arguments - flags should be ↵George Kiagiadakis2-5/+5
of the respective QFlags type, not the enum type
2012-04-12BaseProtocol interfaces: Create adaptee classes earlier than adaptorsGeorge Kiagiadakis2-33/+21
This is better practice than having mPriv->adaptee be NULL before the interface has been registered and prevents a crash in BaseProtocolAvatarsInterface::immutableProperties() if this gets called with adaptee being NULL. We could also make immutableProperties() return an empty map if the adaptee has not been created, but it's probably safer for the future to always create the adaptee object and don't bother to check if it's NULL or not.
2012-04-10TestThreadHelper: Start the thread after entering the event loop, as the ↵George Kiagiadakis1-1/+2
code actually intended to do.
2012-04-10test-base-cm: Port to use TestThreadHelperGeorge Kiagiadakis1-11/+26
2012-04-10tests-lib: Add a new TestThreadHelper classGeorge Kiagiadakis3-2/+133
This class allows us to run parts of a unit test in a different thread context, while being in sync with the unit test flow. This is useful to run connection manager implementations in a different thread, to overcome the shortcomings of the QtDBus local-loop optimizations.
2012-04-09test-base-cm: Add test for the protocol-related methods of BaseCMGeorge Kiagiadakis1-0/+64
2012-04-09ConnectionManager: Finish introspection sucessfully when no protocols are ↵George Kiagiadakis1-5/+10
found on the CM
2012-04-09BaseConnection: Fix QString args replacement in registerObject()George Kiagiadakis1-4/+4
2012-04-09DBusService: Fix QString args replacement in registerObject()George Kiagiadakis1-2/+2
2012-04-09tests: Add a new test for testing BaseConnectionManagerGeorge Kiagiadakis2-0/+96
The test currently contains an adaptation of tp-glib's example-no-protocols test.
2012-04-06Merge branch 'svc-fixes'Andre Moreira Magalhaes (andrunko)8-33/+85
Reviewed-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
2012-04-06Move service side specific types from types.h to service-types.h as they are ↵Andre Moreira Magalhaes (andrunko)5-19/+78
in separate libraries. The files will be merged in types.h once the libraries are merged.
2012-04-06Revert "MethodInvocationContext: Add setFinishedWithError overload receiving ↵Andre Moreira Magalhaes (andrunko)3-14/+7
a DBusError." This reverts commit 383213037d594cbbc3aa92681c75a0e40e6760ed. DBusError is part of telepathy-qt-service library and cannot be a dependency for the main telepathy-qt library. We may re-add it once we merge both libraries.
2012-04-06Merge remote-tracking branch 'gkiagia/svc-fixes'Andre Moreira Magalhaes (andrunko)3-3/+5
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-06DBusObject: Add missing Q_OBJECT macroGeorge Kiagiadakis3-0/+4
2012-04-06Do not install global.h twice.George Kiagiadakis1-3/+1
2012-04-05Merge remote-tracking branch 'gkiagia/service-side-docs'Andre Moreira Magalhaes (andrunko)9-0/+1142
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
2012-04-05DBusObject: Add documentationGeorge Kiagiadakis1-0/+23
2012-04-05AbstractAdaptor: Add documentationGeorge Kiagiadakis1-0/+38
2012-04-05DBusError: Add documentationGeorge Kiagiadakis1-0/+59
2012-04-05AbstractDBusServiceInterface: Add missing doc for immutableProperties()George Kiagiadakis1-1/+12
2012-04-05Document the callbacks systemGeorge Kiagiadakis1-0/+161
2012-04-05BaseProtocol: Add documentationGeorge Kiagiadakis1-0/+502
2012-04-05BaseConnection: Add documentationGeorge Kiagiadakis1-0/+68
2012-04-05BaseConnectionManager: Add documentationGeorge Kiagiadakis1-0/+108
2012-04-05DBusService: Add documentationGeorge Kiagiadakis1-0/+142