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

telepathyClient: Implement Tp.BaseClient directly

Browse Source 
The telepathy integration was written at a time where gjs didn't
allow to inherit from GObject classes, which is why we needed a
C helper class. This hasn't been the case for a while now, so cut
out the middle man and implement Tp.BaseClient directly.

https://bugzilla.gnome.org/show_bug.cgi?id=771721
This commit is contained in:
Florian Müllner 2016-09-19 23:42:55 +02:00
parent 64dbc8aa7f
commit 7c96b39bef
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ const GLib = imports.gi.GLib;
const Gtk = imports.gi.Gtk; const Gtk = imports.gi.Gtk;
const Lang = imports.lang; const Lang = imports.lang;
const Mainloop = imports.mainloop; const Mainloop = imports.mainloop;
const Shell = imports.gi.Shell;
const Signals = imports.signals; const Signals = imports.signals;
const St = imports.gi.St; const St = imports.gi.St;
const Tpl = imports.gi.TelepathyLogger; const Tpl = imports.gi.TelepathyLogger;
@ -73,6 +72,7 @@ function makeMessageFromTplEvent(event) {
const TelepathyClient = new Lang.Class({ const TelepathyClient = new Lang.Class({
Name: 'TelepathyClient', Name: 'TelepathyClient',
Extends: Tp.BaseClient,
_init: function() { _init: function() {
// channel path -> ChatSource // channel path -> ChatSource
@ -97,25 +97,29 @@ const TelepathyClient = new Lang.Class({
// 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
// for any existing channel as well. // for any existing channel as well.
this._tpClient = new Shell.TpClient({ name: 'GnomeShell', this.parent({ name: 'GnomeShell',
account_manager: this._accountManager, account_manager: this._accountManager,
uniquify_name: true }); uniquify_name: true });
this._tpClient.set_observe_channels_func(
Lang.bind(this, this._observeChannels)); // We only care about single-user text-based chats
this._tpClient.set_approve_channels_func( let filter = {};
Lang.bind(this, this._approveChannels)); filter[Tp.PROP_CHANNEL_CHANNEL_TYPE] = Tp.IFACE_CHANNEL_TYPE_TEXT;
this._tpClient.set_handle_channels_func( filter[Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE] = Tp.HandleType.CONTACT;
Lang.bind(this, this._handleChannels));
this.set_observer_recover(true);
this.add_observer_filter(filter);
this.add_approver_filter(filter);
this.add_handler_filter(filter);
// Allow other clients (such as Empathy) to pre-empt our channels if // Allow other clients (such as Empathy) to pre-empt our channels if
// needed // needed
this._tpClient.set_delegated_channels_callback( this.set_delegated_channels_callback(
Lang.bind(this, this._delegatedChannelsCb)); Lang.bind(this, this._delegatedChannelsCb));
}, },
enable: function() { enable: function() {
try { try {
this._tpClient.register(); this.register();
} catch (e) { } catch (e) {
throw new Error('Couldn\'t register Telepathy client. Error: \n' + e); throw new Error('Couldn\'t register Telepathy client. Error: \n' + e);
} }
@ -125,11 +129,11 @@ const TelepathyClient = new Lang.Class({
}, },
disable: function() { disable: function() {
this._tpClient.unregister(); this.unregister();
}, },
_observeChannels: function(observer, account, conn, channels, vfunc_observe_channels: function(account, conn, channels,
dispatchOp, requests, context) { dispatchOp, requests, context) {
let len = channels.length; let len = channels.length;
for (let i = 0; i < len; i++) { for (let i = 0; i < len; i++) {
let channel = channels[i]; let channel = channels[i];
@ -153,7 +157,7 @@ const TelepathyClient = new Lang.Class({
if (this._chatSources[channel.get_object_path()]) if (this._chatSources[channel.get_object_path()])
return; return;
let source = new ChatSource(account, conn, channel, contact, this._tpClient); let source = new ChatSource(account, conn, channel, contact, this);
this._chatSources[channel.get_object_path()] = source; this._chatSources[channel.get_object_path()] = source;
source.connect('destroy', Lang.bind(this, source.connect('destroy', Lang.bind(this,
@ -162,8 +166,8 @@ const TelepathyClient = new Lang.Class({
})); }));
}, },
_handleChannels: function(handler, account, conn, channels, vfunc_handle_channels: function(account, conn, channels, requests,
requests, user_action_time, context) { user_action_time, context) {
this._handlingChannels(account, conn, channels, true); this._handlingChannels(account, conn, channels, true);
context.accept(); context.accept();
}, },
@ -193,7 +197,7 @@ const TelepathyClient = new Lang.Class({
// Telepathy spec states that handlers must foreground channels // Telepathy spec states that handlers must foreground channels
// in HandleChannels calls which are already being handled. // in HandleChannels calls which are already being handled.
if (notify && this._tpClient.is_handling_channel(channel)) { if (notify && this.is_handling_channel(channel)) {
// We are already handling the channel, display the source // We are already handling the channel, display the source
let source = this._chatSources[channel.get_object_path()]; let source = this._chatSources[channel.get_object_path()];
if (source) if (source)
@ -202,8 +206,8 @@ const TelepathyClient = new Lang.Class({
} }
}, },
_approveChannels: function(approver, account, conn, channels, vfunc_add_dispatch_operation: function(account, conn, channels,
dispatchOp, context) { dispatchOp, context) {
let channel = channels[0]; let channel = channels[0];
let chanType = channel.get_channel_type(); let chanType = channel.get_channel_type();
@ -230,7 +234,7 @@ const TelepathyClient = new Lang.Class({
} }
// Approve private text channels right away as we are going to handle it // Approve private text channels right away as we are going to handle it
dispatchOp.claim_with_async(this._tpClient, Lang.bind(this, function(dispatchOp, result) { dispatchOp.claim_with_async(this, Lang.bind(this, function(dispatchOp, result) {
try { try {
dispatchOp.claim_with_finish(result); dispatchOp.claim_with_finish(result);
this._handlingChannels(account, conn, [channel], false); this._handlingChannels(account, conn, [channel], false);