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

telepathyClient: Add alias change notifiers

Browse Source 
Update the Source title when an contact's alias changes, and
also also add a minor meta message like the current timestamps.

Updating the alias of a 'presenced' contact will overwrite the
current title, and it will also not update the summary item title
right now due to limitations of the message tray.

https://bugzilla.gnome.org/show_bug.cgi?id=642793
This commit is contained in:
Jasper St. Pierre 2011-02-28 13:15:02 -05:00
parent f4a000cb59
commit 8c40c2086a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/telepathyClient.js
View File

@ -116,7 +116,7 @@ Source.prototype = {
__proto__: MessageTray.Source.prototype, __proto__: MessageTray.Source.prototype,
_init: function(account, conn, channel, contact) { _init: function(account, conn, channel, contact) {
MessageTray.Source.prototype._init.call(this, channel.get_identifier()); MessageTray.Source.prototype._init.call(this, contact.get_alias());
this.isChat = true; this.isChat = true;
@ -127,8 +127,6 @@ Source.prototype = {
this._channel = channel; this._channel = channel;
this._closedId = this._channel.connect('invalidated', Lang.bind(this, this._channelClosed)); this._closedId = this._channel.connect('invalidated', Lang.bind(this, this._channelClosed));
this._updateAlias();
this._notification = new Notification(this); this._notification = new Notification(this);
this._notification.setUrgency(MessageTray.Urgency.HIGH); this._notification.setUrgency(MessageTray.Urgency.HIGH);
@ -151,7 +149,10 @@ Source.prototype = {
}, },
_updateAlias: function() { _updateAlias: function() {
let oldAlias = this.title;
this.title = this._contact.get_alias(); this.title = this._contact.get_alias();
this._notification.appendAliasChange(oldAlias, this.title);
this.pushNotification(this._notification);
}, },
createNotificationIcon: function() { createNotificationIcon: function() {
@ -373,6 +374,19 @@ Notification.prototype = {
this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false}); this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false});
}, },
appendAliasChange: function(oldAlias, newAlias) {
oldAlias = GLib.markup_escape_text(oldAlias, -1);
newAlias = GLib.markup_escape_text(newAlias, -1);
/* Translators: this is the other person changing their old IM name to their new
IM name. */
let message = '<i>' + _("%s is now known as %s").format(oldAlias, newAlias) + '</i>';
let label = this.addBody(message, true);
label.add_style_class_name('chat-meta-message');
this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false });
this.update(newAlias, null, { customContent: true });
},
_onEntryActivated: function() { _onEntryActivated: function() {
let text = this._responseEntry.get_text(); let text = this._responseEntry.get_text();
if (text == '') if (text == '')