add_transport_to_roster goes to roster.py

This commit is contained in:
Yann Leboulanger 2005-12-20 21:27:15 +00:00
parent 93f205f53b
commit fd89e6eaab
2 changed files with 11 additions and 10 deletions

View File

@ -43,7 +43,6 @@ try:
except:
HAS_GTK_SPELL = False
from gajim import Contact
from common import helpers
from common import gajim
from common import connection
@ -1870,13 +1869,6 @@ class ServiceRegistrationWindow(DataFormWindow):
entry.grab_focus()
table.show_all()
def add_transport_to_roster(self):
user1 = Contact(jid = self.service, name = self.service,
groups = [_('Transports')], show = 'offline', status = 'offline',
sub = 'from')
gajim.contacts[self.account][self.service] = [user1]
gajim.interface.roster.add_contact_to_roster(self.service, self.account)
def on_ok_button_clicked(self, widget):
'''When Ok button is clicked:
send registration info to the core'''
@ -1887,7 +1879,8 @@ class ServiceRegistrationWindow(DataFormWindow):
if self.infos.has_key('registered'):
del self.infos['registered']
else:
self.add_transport_to_roster()
gajim.interface.roster.add_transport_to_roster(self.account,
self.service)
gajim.connections[self.account].register_agent(self.service, self.infos)
self.window.destroy()
@ -1896,7 +1889,8 @@ class ServiceRegistrationWindow(DataFormWindow):
if self.infos.has_key('registered'):
del self.infos['registered']
else:
self.add_transport_to_roster()
gajim.interface.roster.add_transport_to_roster(self.account,
self.service)
gajim.connections[self.account].register_agent(self.service, self.infos,
True) # True is for is_form
self.window.destroy()

View File

@ -203,6 +203,13 @@ class RosterWindow:
self.draw_contact(jid, account)
self.draw_avatar(jid, account)
def add_transport_to_roster(self, account, transport):
user1 = Contact(jid = transport, name = transport,
groups = [_('Transports')], show = 'offline', status = 'offline',
sub = 'from')
gajim.contacts[account][transport] = [user1]
gajim.interface.roster.add_contact_to_roster(transport, account)
def really_remove_contact(self, user, account):
if user.jid in gajim.newly_added[account]:
return