Rev 451: Honor child_submit_to in the submit_branch if no email address was specified. in file:///data/jelmer/bzr-gtk/child_submit/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/child_submit/

------------------------------------------------------------
revno: 451
revision-id:jelmer at samba.org-20080314021921-2dgptk62dhp7pd91
parent: jelmer at samba.org-20080314021327-q1pabtpneeasz8qv
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: child_submit
timestamp: Fri 2008-03-14 03:19:21 +0100
message:
  Honor child_submit_to in the submit_branch if no email address was specified.
  Consistent with the changes in bzr.dev.
modified:
  mergedirective.py              mergedirective.py-20070805005518-41uc6l5dle4e2trw-1
=== modified file 'mergedirective.py'
--- a/mergedirective.py	2007-10-26 17:02:18 +0000
+++ b/mergedirective.py	2008-03-14 02:19:21 +0000
@@ -78,6 +78,11 @@
 
         self.mail_to = gtk.ComboBoxEntry()
         mail_to = self.branch.get_config().get_user_option('submit_to')
+        if mail_to is None:
+            submit_branch = self.submit_branch.get_branch()
+            if submit_branch is not None:
+                mail_to = submit_branch.get_config().get_user_option(
+                            'child_submit_to')
         if mail_to is not None:
             self.mail_to.get_child().set_text(mail_to)
         table.attach(self.mail_to, 1, 2, 2, 3, gtk.FILL, gtk.FILL)