Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2007-09-09 13:04:26 (GMT)
committer Tomeu Vizoso <tomeu@tomeuvizoso.net>2007-09-09 13:04:26 (GMT)
commit547df751a762065292156bc321d335fb4158b48d (patch)
tree5423f2128d5506afc1e89adccd9ceae738760b20 /sugar
parenteb7ad2066c61afc4ac62a6635d375a0c2f0c421e (diff)
Fixed some issues with text objects in the clipboard.
Diffstat (limited to 'sugar')
-rw-r--r--sugar/datastore/datastore.py3
-rw-r--r--sugar/objects/mime.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py
index d4340fe..9b4bcc9 100644
--- a/sugar/datastore/datastore.py
+++ b/sugar/datastore/datastore.py
@@ -138,7 +138,8 @@ class DSObject(object):
activityfactory.create(bundle.get_service_name())
else:
- if not self.get_activities():
+ if not self.get_activities() and service_name is None:
+ logging.warning('No activity can open this object.')
return
if service_name is None:
service_name = self.get_activities()[0].service_name
diff --git a/sugar/objects/mime.py b/sugar/objects/mime.py
index b933143..baa014f 100644
--- a/sugar/objects/mime.py
+++ b/sugar/objects/mime.py
@@ -81,7 +81,7 @@ def choose_most_significant(mime_types):
logging.debug('Choosed text/html!')
return 'text/html'
- if 'text/plain' in mime_types or 'STRING' in mime_types:
+ if 'text/plain' in mime_types:
logging.debug('Choosed text/plain!')
return 'text/plain'