/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: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mergedirective.py
45
45
 
46
46
    def _create(self):
47
47
        table = Gtk.Table(rows=3, columns=2)
48
 
        self.vbox.add(table)
 
48
        self.get_content_area().add(table)
49
49
 
50
50
        label = Gtk.Label()
51
51
        label.set_markup("<b>Branch to Submit:</b>")
68
68
        label.set_markup("<b>Email To:</b>")
69
69
        table.attach(label, 0, 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
70
70
 
71
 
        self.mail_to = Gtk.ComboBoxEntry()
 
71
        self.mail_to = Gtk.ComboBox.new_with_entry()
72
72
        mail_to = self.branch.get_config().get_user_option('submit_to')
73
73
        if mail_to is None:
74
74
            submit_branch = self.submit_branch.get_branch()