From 87ae45a12f6465f3373f564aac70f54af8e2ae8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 13 Feb 2015 02:17:57 +0100 Subject: [PATCH] telepathyClient: Don't use customContent notifications gratuitously 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) ... --- js/ui/components/telepathyClient.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js index 4a7ab670a..05386143f 100644 --- a/js/ui/components/telepathyClient.js +++ b/js/ui/components/telepathyClient.js @@ -1129,14 +1129,12 @@ const RoomInviteNotification = new Lang.Class({ /* translators: argument is a room name like * room@jabber.org for example. */ _("Invitation to %s").format(channel.get_identifier()), - null, - { customContent: true }); + /* 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 + * for example. */ + _("%s is inviting you to join %s").format(inviter.get_alias(), channel.get_identifier())); this.setResident(true); - /* 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 - * for example. */ - this.addBody(_("%s is inviting you to join %s").format(inviter.get_alias(), channel.get_identifier())); this.addAction(_("Decline"), Lang.bind(this, function() { 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. */ title = _("Call from %s").format(contact.get_alias()); - this.parent(source, title, null, { customContent: true }); + this.parent(source, title); this.setResident(true); this.setUrgency(MessageTray.Urgency.CRITICAL); @@ -1202,9 +1200,7 @@ const FileTransferNotification = new Lang.Class({ * like: "Alice is sending you test.ogg" */ _("%s is sending you %s").format(contact.get_alias(), - channel.get_filename()), - null, - { customContent: true }); + channel.get_filename())); this.setResident(true); this.addAction(_("Decline"), Lang.bind(this, function() {