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