Skip to content

Commit faeaad2

Browse files
mailchuckPeterSurda
authored andcommitted
Replies to mailing lists
Attempt to fix #49. Will close after positive feedback.
1 parent bf9bdaa commit faeaad2

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
@@ -2151,13 +2151,13 @@ def click_pushButtonFetchNamecoinID(self):
21512151
self.statusBar().showMessage(_translate(
21522152
"MainWindow", "Fetched address from namecoin identity."))
21532153

2154-
def setBroadcastEnablementDependingOnWhetherThisIsAChanAddress(self, address):
2154+
def setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress(self, address):
21552155
# If this is a chan then don't let people broadcast because no one
21562156
# should subscribe to chan addresses.
2157-
if shared.safeConfigGetBoolean(str(address), 'chan'):
2158-
self.ui.tabWidgetSend.setCurrentIndex(0)
2159-
else:
2157+
if shared.safeConfigGetBoolean(str(address), 'mailinglist'):
21602158
self.ui.tabWidgetSend.setCurrentIndex(1)
2159+
else:
2160+
self.ui.tabWidgetSend.setCurrentIndex(0)
21612161

21622162
def rerenderComboBoxSendFrom(self):
21632163
self.ui.comboBoxSendFrom.clear()
@@ -2866,22 +2866,24 @@ def on_action_InboxReply(self):
28662866
'message': self.ui.textEditMessage
28672867
}
28682868
if toAddressAtCurrentInboxRow == str_broadcast_subscribers:
2869-
widget = {
2870-
'subject': self.ui.lineEditSubjectBroadcast,
2871-
'from': self.ui.comboBoxSendFromBroadcast,
2872-
'message': self.ui.textEditMessageBroadcast
2873-
}
2874-
self.ui.tabWidgetSend.setCurrentIndex(1)
2875-
toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow
2869+
self.ui.tabWidgetSend.setCurrentIndex(0)
2870+
# toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow
28762871
elif not shared.config.has_section(toAddressAtCurrentInboxRow):
28772872
QtGui.QMessageBox.information(self, _translate("MainWindow", "Address is gone"), _translate(
28782873
"MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(toAddressAtCurrentInboxRow), QMessageBox.Ok)
28792874
elif not shared.config.getboolean(toAddressAtCurrentInboxRow, 'enabled'):
28802875
QtGui.QMessageBox.information(self, _translate("MainWindow", "Address disabled"), _translate(
28812876
"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)
28822877
else:
2883-
#self.setBroadcastEnablementDependingOnWhetherThisIsAChanAddress(toAddressAtCurrentInboxRow)
2884-
self.ui.tabWidgetSend.setCurrentIndex(0)
2878+
self.setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress(toAddressAtCurrentInboxRow)
2879+
if self.ui.tabWidgetSend.currentIndex() == 1:
2880+
widget = {
2881+
'subject': self.ui.lineEditSubjectBroadcast,
2882+
'from': self.ui.comboBoxSendFromBroadcast,
2883+
'message': self.ui.textEditMessageBroadcast
2884+
}
2885+
self.ui.tabWidgetSend.setCurrentIndex(1)
2886+
toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow
28852887

28862888
self.ui.lineEditTo.setText(str(acct.fromAddress))
28872889

0 commit comments

Comments
 (0)