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

Fixed some problems noticed by marina

Browse Source
This commit is contained in:
Dan Winship 2009-11-18 13:42:07 -05:00
parent e5b12619ef
commit e823a3b554
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/ui/messaging.js
View File

@ -46,15 +46,13 @@ const ConnectionIface = {
] ]
}; };
function Connection(path, name) { function Connection(path) {
this._init(path, name); this._init(path);
}; };
Connection.prototype = { Connection.prototype = {
_init: function(path, name) { _init: function(path) {
if (!name) DBus.session.proxifyObject(this, nameify(path), path);
name = nameify(path);
DBus.session.proxifyObject(this, name, path);
} }
}; };
@ -70,15 +68,13 @@ const ConnectionAvatarsIface = {
] ]
}; };
function ConnectionAvatars(path, name) { function ConnectionAvatars(path) {
this._init(path, name); this._init(path);
}; };
ConnectionAvatars.prototype = { ConnectionAvatars.prototype = {
_init: function(path, name) { _init: function(path) {
if (!name) DBus.session.proxifyObject(this, nameify(path), path);
name = nameify(path);
DBus.session.proxifyObject(this, name, path);
} }
}; };
@ -217,7 +213,7 @@ Messaging.prototype = {
let account = new Account(ACCOUNTMANAGER, accounts[i]); let account = new Account(ACCOUNTMANAGER, accounts[i]);
account.GetRemote('Connection', Lang.bind(this, account.GetRemote('Connection', Lang.bind(this,
function (conn_path, excp) { function (conn_path, excp) {
if (!conn_path) if (!conn_path || conn_path == '/')
return; return;
let conn = new Connection(conn_path); let conn = new Connection(conn_path);
@ -261,12 +257,7 @@ Messaging.prototype = {
ObserveChannels: function(account, conn_path, channels, ObserveChannels: function(account, conn_path, channels,
dispatch_operation, requests_satisfied, dispatch_operation, requests_satisfied,
observer_info) { observer_info) {
let conn = this._conns[conn_path]; let conn = new Connection(conn_path);
if (!conn) {
conn = new Connection(conn_path);
conn.connect('StatusChanged', Lang.bind(this, this._connectionStatusChanged));
}
let conn_name = nameify(conn_path); let conn_name = nameify(conn_path);
for (let i = 0; i < channels.length; i++) { for (let i = 0; i < channels.length; i++) {
let channelPath = channels[i][0]; let channelPath = channels[i][0];
@ -279,12 +270,6 @@ Messaging.prototype = {
return [true]; return [true];
}, },
_connectionStatusChanged: function(connection, status) {
if (status == Connection_Status.Disconnected) {
delete this._conns[connection.getPath()];
}
},
_addChannel: function(conn, channelPath, targetHandle, targetId) { _addChannel: function(conn, channelPath, targetHandle, targetId) {
this._channels[channelPath] = new Source(conn, channelPath, targetHandle, targetId); this._channels[channelPath] = new Source(conn, channelPath, targetHandle, targetId);
} }
@ -293,8 +278,8 @@ Messaging.prototype = {
DBus.conformExport(Messaging.prototype, ClientIface); DBus.conformExport(Messaging.prototype, ClientIface);
DBus.conformExport(Messaging.prototype, ClientObserverIface); DBus.conformExport(Messaging.prototype, ClientObserverIface);
function Source(conn, channelPath, channel_props) { function Source(conn, channelPath, channel_props, targetId) {
this._init(conn, channelPath, channel_props); this._init(conn, channelPath, channel_props, targetId);
} }
Source.prototype = { Source.prototype = {