Skip to content

Commit ceeea1d

Browse files
committed
Replies to mailing lists
Attempt to fix Bitmessage#49. Will close after positive feedback.
1 parent 2a561c0 commit ceeea1d

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/bitmessageqt/__init__.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,13 +2149,13 @@ def click_pushButtonFetchNamecoinID(self):
21492149
self.statusBar().showMessage(_translate(
21502150
"MainWindow", "Fetched address from namecoin identity."))
21512151

2152-
def setBroadcastEnablementDependingOnWhetherThisIsAChanAddress(self, address):
2152+
def setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress(self, address):
21532153
# If this is a chan then don't let people broadcast because no one
21542154
# should subscribe to chan addresses.
2155-
if shared.safeConfigGetBoolean(str(address), 'chan'):
2156-
self.ui.tabWidgetSend.setCurrentIndex(0)
2157-
else:
2155+
if shared.safeConfigGetBoolean(str(address), 'mailinglist'):
21582156
self.ui.tabWidgetSend.setCurrentIndex(1)
2157+
else:
2158+
self.ui.tabWidgetSend.setCurrentIndex(0)
21592159

21602160
def rerenderComboBoxSendFrom(self):
21612161
self.ui.comboBoxSendFrom.clear()
@@ -2864,22 +2864,24 @@ def on_action_InboxReply(self):
28642864
'message': self.ui.textEditMessage
28652865
}
28662866
if toAddressAtCurrentInboxRow == str_broadcast_subscribers:
2867-
widget = {
2868-
'subject': self.ui.lineEditSubjectBroadcast,
2869-
'from': self.ui.comboBoxSendFromBroadcast,
2870-
'message': self.ui.textEditMessageBroadcast
2871-
}
2872-
self.ui.tabWidgetSend.setCurrentIndex(1)
2873-
toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow
2867+
self.ui.tabWidgetSend.setCurrentIndex(0)
2868+
# toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow
28742869
elif not shared.config.has_section(toAddressAtCurrentInboxRow):
28752870
QtGui.QMessageBox.information(self, _translate("MainWindow", "Address is gone"), _translate(
28762871
"MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(toAddressAtCurrentInboxRow), QMessageBox.Ok)
28772872
elif not shared.config.getboolean(toAddressAtCurrentInboxRow, 'enabled'):
28782873
QtGui.QMessageBox.information(self, _translate("MainWindow", "Address disabled"), _translate(
28792874
"MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."), QMessageBox.Ok)
28802875
else:
2881-
#self.setBroadcastEnablementDependingOnWhetherThisIsAChanAddress(toAddressAtCurrentInboxRow)
2882-
self.ui.tabWidgetSend.setCurrentIndex(0)
2876+
self.setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress(toAddressAtCurrentInboxRow)
2877+
if self.ui.tabWidgetSend.currentIndex() == 1:
2878+
widget = {
2879+
'subject': self.ui.lineEditSubjectBroadcast,
2880+
'from': self.ui.comboBoxSendFromBroadcast,
2881+
'message': self.ui.textEditMessageBroadcast
2882+
}
2883+
self.ui.tabWidgetSend.setCurrentIndex(1)
2884+
toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow
28832885

28842886
self.ui.lineEditTo.setText(str(acct.fromAddress))
28852887

0 commit comments

Comments
 (0)