Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Conflicts: configure.ac
2007-05-21 12:47:28 +02:00
parent f1d67f661e 8c8dffe662
commit 17b3142776
13 changed files with 165 additions and 102 deletions
@@ -106,16 +106,6 @@ class ClipboardIcon(CanvasIcon):
        else:
            self.props.xo_color = XoColor("#000000,#FFFFFF")

-        if activity and percent == 100:
-            # FIXME: restrict based on file type rather than activity once
-            # we have a better type registry
-            # restrict auto-open to a specific set of activities
-            allowed = ["org.laptop.AbiWordActivity",
-                       "org.laptop.sugar.Xbook",
-                       "org.vpri.EtoysActivity"]
-            if activity in allowed:
-                self._open_file()
-
    def _open_file(self):
        if self._percent < 100:
            return