Updated to use application/vnd.olpc-sugar instead of application/vnd.olpc-x-sugar.

shell/view/clipboardicon.py

@@ -54,7 +54,7 @@ class ClipboardIcon(CanvasIcon):
 
         self.palette = ClipboardMenu(self._object_id, self._name, self._percent,
                                      self._preview, self._activity,
-                                     formats and formats[0] == 'application/vnd.olpc-x-sugar')
+                                     formats and formats[0] == 'application/vnd.olpc-sugar')
 
     def do_set_property(self, pspec, value):
         if pspec.name == 'selected':
@@ -80,7 +80,7 @@ class ClipboardIcon(CanvasIcon):
     def set_state(self, name, percent, icon_name, preview, activity):
         cb_service = clipboardservice.get_instance()
         obj = cb_service.get_object(self._object_id)
-        if obj['FORMATS'] and obj['FORMATS'][0] == 'application/vnd.olpc-x-sugar':
+        if obj['FORMATS'] and obj['FORMATS'][0] == 'application/vnd.olpc-sugar':
             installable = True
         else:
             installable = False
@@ -88,7 +88,7 @@ class ClipboardIcon(CanvasIcon):
         if icon_name:
             self.props.icon_name = icon_name
         else:
-            self.props.icon_name = 'theme:unknown-object'
+            self.props.icon_name = 'theme:application-octet-stream'
 
         self._name = name
         self._percent = percent

sugar/datastore/datastore.py

@@ -116,7 +116,8 @@ class DSObject(object):
         return activities
 
     def is_bundle(self):
-        return self.metadata['mime_type'] == 'application/vnd.olpc-x-sugar'
+        return self.metadata['mime_type'] in ['application/vnd.olpc-x-sugar',
+                                              'application/vnd.olpc-sugar']
 
     def resume(self, service_name=None):
         if self.is_bundle():

sugar/graphics/objectchooser.py

@@ -133,7 +133,7 @@ class CollapsedEntry(CanvasRoundBox):
         if self._icon_name:
             return self._icon_name
 
-        if self._is_bundle():
+        if self.jobject.is_bundle():
             bundle = Bundle(self.jobject.file_path)
             self._icon_name = bundle.get_icon()
 
@@ -159,9 +159,6 @@ class CollapsedEntry(CanvasRoundBox):
         ti = time.strptime(self.jobject.metadata['mtime'], "%Y-%m-%dT%H:%M:%S")        
         return str(Date(time.mktime(ti)))
 
-    def _is_bundle(self):
-        return self.jobject.metadata['mime_type'] == 'application/vnd.olpc-x-sugar'
-
     def _format_title(self):
         return '"%s"' % self.jobject.metadata['title']