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

user-menu: Fix fallout from GDBus port

Browse Source 
- replace some left-over references to GnomeSession.Presence.setStatus()
 - the correct replacement for GnomeSession.Presence.getStatus()
   is *not* GnomeSession.Presence.connectSignal('StatusChanged')
This commit is contained in:
Florian Müllner 2011-11-11 22:41:47 +01:00
parent a9ab8784c4
commit 7854024326
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/userMenu.js
View File

@ -158,7 +158,7 @@ IMStatusChooserItem.prototype = {
this._presence = new GnomeSession.Presence(); this._presence = new GnomeSession.Presence();
this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) { this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
this._sessionStatusChanged(status); this._sessionStatusChanged(status);
})); }));
this._sessionPresenceRestored = false; this._sessionPresenceRestored = false;
@ -293,14 +293,12 @@ IMStatusChooserItem.prototype = {
this._setComboboxPresence(presence); this._setComboboxPresence(presence);
if (!this._sessionPresenceRestored) { if (!this._sessionPresenceRestored) {
this._presence.connectSignal('StatusChanged', Lang.bind(this, function (proxy, senderName, [status]) { this._sessionStatusChanged(this._presence.status);
this._sessionStatusChanged(status);
}));
return; return;
} }
if (presence == Tp.ConnectionPresenceType.AVAILABLE) if (presence == Tp.ConnectionPresenceType.AVAILABLE)
this._presence.setStatus(GnomeSession.PresenceStatus.AVAILABLE); this._presence.status = GnomeSession.PresenceStatus.AVAILABLE;
// We ignore the actual value of _expectedPresence and never safe // We ignore the actual value of _expectedPresence and never safe
// the first presence change after an "automatic" change, assuming // the first presence change after an "automatic" change, assuming
@ -455,10 +453,6 @@ UserMenuButton.prototype = {
this._idleIcon = new St.Icon({ icon_name: 'user-idle', this._idleIcon = new St.Icon({ icon_name: 'user-idle',
style_class: 'popup-menu-icon' }); style_class: 'popup-menu-icon' });
this._presence.connectSignal('StatusChanged', Lang.bind(this, function (proxy, senderName, [status]) {
this._updateSwitch(status);
}));
this._accountMgr.connect('most-available-presence-changed', this._accountMgr.connect('most-available-presence-changed',
Lang.bind(this, this._updatePresenceIcon)); Lang.bind(this, this._updatePresenceIcon));
this._accountMgr.prepare_async(null, Lang.bind(this, this._accountMgr.prepare_async(null, Lang.bind(this,
@ -474,6 +468,12 @@ UserMenuButton.prototype = {
this._updateUserName(); this._updateUserName();
this._createSubMenu(); this._createSubMenu();
this._updateSwitch(this._presence.status);
this._presence.connectSignal('StatusChanged', Lang.bind(this, function (proxy, senderName, [status]) {
this._updateSwitch(status);
}));
this._userManager.connect('notify::is-loaded', this._userManager.connect('notify::is-loaded',
Lang.bind(this, this._updateSwitchUser)); Lang.bind(this, this._updateSwitchUser));
this._userManager.connect('notify::has-multiple-users', this._userManager.connect('notify::has-multiple-users',
@ -667,7 +667,7 @@ UserMenuButton.prototype = {
_("Notifications are now disabled, including chat messages. Your online status has been adjusted to let others know that you might not see their messages.")); _("Notifications are now disabled, including chat messages. Your online status has been adjusted to let others know that you might not see their messages."));
} }
this._presence.setStatus(status); this._presence.status = status;
}, },
_onMyAccountActivate: function() { _onMyAccountActivate: function() {