/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 olive/push.py

  • Committer: Aaron Bentley
  • Date: 2007-01-17 06:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: aaron.bentley@utoronto.ca-20070117064255-x4gznz5e0lyjq3gk
Remove usused span selector

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/push.py
26
26
 
27
27
import bzrlib.errors as errors
28
28
 
29
 
from olive import gladefile
30
29
from dialog import error_dialog, info_dialog
 
30
from guifiles import GLADEFILENAME
 
31
 
31
32
 
32
33
class OlivePush:
33
34
    """ Display Push dialog and perform the needed actions. """
34
35
    def __init__(self, branch):
35
36
        """ Initialize the Push dialog. """
36
 
        self.glade = gtk.glade.XML(gladefile, 'window_push')
 
37
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_push')
37
38
        
38
39
        self.window = self.glade.get_widget('window_push')
39
40
 
65
66
        self.check_remember.set_sensitive(0)
66
67
        self.check_create.set_sensitive(0)
67
68
        
68
 
        self.entry_stored.set_text(branch.get_push_location())
 
69
        self.entry_stored.set_text(branch.get_push_location() or '')
69
70
    
70
71
    def display(self):
71
72
        """ Display the Push dialog. """
184
185
    from bzrlib.bzrdir import BzrDir
185
186
    from bzrlib.transport import get_transport
186
187
        
187
 
    br_from = Branch.open_containing(branch)[0]
 
188
    br_from = branch
188
189
    
189
190
    stored_loc = br_from.get_push_location()
190
191
    if location is None:
191
192
        if stored_loc is None:
192
193
            error_dialog(_('Push location is unknown'),
193
 
                                     _('Please specify a location manually.'))
 
194
                         _('Please specify a location manually.'))
194
195
            return
195
196
        else:
196
197
            location = stored_loc