| ... |
... |
@@ -204,19 +204,9 @@ class GajimRemote(Server): |
|
204
|
204
|
<arg name='prio' type='s' />
|
|
205
|
205
|
<arg name='account' type='s' />
|
|
206
|
206
|
</method>
|
|
207
|
|
- <method name='show_roster' />
|
|
208
|
|
- <method name='start_chat'>
|
|
209
|
|
- <arg name='jid' type='s' />
|
|
210
|
|
- <arg direction='out' type='b' />
|
|
211
|
|
- </method>
|
|
212
|
|
- <method name='toggle_ipython' />
|
|
213
|
|
- <method name='toggle_roster_appearance' />
|
|
214
|
207
|
<signal name='AccountPresence'>
|
|
215
|
208
|
<arg type='av' />
|
|
216
|
209
|
</signal>
|
|
217
|
|
- <signal name='ChatState'>
|
|
218
|
|
- <arg type='av' />
|
|
219
|
|
- </signal>
|
|
220
|
210
|
<signal name='ContactAbsence'>
|
|
221
|
211
|
<arg type='av' />
|
|
222
|
212
|
</signal>
|
| ... |
... |
@@ -226,30 +216,15 @@ class GajimRemote(Server): |
|
226
|
216
|
<signal name='ContactStatus'>
|
|
227
|
217
|
<arg type='av' />
|
|
228
|
218
|
</signal>
|
|
229
|
|
- <signal name='EntityTime'>
|
|
230
|
|
- <arg type='av' />
|
|
231
|
|
- </signal>
|
|
232
|
219
|
<signal name='GCMessage'>
|
|
233
|
220
|
<arg type='av' />
|
|
234
|
221
|
</signal>
|
|
235
|
|
- <signal name='GCPresence'>
|
|
236
|
|
- <arg type='av' />
|
|
237
|
|
- </signal>
|
|
238
|
222
|
<signal name='MessageSent'>
|
|
239
|
223
|
<arg type='av' />
|
|
240
|
224
|
</signal>
|
|
241
|
|
- <signal name='NewAccount'>
|
|
242
|
|
- <arg type='av' />
|
|
243
|
|
- </signal>
|
|
244
|
225
|
<signal name='NewMessage'>
|
|
245
|
226
|
<arg type='av' />
|
|
246
|
227
|
</signal>
|
|
247
|
|
- <signal name='Roster'>
|
|
248
|
|
- <arg type='av' />
|
|
249
|
|
- </signal>
|
|
250
|
|
- <signal name='RosterInfo'>
|
|
251
|
|
- <arg type='av' />
|
|
252
|
|
- </signal>
|
|
253
|
228
|
<signal name='Subscribe'>
|
|
254
|
229
|
<arg type='av' />
|
|
255
|
230
|
</signal>
|
| ... |
... |
@@ -259,9 +234,6 @@ class GajimRemote(Server): |
|
259
|
234
|
<signal name='Unsubscribed'>
|
|
260
|
235
|
<arg type='av' />
|
|
261
|
236
|
</signal>
|
|
262
|
|
- <signal name='VcardInfo'>
|
|
263
|
|
- <arg type='av' />
|
|
264
|
|
- </signal>
|
|
265
|
237
|
</interface>
|
|
266
|
238
|
</node>
|
|
267
|
239
|
'''
|
| ... |
... |
@@ -273,10 +245,6 @@ def __init__(self): |
|
273
|
245
|
super().__init__(self.con, '/org/gajim/dbus/RemoteObject')
|
|
274
|
246
|
self.first_show = True
|
|
275
|
247
|
|
|
276
|
|
- app.ged.register_event_handler('time-result-received', ged.POSTGUI,
|
|
277
|
|
- self.on_time)
|
|
278
|
|
- app.ged.register_event_handler('roster-info', ged.POSTGUI,
|
|
279
|
|
- self.on_roster_info)
|
|
280
|
248
|
app.ged.register_event_handler('presence-received', ged.POSTGUI,
|
|
281
|
249
|
self.on_presence_received)
|
|
282
|
250
|
app.ged.register_event_handler('subscribe-presence-received',
|
| ... |
... |
@@ -291,10 +259,6 @@ def __init__(self): |
|
291
|
259
|
ged.POSTGUI, self._nec_decrypted_message_received)
|
|
292
|
260
|
app.ged.register_event_handler('our-show', ged.POSTGUI,
|
|
293
|
261
|
self.on_our_status)
|
|
294
|
|
- app.ged.register_event_handler('account-created', ged.POSTGUI,
|
|
295
|
|
- self.on_account_created)
|
|
296
|
|
- app.ged.register_event_handler('vcard-received', ged.POSTGUI,
|
|
297
|
|
- self.on_vcard_received)
|
|
298
|
262
|
app.ged.register_event_handler('message-sent', ged.POSTGUI,
|
|
299
|
263
|
self.on_message_sent)
|
|
300
|
264
|
|
| ... |
... |
@@ -306,15 +270,6 @@ def on_message_sent(self, obj): |
|
306
|
270
|
self.raise_signal('MessageSent', (obj.account, [
|
|
307
|
271
|
obj.jid, obj.message, chatstate]))
|
|
308
|
272
|
|
|
309
|
|
- def on_time(self, obj):
|
|
310
|
|
- self.raise_signal('EntityTime', (obj.conn.name, [obj.jid.bare,
|
|
311
|
|
- obj.jid.resource,
|
|
312
|
|
- obj.time_info]))
|
|
313
|
|
-
|
|
314
|
|
- def on_roster_info(self, obj):
|
|
315
|
|
- self.raise_signal('RosterInfo', (obj.conn.name, [obj.jid, obj.nickname,
|
|
316
|
|
- obj.sub, obj.ask, obj.groups]))
|
|
317
|
|
-
|
|
318
|
273
|
def on_presence_received(self, obj):
|
|
319
|
274
|
if obj.old_show < 2 and obj.new_show > 1:
|
|
320
|
275
|
event = 'ContactPresence'
|
| ... |
... |
@@ -360,12 +315,6 @@ def _nec_decrypted_message_received(self, obj): |
|
360
|
315
|
def on_our_status(self, event):
|
|
361
|
316
|
self.raise_signal('AccountPresence', (event.show, event.account))
|
|
362
|
317
|
|
|
363
|
|
- def on_account_created(self, obj):
|
|
364
|
|
- self.raise_signal('NewAccount', (obj.conn.name, obj.account_info))
|
|
365
|
|
-
|
|
366
|
|
- def on_vcard_received(self, obj):
|
|
367
|
|
- self.raise_signal('VcardInfo', (obj.account, obj.vcard_dict))
|
|
368
|
|
-
|
|
369
|
318
|
def raise_signal(self, event_name, data):
|
|
370
|
319
|
log.info('Send event %s', event_name)
|
|
371
|
320
|
self.con.emit_signal(None,
|
| ... |
... |
@@ -780,10 +729,6 @@ def _contacts_as_dbus_structure(self, bare_contact): |
|
780
|
729
|
def get_unread_msgs_number(self):
|
|
781
|
730
|
return str(app.window.get_total_unread_count())
|
|
782
|
731
|
|
|
783
|
|
- def start_chat(self, jid=''):
|
|
784
|
|
- app.app.activate_action('start-chat', GLib.Variant('s', jid))
|
|
785
|
|
- return True
|
|
786
|
|
-
|
|
787
|
732
|
def send_xml(self, xml, account):
|
|
788
|
733
|
if account:
|
|
789
|
734
|
app.connections[account].send_stanza(str(xml))
|