brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

telepathyClient: Use a single update for text and timestamp

Browse Source 
Commit c6f22826cf added a call to update() to refresh the notification
time for sent and received messages. However as it omits the bannerMarkup
parameter, escaped text like ''' now makes it through verbatim.
Rather than adding the parameter, we can just refresh the timestamp in
the existing update() call to fix the issue - it means the notification
timestamp is only refreshed for received messages, but that reflects
the text shown in the notification, which isn't updated for sent
messages either.

https://bugzilla.gnome.org/show_bug.cgi?id=779435
This commit is contained in:
Florian Müllner 2017-03-01 20:01:28 +01:00
parent 252dce1ec2
commit 645aa01efd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/components/telepathyClient.js
View File

@ -660,7 +660,9 @@ const ChatNotification = new Lang.Class({
} }
if (message.direction == NotificationDirection.RECEIVED) if (message.direction == NotificationDirection.RECEIVED)
this.update(this.source.title, messageBody, { bannerMarkup: true }); this.update(this.source.title, messageBody,
{ datetime: GLib.DateTime.new_from_unix_local (message.timestamp),
bannerMarkup: true });
let group = (message.direction == NotificationDirection.RECEIVED ? let group = (message.direction == NotificationDirection.RECEIVED ?
'received' : 'sent'); 'received' : 'sent');
@ -670,8 +672,6 @@ const ChatNotification = new Lang.Class({
styles: styles, styles: styles,
timestamp: message.timestamp, timestamp: message.timestamp,
noTimestamp: noTimestamp }); noTimestamp: noTimestamp });
this.update(this.title, this.bannerBodyText,
{ datetime: GLib.DateTime.new_from_unix_local (message.timestamp) });
}, },
_filterMessages: function() { _filterMessages: function() {