launch.py is in olive folder. Broke right mouse button menu

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: file:///home/jasper/Programming/bzr-gtk/trunk/
# testament_sha1: d11f49ae8603bc4d7c98fe981b2b495b57d9aa40
# timestamp: 2008-07-10 12:15:38 +0200
# base_revision_id: [EMAIL PROTECTED]
# 
# Begin patch
=== modified file 'olive/menu.py'
--- olive/menu.py	2008-06-30 12:15:06 +0000
+++ olive/menu.py	2008-07-10 10:15: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. """

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaGNxgAAAYHfgAAQUWf//1OQ
QAC////wUAN57qmlHVW7tYJKTUJpmmppsKfpA3qmoyep6jTDSNGCSU0Kfio8GVGyjTIaaAekABoJ
TUCEnimm09Uek00aGmQaeoYgyGGhoAAANAAAAACSRMgATTE00o3oo8mp6gA0Glld+Ho74hvE9kJq
E6ul8GCcTK/LMjfZRzmzqSTQ2hwhJFtI535iiofdBvFiw3W8Xv4/RHtk7EqU25BXPX09E8mEmrM3
cTprniPTY840HPFx+glFos462K0VrUkyV3wHyfqwMr8IbkVJZ2UaBK0xAapUC0DG0cSmUAiMLJPE
RJbh506C0Sj4nsHsh9YqicDmwa7imfoZDSm8TA90c9k2gEhSLLb4MhciHC9nYcxWvC4EQhiNKViq
fUZ4JRKaDeQzURpSozM5Ckix2g4rvJlO4YdSXFOylnOSVpWWXcRpZFVhB7xpOFkLSZFh8iZEvMhz
D5Cagys7JI6CGdxvTFC0mBbpYq86d7DX+XUArfcRyxGMO48sgp9DYTuBwqMJd/F5A2YibHkeWQ/1
ryJtzJjVPtNQhzLPY0IbajRpkKy52zOQT0X/J563xcUJz6QzMz60yPw1nSVidRsYHUXVQNgeHE8x
cDVUF6WLqR4c+KTwsK4Vc5xenZczrUbissNwShsTJZOyOCJiwnOJyHpeR1O2YX0xd9Ni1NCos7BO
nJpkVk3nKUwIFUimtHblE6iBQPGy0nweUBo7wVjUFhkv2GD1O3+CD8mxTIuWdWF0gX9ohboUKKoQ
Yzp+Pg0Kh85vq2W44k8bIEBa5hTlKYWKRi77OwqanVuNQO88wa+uosZhrZEbyJgcU4zR9wp5n75P
heBsBtcf2O++WxxKp8rnShMl4JYVXJdtS9lCMeMBUwNHabig4VNUNPaqQd2WnXVgNTmItjhjfJJm
uHxoUQjB1M+xJxSDMAy0+K2lgpGpJ83Dngd7kawrCKzB6tai8xxxUhylCgep8ZphpVFfMW/JjJkf
ZKoFp5QkNjr1OsTPqCVNjTINdymSuCLUiQm92Hah2yT5xmpPUNFQagNBYSr7JlEOrd4e1YeOshfc
XtZiVziOIHAD1pZVMpUFCeZ6lQZPtGnwiiYxUVUB4Nyqs2cyVKunX3DDnNuV0CQnzMP8XckU4UJC
hjcYAA==
-- 
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.canonical.com/mailman/listinfo/bzr-gtk

Reply via email to