Rev 546: Merge fix for import of launch in olive. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 546
revision-id: jelmer at samba.org-20080718104023-d0ohq135irc66rsm
parent: jelmer at samba.org-20080718104001-0b3ml1se1v85yong
parent: colbrac at xs4all.nl-20080710101523-zg1i8moa2qgv0g0s
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-07-18 12:40:23 +0200
message:
  Merge fix for import of launch in olive.
modified:
  olive/menu.py                  menu.py-20060803101046-9idg5lu81o53za8y-1
    ------------------------------------------------------------
    revno: 531.5.1
    revision-id: colbrac at xs4all.nl-20080710101523-zg1i8moa2qgv0g0s
    parent: jelmer at samba.org-20080701215625-udvespwg6srjo252
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: fix-launch
    timestamp: Thu 2008-07-10 12:15:23 +0200
    message:
      Fix import changed in rev 523
    modified:
      olive/menu.py                  menu.py-20060803101046-9idg5lu81o53za8y-1
=== modified file 'olive/menu.py'
--- a/olive/menu.py	2008-07-10 21:57:38 +0000
+++ b/olive/menu.py	2008-07-18 10:40:23 +0000
@@ -30,13 +30,13 @@
 import bzrlib.errors as errors
 from bzrlib.workingtree import WorkingTree
 
-from bzrlib.plugins.gtk import _i18n, launch
+from bzrlib.plugins.gtk import _i18n
 from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
 from bzrlib.plugins.gtk.errors import show_bzr_error
 from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
 from bzrlib.plugins.gtk.diff import DiffWindow
-from bzrlib.plugins.gtk.olive import Preferences
+from bzrlib.plugins.gtk.olive import Preferences, launch
 
 class OliveMenu:
     """ This class is responsible for building the context menus. """