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

factor out _createSource

Browse Source
This commit is contained in:
Guillaume Desmottes 2011-02-09 11:35:50 +01:00
parent 02bcce07bd
commit ccd2fec890
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/ui/telepathyClient.js
View File

@ -79,17 +79,6 @@ Client.prototype = {
targetHandleType != Tp.HandleType.CONTACT) targetHandleType != Tp.HandleType.CONTACT)
continue; continue;
if (this._sources[connPath + ':' + targetHandle])
continue;
let source = new Source(account, conn, chan);
this._sources[connPath + ':' + targetHandle] = source;
source.connect('destroy', Lang.bind(this,
function() {
delete this._sources[connPath + ':' + targetHandle];
}));
/* Request a TpContact */ /* Request a TpContact */
Shell.get_tp_contacts(conn, 1, [targetHandle], Shell.get_tp_contacts(conn, 1, [targetHandle],
contactFeatures.length, contactFeatures, contactFeatures.length, contactFeatures,
@ -98,21 +87,25 @@ Client.prototype = {
return; return;
/* We got the TpContact */ /* We got the TpContact */
if (this._sources[chan.get_object_path()]) this._createSource(account, conn, channel, contacts[0]);
return; }), null);
let source = new Source(account, conn, chan, contacts[0]);
this._sources[chan.get_object_path()] = source;
source.connect('destroy', Lang.bind(this,
function() {
delete this._sources[chan.get_object_path()];
}));
}));
} }
// Allow dbus method to return // Allow dbus method to return
context.accept(); context.accept();
},
_createSource: function(account, conn, channel, contact) {
if (this._sources[channel.get_object_path()])
return;
let source = new Source(account, conn, channel, contact);
this._sources[channel.get_object_path()] = source;
source.connect('destroy', Lang.bind(this,
function() {
delete this._sources[channel.get_object_path()];
}));
} }
}; };