V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
2 changed files with 11 additions and 2 deletions
Showing only changes of commit 321bf9a6c9 - Show all commits

View File

@ -2667,7 +2667,7 @@ more work your computer must do to send the message. A Time-To-Live of four or f
acct = accountClass(addressAtCurrentRow)
# no chans / mailinglists
if acct.type != 'normal':
continue
return
if self.dialog.ui.radioButtonUnregister.isChecked():
print "unregister"
acct.unregister()
@ -3481,7 +3481,10 @@ more work your computer must do to send the message. A Time-To-Live of four or f
if column != 0:
return
# only account names of normal addresses (no chans/mailinglists)
if (not isinstance(item, Ui_AddressWidget)) or item.type != 'normal':
if (not isinstance(item, Ui_AddressWidget)) or item.type != 'normal' or self.getCurrentTreeWidget().currentItem() is None:
return
# not visible
if (not self.getCurrentAccount()) or (not isinstance (self.getCurrentAccount(), Ui_AddressWidget)):
return
# only currently selected item
if item.address != self.getCurrentTreeWidget().currentItem().address:

View File

@ -28,6 +28,12 @@ def accountClass(address):
class BMAccount(object):
def __init__(self, address = None):
self.address = address
self.type = 'normal'
if shared.config.has_section(address):
if shared.safeConfigGetBoolean(self.address, 'chan'):
self.type = "chan"
elif shared.safeConfigGetBoolean(self.address, 'mailinglist'):
self.type = "mailinglist"
def getLabel(self, address = None):
if address is None: