Fixes: Display label handling if global presence was not requested.
authorMathias Hasselmann <mathias@openismus.com>
Wed, 19 May 2010 09:08:56 +0000 (11:08 +0200)
committerMathias Hasselmann <mathias@openismus.com>
Wed, 19 May 2010 09:13:24 +0000 (11:13 +0200)
commitf21d67b48c0f68d4c587ad2cc65feec6c00b6c58
tree03cf44295d7963442f37f939d3cea00c47a235b4
parent2ced3c84a1a24fb29df43744d86fa9bfee5a14f5
Fixes: Display label handling if global presence was not requested.

Bug: NB#162457
Details:

  * src/engine/contactfetchrequest.cpp: processResults():
  * src/engine/contactfetchrequest2.cpp: modelUpdated():
    Always try synthesizing the global presence detail.
  * src/engine/engine.cpp: contactImpl(), synthesizedDisplayLabel():
    Always request presence detail. Initialize error variable when synthesizing
    the display name.
  * tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h:
  * tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp:
    makeDetailSample(), initTestCase(), displayLabelDetailSamples(),
    testDisplayLabelSynthesized(), testDisplayLabelFetchDefault(),
    testDisplayLabelFetchWithHints(): Properly test display label synthesizing.
  * tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.pro:
  * tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin_data/test-account-1.ttl:
    Add turtle file for initializing fake account.
  * tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin_data/insertTpContact.sparql:
    Set proper presence instance.
src/engine/contactfetchrequest.cpp
src/engine/contactfetchrequest2.cpp
src/engine/engine.cpp
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.pro
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin_data/insertTpContact.sparql
tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin_data/test-account-1.ttl [new file with mode: 0644]