[kupfer: 18/19] Merge branch 'common-open'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit cf98045c6c6812cd53fe8f71020580b855ee5380
Merge: 626500a 5701617
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Mon Feb 1 18:34:28 2010 +0100

    Merge branch 'common-open'

 kupfer/obj/fileactions.py |  145 +++++++++++----------------------------------
 kupfer/plugin/trash.py    |    4 +-
 kupfer/plugin/volumes.py  |   11 ++--
 3 files changed, 42 insertions(+), 118 deletions(-)
---
diff --cc kupfer/plugin/trash.py
index 6fcb315,c46f2d3..8e6e7d9
--- a/kupfer/plugin/trash.py
+++ b/kupfer/plugin/trash.py
@@@ -7,9 -1,14 +7,9 @@@ __author__ = "Ulrik Sverdrup <ulrik.sve
  import gio
  
  from kupfer.objects import Leaf, Action, Source, SourceLeaf
- from kupfer.obj.fileactions import OpenDirectory
+ from kupfer.obj.fileactions import Open
  from kupfer import utils, icons, pretty
  
 -__kupfer_name__ = _("Trash")
 -__kupfer_sources__ = ("TrashSource", )
 -__description__ = _("Access trash contents")
 -__version__ = "2009-12-06"
 -__author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
  
  
  TRASH_URI = 'trash://'