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

use TpAccountChannelRequest to re-ensure the channel

Browse Source
This commit is contained in:
Guillaume Desmottes 2011-02-08 11:53:40 +01:00
parent 2fd5371de7
commit 69d3aad080
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/telepathyClient.js
View File

@ -15,7 +15,6 @@ const MessageTray = imports.ui.messageTray;
const Telepathy = imports.misc.telepathy; const Telepathy = imports.misc.telepathy;
let contactManager; let contactManager;
let channelDispatcher;
// See Notification.appendMessage // See Notification.appendMessage
const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute
@ -52,10 +51,6 @@ Client.prototype = {
contactManager = new ContactManager(); contactManager = new ContactManager();
contactManager.connect('presence-changed', Lang.bind(this, this._presenceChanged)); contactManager.connect('presence-changed', Lang.bind(this, this._presenceChanged));
channelDispatcher = new Telepathy.ChannelDispatcher(DBus.session,
Tp.CHANNEL_DISPATCHER_BUS_NAME,
Tp.CHANNEL_DISPATCHER_OBJECT_PATH);
// Set up a SimpleObserver, which will call _observeChannels whenever a // Set up a SimpleObserver, which will call _observeChannels whenever a
// channel matching its filters is detected. // channel matching its filters is detected.
// The second argument, recover, means _observeChannels will be run // The second argument, recover, means _observeChannels will be run
@ -434,22 +429,11 @@ Source.prototype = {
_notificationClicked: function(notification) { _notificationClicked: function(notification) {
let props = {}; let props = {};
props[Tp.PROP_CHANNEL_CHANNEL_TYPE] = Tp.IFACE_CHANNEL_TYPE_TEXT; props[Tp.PROP_CHANNEL_CHANNEL_TYPE] = Tp.IFACE_CHANNEL_TYPE_TEXT;
props[Tp.PROP_CHANNEL_TARGET_HANDLE] = this._targetHandle; [props[Tp.PROP_CHANNEL_TARGET_HANDLE], props[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE]] = this._channel.get_handle();
props[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE] = this._targetHandleType;
channelDispatcher.EnsureChannelRemote(this._account.get_object_path(), props,
global.get_current_time(),
'',
Lang.bind(this, this._gotChannelRequest));
},
_gotChannelRequest: function (chanReqPath, ex) { let req = Tp.AccountChannelRequest.new(this._account, props, global.get_current_time());
if (ex) {
log ('EnsureChannelRemote failed? ' + ex);
return;
}
let chanReq = new Telepathy.ChannelRequest(DBus.session, Tp.CHANNEL_DISPATCHER_BUS_NAME, chanReqPath); req.ensure_channel_async('', null, null);
chanReq.ProceedRemote();
}, },
_gotPendingMessages: function(msgs, err) { _gotPendingMessages: function(msgs, err) {