@@ -2151,13 +2151,13 @@ def click_pushButtonFetchNamecoinID(self):
2151
2151
self .statusBar ().showMessage (_translate (
2152
2152
"MainWindow" , "Fetched address from namecoin identity." ))
2153
2153
2154
- def setBroadcastEnablementDependingOnWhetherThisIsAChanAddress (self , address ):
2154
+ def setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress (self , address ):
2155
2155
# If this is a chan then don't let people broadcast because no one
2156
2156
# 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' ):
2160
2158
self .ui .tabWidgetSend .setCurrentIndex (1 )
2159
+ else :
2160
+ self .ui .tabWidgetSend .setCurrentIndex (0 )
2161
2161
2162
2162
def rerenderComboBoxSendFrom (self ):
2163
2163
self .ui .comboBoxSendFrom .clear ()
@@ -2866,22 +2866,24 @@ def on_action_InboxReply(self):
2866
2866
'message' : self .ui .textEditMessage
2867
2867
}
2868
2868
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
2876
2871
elif not shared .config .has_section (toAddressAtCurrentInboxRow ):
2877
2872
QtGui .QMessageBox .information (self , _translate ("MainWindow" , "Address is gone" ), _translate (
2878
2873
"MainWindow" , "Bitmessage cannot find your address %1. Perhaps you removed it?" ).arg (toAddressAtCurrentInboxRow ), QMessageBox .Ok )
2879
2874
elif not shared .config .getboolean (toAddressAtCurrentInboxRow , 'enabled' ):
2880
2875
QtGui .QMessageBox .information (self , _translate ("MainWindow" , "Address disabled" ), _translate (
2881
2876
"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 )
2882
2877
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
2885
2887
2886
2888
self .ui .lineEditTo .setText (str (acct .fromAddress ))
2887
2889
0 commit comments