Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
399defe5
Commit
399defe5
authored
2 years ago
by
Andreas Traczyk
Committed by
Sébastien Blin
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
chatview: fix undefined timestamp warning
Change-Id: If3ee1fd3f074e8807fedc66fc02758df62789b39
parent
6183d116
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/commoncomponents/TimestampInfo.qml
+2
-2
2 additions, 2 deletions
src/app/commoncomponents/TimestampInfo.qml
src/libclient/messagelistmodel.cpp
+1
-1
1 addition, 1 deletion
src/libclient/messagelistmodel.cpp
src/libclient/messagelistmodel.h
+1
-1
1 addition, 1 deletion
src/libclient/messagelistmodel.h
with
4 additions
and
4 deletions
src/app/commoncomponents/TimestampInfo.qml
+
2
−
2
View file @
399defe5
...
...
@@ -37,8 +37,8 @@ ColumnLayout {
Connections
{
target
:
MessagesAdapter
.
messageListModel
function
onTimestampUpdate
()
{
if
(
showTime
||
showDay
)
{
function
onTimestampUpdate
d
()
{
if
(
(
showTime
||
showDay
)
&&
Timestamp
!==
undefined
)
{
formattedTime
=
MessagesAdapter
.
getFormattedTime
(
Timestamp
)
}
}
...
...
This diff is collapsed.
Click to expand it.
src/libclient/messagelistmodel.cpp
+
1
−
1
View file @
399defe5
...
...
@@ -39,7 +39,7 @@ MessageListModel::MessageListModel(QObject* parent)
:
QAbstractListModel
(
parent
)
,
timestampTimer_
(
new
QTimer
(
this
))
{
connect
(
timestampTimer_
,
&
QTimer
::
timeout
,
this
,
&
MessageListModel
::
timestampUpdate
);
connect
(
timestampTimer_
,
&
QTimer
::
timeout
,
this
,
&
MessageListModel
::
timestampUpdate
d
);
timestampTimer_
->
start
(
1000
);
}
...
...
This diff is collapsed.
Click to expand it.
src/libclient/messagelistmodel.h
+
1
−
1
View file @
399defe5
...
...
@@ -134,7 +134,7 @@ public:
void
emitDataChanged
(
const
QString
&
msgId
,
VectorInt
roles
=
{});
bool
isOnlyEmoji
(
const
QString
&
text
)
const
;
Q_SIGNAL
void
timestampUpdate
();
Q_SIGNAL
void
timestampUpdate
d
();
void
addEdition
(
const
QString
&
msgId
,
const
interaction
::
Info
&
info
,
bool
end
);
void
addReaction
(
const
QString
&
messageId
,
const
QString
&
reactionId
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment