Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
PIM Messagelib
Commits
410e7b31
Commit
410e7b31
authored
Oct 14, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use unique method for assigning Item
parent
99f09431
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
messageviewer/src/viewer/viewer_p.cpp
messageviewer/src/viewer/viewer_p.cpp
+7
-2
messageviewer/src/viewer/viewer_p.h
messageviewer/src/viewer/viewer_p.h
+1
-0
No files found.
messageviewer/src/viewer/viewer_p.cpp
View file @
410e7b31
...
...
@@ -1240,6 +1240,11 @@ void ViewerPrivate::setMessageInternal(const KMime::Message::Ptr &message, MimeT
update
(
updateMode
);
}
void
ViewerPrivate
::
assignMessageItem
(
const
Akonadi
::
Item
&
item
)
{
mMessageItem
=
item
;
}
void
ViewerPrivate
::
setMessageItem
(
const
Akonadi
::
Item
&
item
,
MimeTreeParser
::
UpdateMode
updateMode
)
{
resetStateForNewMessage
();
...
...
@@ -1248,7 +1253,7 @@ void ViewerPrivate::setMessageItem(const Akonadi::Item &item, MimeTreeParser::Up
}
Q_ASSERT
(
mMonitor
.
itemsMonitoredEx
().
isEmpty
());
m
MessageItem
=
item
;
assign
MessageItem
(
item
)
;
if
(
mMessageItem
.
isValid
())
{
mMonitor
.
setItemMonitored
(
mMessageItem
,
true
);
}
...
...
@@ -1293,7 +1298,7 @@ void ViewerPrivate::setMessage(const KMime::Message::Ptr &aMsg, MimeTreeParser::
Akonadi
::
Item
item
;
item
.
setMimeType
(
KMime
::
Message
::
mimeType
());
item
.
setPayload
(
aMsg
);
m
MessageItem
=
item
;
assign
MessageItem
(
item
)
;
setMessageInternal
(
aMsg
,
updateMode
);
}
...
...
messageviewer/src/viewer/viewer_p.h
View file @
410e7b31
...
...
@@ -592,6 +592,7 @@ private:
bool
mHtmlMailGlobalSetting
=
false
;
bool
mHtmlLoadExternalDefaultSetting
=
false
;
bool
mHtmlLoadExtOverride
=
false
;
void
assignMessageItem
(
const
Akonadi
::
Item
&
item
);
public:
KMime
::
Message
::
Ptr
mMessage
;
//the current message, if it was set manually
Akonadi
::
Item
mMessageItem
;
//the message item from Akonadi
...
...
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