copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use NEC to handle connection type events

Browse source
This commit is contained in:
Yann Leboulanger 2010-11-07 22:45:01 +01:00
parent d676dbd900
commit 1a0533998f
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/connection.py
View file

@ -1287,8 +1287,10 @@ class Connection(CommonConnection, ConnectionHandlers):
def _register_handlers(self, con, con_type): def _register_handlers(self, con, con_type):
self.peerhost = con.get_peerhost() self.peerhost = con.get_peerhost()
gajim.con_types[self.name] = con_type
# notify the gui about con_type # notify the gui about con_type
self.dispatch('CON_TYPE', con_type) gajim.nec.push_incoming_event(ConnectionTypeEvent(None,
conn=self, connection_type=con_type))
ConnectionHandlers._register_handlers(self, con, con_type) ConnectionHandlers._register_handlers(self, con, con_type)
def __on_auth(self, con, auth): def __on_auth(self, con, auth):

4
src/common/connection_handlers_events.py
View file

@ -1268,3 +1268,7 @@ class NewAccountConnectedEvent(nec.NetworkIncomingEvent):
class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent): class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent):
name = 'new-account-not-connected' name = 'new-account-not-connected'
base_network_events = [] base_network_events = []
class ConnectionTypeEvent(nec.NetworkIncomingEvent):
name = 'connection-type'
base_network_events = []

6
src/gui_interface.py
View file

@ -188,11 +188,6 @@ class Interface:
if ctrl and ctrl.type_id == message_control.TYPE_GC: if ctrl and ctrl.type_id == message_control.TYPE_GC:
ctrl.print_conversation('Error %s: %s' % (obj.errcode, obj.errmsg)) ctrl.print_conversation('Error %s: %s' % (obj.errcode, obj.errmsg))
def handle_event_con_type(self, account, con_type):
# ('CON_TYPE', account, con_type) which can be 'ssl', 'tls', 'plain'
gajim.con_types[account] = con_type
self.roster.draw_account(account)
def handle_event_connection_lost(self, account, array): def handle_event_connection_lost(self, account, array):
# ('CONNECTION_LOST', account, [title, text]) # ('CONNECTION_LOST', account, [title, text])
path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48) path = gtkgui_helpers.get_icon_path('gajim-connection_lost', 48)
@ -1812,7 +1807,6 @@ class Interface:
'GC_SUBJECT': [self.handle_event_gc_subject], 'GC_SUBJECT': [self.handle_event_gc_subject],
'GC_CONFIG_CHANGE': [self.handle_event_gc_config_change], 'GC_CONFIG_CHANGE': [self.handle_event_gc_config_change],
'BAD_PASSPHRASE': [self.handle_event_bad_passphrase], 'BAD_PASSPHRASE': [self.handle_event_bad_passphrase],
'CON_TYPE': [self.handle_event_con_type],
'CONNECTION_LOST': [self.handle_event_connection_lost], 'CONNECTION_LOST': [self.handle_event_connection_lost],
'FILE_REQUEST': [self.handle_event_file_request], 'FILE_REQUEST': [self.handle_event_file_request],
'FILE_REQUEST_ERROR': [self.handle_event_file_request_error], 'FILE_REQUEST_ERROR': [self.handle_event_file_request_error],

5
src/roster_window.py
View file

@ -2495,6 +2495,9 @@ class RosterWindow:
model[self.status_message_menuitem_iter][3] = True model[self.status_message_menuitem_iter][3] = True
self.on_status_changed(obj.conn.name, obj.show) self.on_status_changed(obj.conn.name, obj.show)
def _nec_connection_type(self, obj):
self.draw_account(obj.conn.name)
################################################################################ ################################################################################
### Menu and GUI callbacks ### Menu and GUI callbacks
### FIXME: order callbacks in itself... ### FIXME: order callbacks in itself...
@ -6229,3 +6232,5 @@ class RosterWindow:
self._nec_anonymous_auth) self._nec_anonymous_auth)
gajim.ged.register_event_handler('our-show', ged.GUI1, gajim.ged.register_event_handler('our-show', ged.GUI1,
self._nec_our_show) self._nec_our_show)
gajim.ged.register_event_handler('connection-type', ged.GUI1,
self._nec_connection_type)