[Pkg-bazaar-commits] ./bzr-gtk/unstable r566: Merge of fix to launch in olive context menu

[Jasper Groenewegen]

------------------------------------------------------------
revno: 566
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Wed 2008-07-23 00:42:43 +0200
message:
  Merge of fix to launch in olive context menu
  
  Change behaviour for folders: 'Open' from the context now opens a file browser.
modified:
  olive/bookmark.py
  olive/menu.py
    ------------------------------------------------------------
    revno: 560.6.1
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: fix-icon-paths
    timestamp: Mon 2008-07-21 00:36:42 +0200
    message:
      Fixes to launch in menu.py
      Absolute import in bookmark.py
    modified:
      olive/bookmark.py
      olive/menu.py
-------------- next part --------------
=== modified file 'olive/bookmark.py'
--- a/olive/bookmark.py	2008-07-10 12:22:16 +0000
+++ b/olive/bookmark.py	2008-07-20 22:36:42 +0000
@@ -22,7 +22,7 @@
 
 import gtk
 
-from olive import Preferences
+from bzrlib.plugins.gtk.olive import Preferences
 from bzrlib.plugins.gtk import _i18n
 from bzrlib.plugins.gtk.dialog import error_dialog
 

=== modified file 'olive/menu.py'
--- a/olive/menu.py	2008-07-22 10:23:20 +0000
+++ b/olive/menu.py	2008-07-22 22:42:43 +0000
@@ -262,13 +262,8 @@
             # TODO: how to enter a directory?
             return
         else:
-            fullpath = self.path + os.sep + filename
-            if os.path.isdir(fullpath):
-                # selected item is an existant directory
-                # TODO: how to enter a directory?
-                return
-            else:
-                launch(fullpath) 
+            fullpath = os.path.join(self.path, filename)
+            launch.launch(fullpath) 
 
     def revert(self, action):
         """ Right context menu -> Revert """
@@ -358,7 +353,7 @@
         path = self.selected
 
         if path != None:
-            launch(path)
+            launch.launch(path)
     
     def diff_selected(self, action):
         """ Diff toolbutton -> Selected... """