[gnome-shell] Turn RoomInviteSource to a more generic source
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Turn RoomInviteSource to a more generic source
- Date: Thu, 14 Jul 2011 07:47:56 +0000 (UTC)
commit 90db743cc92cee7fa6f1928cbc16d32b324c6b28
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Jul 11 12:59:23 2011 +0200
Turn RoomInviteSource to a more generic source
All the approving source will be basically the same.
https://bugzilla.gnome.org/show_bug.cgi?id=653939
js/ui/telepathyClient.js | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 5c51f31..5738a33 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -216,7 +216,10 @@ Client.prototype = {
}
// We got the TpContact
- let source = new RoomInviteSource(dispatchOp);
+
+ // FIXME: We don't have a 'chat room' icon (bgo #653737) use
+ // system-users for now as Empathy does.
+ let source = new ApproverSource(dispatchOp, _("Invitation"), 'system-users');
Main.messageTray.add(source);
let notif = new RoomInviteNotification(source, dispatchOp, channel, contacts[0]);
@@ -800,16 +803,17 @@ ChatNotification.prototype = {
}
};
-function RoomInviteSource(dispatchOp) {
- this._init(dispatchOp);
+function ApproverSource(dispatchOp, text, icon) {
+ this._init(dispatchOp, text, icon);
}
-RoomInviteSource.prototype = {
+ApproverSource.prototype = {
__proto__: MessageTray.Source.prototype,
- _init: function(dispatchOp) {
- MessageTray.Source.prototype._init.call(this, _("Invitation"));
+ _init: function(dispatchOp, text, icon) {
+ MessageTray.Source.prototype._init.call(this, text);
+ this._icon = icon;
this._setSummaryIcon(this.createNotificationIcon());
this._dispatchOp = dispatchOp;
@@ -832,9 +836,7 @@ RoomInviteSource.prototype = {
},
createNotificationIcon: function() {
- // FIXME: We don't have a 'chat room' icon (bgo #653737) use
- // system-users for now as Empathy does.
- return new St.Icon({ icon_name: 'system-users',
+ return new St.Icon({ icon_name: this._icon,
icon_type: St.IconType.FULLCOLOR,
icon_size: this.ICON_SIZE });
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]