From c5ab58ed6c8bc2b9125782bc5a7bc6ac9d673eb7 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 05 Jul 2007 11:38:34 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
(limited to 'services/clipboard/objecttypeservice.py')

diff --git a/services/clipboard/objecttypeservice.py b/services/clipboard/objecttypeservice.py
index 97f7d90..e12398e 100644
--- a/services/clipboard/objecttypeservice.py
+++ b/services/clipboard/objecttypeservice.py
@@ -31,7 +31,8 @@ class ObjectTypeRegistry(dbus.service.Object):
         from gettext import gettext as _
         self._add_primitive('Text', _('Text'), 'theme:object-text',
                             [ 'text/plain', 'text/rtf', 'application/pdf',
-                              'application/x-pdf', 'text/html' ])
+                              'application/x-pdf', 'text/html',
+                              'application/vnd.oasis.opendocument.text' ])
         self._add_primitive('Image', _('Image'), 'theme:object-image',
                             [ 'image/png', 'image/gif', 'image/jpeg' ])
 
--
cgit v0.9.1