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

telepathyClient: Don't remove body on updates

Browse Source 
Passing null as body always meant clearing the existing one. While this
mattered less with the old message tray which used the expanded actor,
the new message list in the calendar uses the unexpanded body. We clearly
don't want that to disappear on icon changes, so pass the existing one.

https://bugzilla.gnome.org/show_bug.cgi?id=746343
This commit is contained in:
Florian Müllner
2015-03-17 02:36:05 +01:00
parent 826682cc07
commit 0ee762263a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,7 +352,9 @@ const ChatSource = new Lang.Class({
_updateAvatarIcon: function() {
this.iconUpdated();
this._notification.update(this._notification.title, null, { customContent: true });
this._notification.update(this._notification.title,
this._notification.bannerBodyText,
{ gicon: this.getIcon(), customContent: true });
},
open: function() {
@ -546,7 +548,9 @@ const ChatSource = new Lang.Class({
},
_presenceChanged: function (contact, presence, status, message) {
this._notification.update(this._notification.title, null, { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
this._notification.update(this._notification.title,
this._notification.bannerBodyText,
{ customContent: true, secondaryGIcon: this.getSecondaryIcon() });
},
_pendingRemoved: function(channel, message) {