Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libcontacts
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mer-core-attic
libcontacts
Commits
7a6dfca5
Commit
7a6dfca5
authored
Aug 31, 2018
by
pvuorela
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_recursive_resolve' into 'master'
Fix recursive resolve See merge request mer-core/libcontacts!6
parents
96361fd7
1b8bbe3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
src/seasidecache.cpp
src/seasidecache.cpp
+5
-7
No files found.
src/seasidecache.cpp
View file @
7a6dfca5
...
...
@@ -1946,12 +1946,10 @@ bool SeasideCache::event(QEvent *event)
bool
idleProcessing
=
false
;
startRequest
(
&
idleProcessing
);
if
(
!
m_unknownResolveAddresses
.
isEmpty
())
{
// Report any unknown addresses
while
(
!
m_unknownResolveAddresses
.
isEmpty
())
{
const
ResolveData
&
resolve
=
m_unknownResolveAddresses
.
takeFirst
();
resolve
.
listener
->
addressResolved
(
resolve
.
first
,
resolve
.
second
,
0
);
}
// Report any unknown addresses
while
(
!
m_unknownResolveAddresses
.
isEmpty
())
{
const
ResolveData
&
resolve
=
m_unknownResolveAddresses
.
takeFirst
();
resolve
.
listener
->
addressResolved
(
resolve
.
first
,
resolve
.
second
,
0
);
}
if
(
!
m_contactsToAppend
.
isEmpty
()
||
!
m_contactsToUpdate
.
isEmpty
())
{
...
...
@@ -2909,9 +2907,9 @@ void SeasideCache::addressRequestStateChanged(QContactAbstractRequest::State sta
m_unknownAddresses
.
append
(
data
);
}
m_pendingResolve
.
remove
(
data
);
data
.
listener
->
addressResolved
(
data
.
first
,
data
.
second
,
item
);
delete
it
.
key
();
m_pendingResolve
.
remove
(
data
);
m_resolveAddresses
.
erase
(
it
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment