Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/activity
diff options
context:
space:
mode:
authorSayamindu Dasgupta <sayamindu@gmail.com>2009-07-20 20:36:51 (GMT)
committer Sayamindu Dasgupta <sayamindu@gmail.com>2009-07-20 20:36:51 (GMT)
commit0957516a88ef7216fc1e23f9ab2224562af3d91c (patch)
tree039e7d17ce05a25fde1f3b20db406363dfb53a0b /activity
parentaee4aefc8c9536a18156a4db8d59d8c767f78729 (diff)
parent9760c4c9acdf0ea1cf4c57ded8c65eb4390ca171 (diff)
Merge branch 'master' of git://git.sugarlabs.org/read/epub-support
Diffstat (limited to 'activity')
-rw-r--r--activity/activity.info2
-rw-r--r--activity/mimetypes.xml7
2 files changed, 8 insertions, 1 deletions
diff --git a/activity/activity.info b/activity/activity.info
index 92f0684..15729b4 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -5,5 +5,5 @@ icon = activity-read
exec = sugar-activity readactivity.ReadActivity
show_launcher = no
activity_version = 67
-mime_types = application/pdf;image/vnd.djvu;image/x.djvu;image/tiff;application/x-cbz;application/x-cbr
+mime_types = application/pdf;image/vnd.djvu;image/x.djvu;image/tiff;application/x-cbz;application/x-cbr;application/epub+zip
license = GPLv2+
diff --git a/activity/mimetypes.xml b/activity/mimetypes.xml
new file mode 100644
index 0000000..5c27572
--- /dev/null
+++ b/activity/mimetypes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/epub+zip">
+ <comment xml:lang="en">Epub document</comment>
+ <glob pattern="*.epub"/>
+ </mime-type>
+</mime-info>