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

moved socks5 module outside xmpp

This commit is contained in:
Dimitur Kirov 2005-08-01 22:58:14 +00:00
parent b936f2db52
commit 760453870f
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/connection.py
View File

@ -34,7 +34,7 @@ import common.xmpp
from common import helpers
from common import gajim
from common import GnuPG
from xmpp import socks5
import socks5
USE_GPG = GnuPG.USE_GPG
from common import i18n
@ -332,11 +332,11 @@ class Connection:
self.dispatch('SUBSCRIBED', (jid.getStripped().encode('utf8'),
jid.getResource().encode('utf8')))
#BE CAREFUL: no con.updateRosterItem() in a callback
gajim.log.debug(_('you are now subscribed to %s') % who)
gajim.log.debug(_('we are now subscribed to %s') % who)
elif ptype == 'unsubscribe':
gajim.log.debug(_('unsubscribe request from %s') % who)
elif ptype == 'unsubscribed':
gajim.log.debug(_('you are now unsubscribed from %s') % who)
gajim.log.debug(_('we are now unsubscribed from %s') % who)
self.dispatch('UNSUBSCRIBED', prs.getFrom().getStripped())
elif ptype == 'error':
errmsg = prs.getError()
@ -477,14 +477,6 @@ class Connection:
self.dispatch('FILE_REQUEST', (jid, file_props))
raise common.xmpp.NodeProcessed
def complete_file_transfer(self, file_props):
''' file transfer is completed or stopped '''
self.dispatch('FILE_RCV_COMPLETED', file_props)
def file_transfer_progress(self, file_props):
''' file transfer is completed or stopped '''
self.dispatch('FILE_PROGRESS', file_props)
def send_file_rejection(self, file_props):
''' informs sender that we refuse to download the file '''
iq = common.xmpp.Protocol(name = 'iq', to = str(file_props['sender']), \

5
src/gajim.py
View File

@ -38,7 +38,7 @@ import sre
import signal
import getopt
import time
from common.xmpp import socks5
from common import socks5
import gtkgui_helpers
from common import i18n
@ -897,9 +897,6 @@ class Interface:
con.register_handler('BOOKMARKS', self.handle_event_bookmarks)
con.register_handler('CON_TYPE', self.handle_event_con_type)
con.register_handler('FILE_REQUEST', self.handle_event_file_request)
con.register_handler('FILE_RCV_COMPLETED',
self.handle_event_file_rcv_completed)
con.register_handler('FILE_PROGRESS', self.handle_event_file_progress)
def process_connections(self):
try: