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

telepathyClient: Don't use customContent notifications gratuitously

Browse Source 
Nothing except for the chat notification is really custom, so stop
specifying the flag for anything else - it will soon become a bit
harder to create non-standard notifications, so don't do it for no
good reason (discouraging this is of course the reason for making it
harder in the first place) ...
This commit is contained in:
Florian Müllner 2015-02-13 02:17:57 +01:00
parent ec66b32df6
commit 87ae45a12f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1129,14 +1129,12 @@ const RoomInviteNotification = new Lang.Class({
/* translators: argument is a room name like /* translators: argument is a room name like
* room@jabber.org for example. */ * room@jabber.org for example. */
_("Invitation to %s").format(channel.get_identifier()), _("Invitation to %s").format(channel.get_identifier()),
null,
{ customContent: true });
this.setResident(true);
/* translators: first argument is the name of a contact and the second /* translators: first argument is the name of a contact and the second
* one the name of a room. "Alice is inviting you to join room@jabber.org * one the name of a room. "Alice is inviting you to join room@jabber.org
* for example. */ * for example. */
this.addBody(_("%s is inviting you to join %s").format(inviter.get_alias(), channel.get_identifier())); _("%s is inviting you to join %s").format(inviter.get_alias(), channel.get_identifier()));
this.setResident(true);
this.addAction(_("Decline"), Lang.bind(this, function() { this.addAction(_("Decline"), Lang.bind(this, function() {
dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) { dispatchOp.leave_channels_async(Tp.ChannelGroupChangeReason.NONE, '', function(src, result) {
@ -1168,7 +1166,7 @@ const AudioVideoNotification = new Lang.Class({
/* translators: argument is a contact name like Alice for example. */ /* translators: argument is a contact name like Alice for example. */
title = _("Call from %s").format(contact.get_alias()); title = _("Call from %s").format(contact.get_alias());
this.parent(source, title, null, { customContent: true }); this.parent(source, title);
this.setResident(true); this.setResident(true);
this.setUrgency(MessageTray.Urgency.CRITICAL); this.setUrgency(MessageTray.Urgency.CRITICAL);
@ -1202,9 +1200,7 @@ const FileTransferNotification = new Lang.Class({
* like: "Alice is sending you test.ogg" * like: "Alice is sending you test.ogg"
*/ */
_("%s is sending you %s").format(contact.get_alias(), _("%s is sending you %s").format(contact.get_alias(),
channel.get_filename()), channel.get_filename()));
null,
{ customContent: true });
this.setResident(true); this.setResident(true);
this.addAction(_("Decline"), Lang.bind(this, function() { this.addAction(_("Decline"), Lang.bind(this, function() {