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

show a warning dialog when removing a pep node fails

This commit is contained in:
Yann Leboulanger 2010-09-03 11:28:48 +02:00
parent 1857c576d3
commit ea957fe015
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/config.py
View File

@ -3975,14 +3975,23 @@ class ManagePEPServicesWindow:
if 'jid' in item and item['jid'] == our_jid and 'node' in item: if 'jid' in item and item['jid'] == our_jid and 'node' in item:
self.treestore.append([item['node']]) self.treestore.append([item['node']])
def node_removed(self, node): def node_removed(self, jid, node):
if jid != gajim.get_jid_from_account(self.account):
return
model = self.treeview.get_model() model = self.treeview.get_model()
iter_ = model.get_iter_root() iter_ = model.get_iter_root()
while iter_: while iter_:
if model[iter_][0] == node: if model[iter_][0] == node:
model.remove(iter_) model.remove(iter_)
break break
iter_ = model.get_iter_next(iter_) iter_ = model.iter_next(iter_)
def node_not_removed(self, jid, node, msg):
if jid != gajim.get_jid_from_account(self.account):
return
dialogs.WarningDialog(_('PEP node was not removed'),
_('PEP node %(node)s was not removed: %(message)s') % {'node': node,
'message': msg})
def on_delete_button_clicked(self, widget): def on_delete_button_clicked(self, widget):
selection = self.treeview.get_selection() selection = self.treeview.get_selection()
@ -3991,7 +4000,8 @@ class ManagePEPServicesWindow:
model, iter_ = selection.get_selected() model, iter_ = selection.get_selected()
node = model[iter_][0] node = model[iter_][0]
our_jid = gajim.get_jid_from_account(self.account) our_jid = gajim.get_jid_from_account(self.account)
gajim.connections[self.account].send_pb_delete(our_jid, node) gajim.connections[self.account].send_pb_delete(our_jid, node,
on_ok=self.node_removed, on_fail=self.node_not_removed)
def on_configure_button_clicked(self, widget): def on_configure_button_clicked(self, widget):
selection = self.treeview.get_selection() selection = self.treeview.get_selection()

2
src/roster_window.py
View File

@ -2463,7 +2463,7 @@ class RosterWindow:
gajim.interface.instances[account]['xml_console'].window.present() gajim.interface.instances[account]['xml_console'].window.present()
else: else:
gajim.interface.instances[account]['xml_console'] = \ gajim.interface.instances[account]['xml_console'] = \
dialogs.XMLConsoleWindow(account) dialogs.XMLConsoleWindow(account)
def on_archiving_preferences_menuitem_activate(self, widget, account): def on_archiving_preferences_menuitem_activate(self, widget, account):
if 'archiving_preferences' in gajim.interface.instances[account]: if 'archiving_preferences' in gajim.interface.instances[account]: