Merge changes for GTK3 upgrade, fix bugs.

4 files changed, 4 insertions, 241 deletions

diff --git a/GetIABooksActivity.py b/GetIABooksActivity.py
index 5d56945..f2b4e68 100644
--- a/GetIABooksActivity.py
+++ b/GetIABooksActivity.py
@@ -35,7 +35,7 @@ from sugar3.graphics.toolcombobox import ToolComboBox
 from sugar3.graphics.combobox import ComboBox
 from sugar import profile
 from sugar3.activity import activity
-from sugar import network
+from sugar3 import network
 from sugar3.datastore import datastore
 from sugar3.graphics.alert import NotifyAlert
 from gettext import gettext as _
@@ -526,7 +526,7 @@ class GetIABooksActivity(activity.Activity):
         journal_entry.metadata['preview'] = ''
         journal_entry.metadata['icon-color'] = profile.get_color().to_string()
         textbuffer = self.textview.get_buffer()
-        journal_entry.metadata['description'] = textbuffer.get_text(textbuffer.get_start_iter(),  textbuffer.get_end_iter())
+        journal_entry.metadata['description'] = textbuffer.get_text(textbuffer.get_start_iter(),  textbuffer.get_end_iter(),  True)
         journal_entry.file_path = tempfile
         datastore.write(journal_entry)
         os.remove(tempfile)
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index f2715c6..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,237 +0,0 @@
-GetIABooksActivity.py
-NEWS
-setup.py
-activity/get-ia-books.svg
-activity/activity.info
-po/GetIABooks.pot
-locale/bg/activity.linfo
-locale/bg/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/gu/activity.linfo
-locale/gu/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ro/activity.linfo
-locale/ro/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/na/activity.linfo
-locale/na/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/mn/activity.linfo
-locale/mn/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/yo/activity.linfo
-locale/yo/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/nl/activity.linfo
-locale/nl/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/en/activity.linfo
-locale/en/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ml/activity.linfo
-locale/ml/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/si/activity.linfo
-locale/si/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ht/activity.linfo
-locale/ht/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/fil/activity.linfo
-locale/fil/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/sl/activity.linfo
-locale/sl/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/pl/activity.linfo
-locale/pl/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/cpp/activity.linfo
-locale/cpp/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/am/activity.linfo
-locale/am/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ja/activity.linfo
-locale/ja/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/de/activity.linfo
-locale/de/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/pis/activity.linfo
-locale/pis/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/bi/activity.linfo
-locale/bi/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/mk/activity.linfo
-locale/mk/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/tr/activity.linfo
-locale/tr/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/fa_AF/activity.linfo
-locale/fa_AF/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ko/activity.linfo
-locale/ko/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ig/activity.linfo
-locale/ig/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/sk/activity.linfo
-locale/sk/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ru/activity.linfo
-locale/ru/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/mvo/activity.linfo
-locale/mvo/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/tzo/activity.linfo
-locale/tzo/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ca/activity.linfo
-locale/ca/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/it/activity.linfo
-locale/it/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/wa/activity.linfo
-locale/wa/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/km/activity.linfo
-locale/km/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/kos/activity.linfo
-locale/kos/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/mr/activity.linfo
-locale/mr/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/dz/activity.linfo
-locale/dz/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/fr/activity.linfo
-locale/fr/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/tvl/activity.linfo
-locale/tvl/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/pt_BR/activity.linfo
-locale/pt_BR/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/zh_TW/activity.linfo
-locale/zh_TW/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ar/activity.linfo
-locale/ar/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/nb/activity.linfo
-locale/nb/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/pa/activity.linfo
-locale/pa/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ms/activity.linfo
-locale/ms/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ur/activity.linfo
-locale/ur/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/el/activity.linfo
-locale/el/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/hu/activity.linfo
-locale/hu/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/fa/activity.linfo
-locale/fa/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/he/activity.linfo
-locale/he/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ha/activity.linfo
-locale/ha/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/mg/activity.linfo
-locale/mg/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/sq/activity.linfo
-locale/sq/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/te/activity.linfo
-locale/te/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/qu/activity.linfo
-locale/qu/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/bn/activity.linfo
-locale/bn/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/es/activity.linfo
-locale/es/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/cs/activity.linfo
-locale/cs/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ff/activity.linfo
-locale/ff/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/pt/activity.linfo
-locale/pt/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ps/activity.linfo
-locale/ps/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/is/activity.linfo
-locale/is/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/sv/activity.linfo
-locale/sv/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ne/activity.linfo
-locale/ne/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ta/activity.linfo
-locale/ta/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/hi/activity.linfo
-locale/hi/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/vi/activity.linfo
-locale/vi/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/bn_IN/activity.linfo
-locale/bn_IN/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/rw/activity.linfo
-locale/rw/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ug/activity.linfo
-locale/ug/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/sd/activity.linfo
-locale/sd/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/sw/activity.linfo
-locale/sw/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/zh_CN/activity.linfo
-locale/zh_CN/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/tpi/activity.linfo
-locale/tpi/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/pap/activity.linfo
-locale/pap/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/af/activity.linfo
-locale/af/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/ay/activity.linfo
-locale/ay/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-locale/th/activity.linfo
-locale/th/LC_MESSAGES/org.laptop.sugar.GetIABooksActivity.mo
-po/sd.po
-po/is.po
-po/ha.po
-po/ms.po
-po/ne.po
-po/cpp.po
-po/gu.po
-po/ca.po
-po/tvl.po
-po/it.po
-po/dz.po
-po/nb.po
-po/ig.po
-po/tr.po
-po/es.po
-po/tzo.po
-po/cs.po
-po/ta.po
-po/km.po
-po/ff.po
-po/pt_BR.po
-po/qu.po
-po/am.po
-po/mk.po
-po/pa.po
-po/bn.po
-po/fr.po
-po/he.po
-po/el.po
-po/ro.po
-po/sk.po
-po/sw.po
-po/nl.po
-po/si.po
-po/mn.po
-po/sq.po
-po/ht.po
-po/bn_IN.po
-po/zh_CN.po
-po/de.po
-po/wa.po
-po/mr.po
-po/yo.po
-po/bi.po
-po/tpi.po
-po/pap.po
-po/ml.po
-po/bg.po
-po/kos.po
-po/pt.po
-po/ja.po
-po/zh_TW.po
-po/ur.po
-po/ug.po
-po/mvo.po
-po/sv.po
-po/fa.po
-po/th.po
-po/ar.po
-po/pl.po
-po/hi.po
-po/fil.po
-po/ko.po
-po/ru.po
-po/fa_AF.po
-po/pis.po
-po/sl.po
-po/en.po
-po/vi.po
-po/af.po
-po/rw.po
-po/na.po
-po/hu.po
-po/ps.po
-po/mg.po
-po/ay.po
-po/te.po
diff --git a/NEWS b/NEWS
deleted file mode 100644
index f7d6d96..0000000
--- a/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-Initial creation of Read ETexts Activity 02-21-08.
diff --git a/activity/activity.info b/activity/activity.info
index 5248d0c..e4ca945 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,5 +4,6 @@ bundle_id = org.laptop.sugar.GetIABooksActivity
 icon = get-ia-books
 exec = sugar-activity GetIABooksActivity.GetIABooksActivity
 show_launcher = yes
-activity_version = 6
+activity_version = 7
 license = GPLv2+
+summary = Download thousands of free e-books in PDF, DejaVu, and EPUB formats from the Internet Archive!