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

Telepathy: consolidate and improve connection notifications

Browse Source 
Use the empathy icon and name instead of the error icon, use
a friendlier title and remove the Reconnect button.

https://bugzilla.gnome.org/show_bug.cgi?id=687213
This commit is contained in:
Giovanni Campagna 2012-10-30 18:55:31 +01:00 committed by Allan Day
parent e20ff5ae45
commit 6092e01428
1 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,25 +383,12 @@ const TelepathyClient = new Lang.Class({
} }
/* Display notification to ask user to accept/reject request */ /* Display notification to ask user to accept/reject request */
let source = this._ensureSubscriptionSource(); let source = this._ensureAppSource();
let notif = new SubscriptionRequestNotification(source, contact); let notif = new SubscriptionRequestNotification(source, contact);
source.notify(notif); source.notify(notif);
}, },
_ensureSubscriptionSource: function() {
if (this._subscriptionSource == null) {
this._subscriptionSource = new MessageTray.Source(_("Subscription request"),
'gtk-dialog-question');
Main.messageTray.add(this._subscriptionSource);
this._subscriptionSource.connect('destroy', Lang.bind(this, function () {
this._subscriptionSource = null;
}));
}
return this._subscriptionSource;
},
_accountConnectionStatusNotifyCb: function(account) { _accountConnectionStatusNotifyCb: function(account) {
let connectionError = account.connection_error; let connectionError = account.connection_error;
@ -415,7 +402,7 @@ const TelepathyClient = new Lang.Class({
return; return;
/* Display notification that account failed to connect */ /* Display notification that account failed to connect */
let source = this._ensureAccountSource(); let source = this._ensureAppSource();
notif = new AccountNotification(source, account, connectionError); notif = new AccountNotification(source, account, connectionError);
this._accountNotifications[account.get_object_path()] = notif; this._accountNotifications[account.get_object_path()] = notif;
@ -425,17 +412,16 @@ const TelepathyClient = new Lang.Class({
source.notify(notif); source.notify(notif);
}, },
_ensureAccountSource: function() { _ensureAppSource: function() {
if (this._accountSource == null) { if (this._appSource == null) {
this._accountSource = new MessageTray.Source(_("Connection error"), this._appSource = new MessageTray.Source(_("Chat"), 'empathy');
'gtk-dialog-error'); Main.messageTray.add(this._appSource);
Main.messageTray.add(this._accountSource); this._appSource.connect('destroy', Lang.bind(this, function () {
this._accountSource.connect('destroy', Lang.bind(this, function () { this._appSource = null;
this._accountSource = null;
})); }));
} }
return this._accountSource; return this._appSource;
} }
}); });
@ -1353,26 +1339,16 @@ const AccountNotification = new Lang.Class({
this.parent(source, this.parent(source,
/* translators: argument is the account name, like /* translators: argument is the account name, like
* name@jabber.org for example. */ * name@jabber.org for example. */
_("Connection to %s failed").format(account.get_display_name()), _("Unable to connect to %s").format(account.get_display_name()),
null, { customContent: true }); this._getMessage(connectionError));
this._label = new St.Label();
this.addActor(this._label);
this._updateMessage(connectionError);
this._account = account; this._account = account;
this.addButton('reconnect', _("Reconnect")); this.addButton('view', _("View account"));
this.addButton('edit', _("Edit account"));
this.connect('action-invoked', Lang.bind(this, function(self, action) { this.connect('action-invoked', Lang.bind(this, function(self, action) {
switch (action) { switch (action) {
case 'reconnect': case 'view':
// If it fails again, a new notification should pop up with the
// new error.
account.reconnect_async(null);
break;
case 'edit':
let cmd = '/usr/bin/empathy-accounts' let cmd = '/usr/bin/empathy-accounts'
+ ' --select-account=%s' + ' --select-account=%s'
.format(account.get_path_suffix()); .format(account.get_path_suffix());
@ -1398,19 +1374,19 @@ const AccountNotification = new Lang.Class({
if (status == Tp.ConnectionStatus.CONNECTED) { if (status == Tp.ConnectionStatus.CONNECTED) {
this.destroy(); this.destroy();
} else if (status == Tp.ConnectionStatus.DISCONNECTED) { } else if (status == Tp.ConnectionStatus.DISCONNECTED) {
this._updateMessage(account.connection_error); this.update(this.title, this._getMessage(account.connection_error));
} }
})); }));
}, },
_updateMessage: function(connectionError) { _getMessage: function(connectionError) {
let message; let message;
if (connectionError in _connectionErrorMessages) { if (connectionError in _connectionErrorMessages) {
message = _connectionErrorMessages[connectionError]; message = _connectionErrorMessages[connectionError];
} else { } else {
message = _("Unknown reason"); message = _("Unknown reason");
} }
this._label.set_text(message); return message;
}, },
destroy: function() { destroy: function() {