/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to mergedirective.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-28 15:45:39 UTC
  • mfrom: (486.1.1 trunk-matkor)
  • Revision ID: jelmer@samba.org-20080628154539-l5lkvs5qwuf2zx1m
https://launchpad.net/bugs/215872
Merge fix for log button in olive-gtk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mergedirective.py
78
78
 
79
79
        self.mail_to = gtk.ComboBoxEntry()
80
80
        mail_to = self.branch.get_config().get_user_option('submit_to')
 
81
        if mail_to is None:
 
82
            submit_branch = self.submit_branch.get_branch()
 
83
            if submit_branch is not None:
 
84
                mail_to = submit_branch.get_config().get_user_option(
 
85
                            'child_submit_to')
81
86
        if mail_to is not None:
82
87
            self.mail_to.get_child().set_text(mail_to)
83
88
        table.attach(self.mail_to, 1, 2, 2, 3, gtk.FILL, gtk.FILL)