Put mailing lists behind normal accounts

Fixes #58
This commit is contained in:
mailchuck 2015-10-23 07:07:38 +02:00 committed by Peter Surda
parent f6bd312dc5
commit 1d86f7a699

View File

@ -132,16 +132,21 @@ class Ui_AddressWidget(QtGui.QTreeWidgetItem):
reverse = False reverse = False
if self.treeWidget().header().sortIndicatorOrder() == QtCore.Qt.DescendingOrder: if self.treeWidget().header().sortIndicatorOrder() == QtCore.Qt.DescendingOrder:
reverse = True reverse = True
if shared.config.getboolean(self.address, 'enabled') == shared.config.getboolean(other.address, 'enabled'): if shared.config.getboolean(self.address, 'enabled') == \
if shared.config.get(self.address, 'label'): shared.config.getboolean(other.address, 'enabled'):
x = shared.config.get(self.address, 'label').decode('utf-8').lower() if shared.safeConfigGetBoolean(self.address, 'mailinglist') == \
shared.safeConfigGetBoolean(other.address, 'mailinglist'):
if shared.config.get(self.address, 'label'):
x = shared.config.get(self.address, 'label').decode('utf-8').lower()
else:
x = self.address.decode('utf-8').lower()
if shared.config.get(other.address, 'label'):
y = shared.config.get(other.address, 'label').decode('utf-8').lower()
else:
y = other.address.decode('utf-8').lower()
return x < y
else: else:
x = self.address.decode('utf-8').lower() return (reverse if shared.safeConfigGetBoolean(self.address, 'mailinglist') else not reverse)
if shared.config.get(other.address, 'label'):
y = shared.config.get(other.address, 'label').decode('utf-8').lower()
else:
y = other.address.decode('utf-8').lower()
return x < y
# else: # else:
return (not reverse if shared.config.getboolean(self.address, 'enabled') else reverse) return (not reverse if shared.config.getboolean(self.address, 'enabled') else reverse)