/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/__init__.py

  • Committer: Jasper Groenewegen
  • Date: 2008-08-04 20:45:30 UTC
  • mto: This revision was merged to the branch mainline in revision 594.
  • Revision ID: colbrac@xs4all.nl-20080804204530-d2qko7finu8d9xqn
Update Olive file list after update

Show diffs side-by-side

added added

removed removed

Lines of Context:
532
532
        
533
533
    @show_bzr_error
534
534
    def on_menuitem_branch_update_activate(self, widget):
535
 
        """ Brranch/checkout update menu handler. """
 
535
        """ Branch/checkout update menu handler. """
536
536
        
537
537
        ret = self.wt.update()
538
538
        conflicts = self.wt.conflicts()
540
540
            info_dialog(_i18n('Update successful but conflicts generated'), _i18n('Number of conflicts generated: %d.') % (len(conflicts),) )
541
541
        else:
542
542
            info_dialog(_i18n('Update successful'), _i18n('No conflicts generated.') )
 
543
        self.refresh_right()
543
544
    
544
545
    def on_menuitem_branch_push_activate(self, widget):
545
546
        """ Branch/Push... menu handler. """