Merge lp:~jsjgruber/ubuntu/natty/lernid/lernid.fix749848.fix751019.fix764069 into lp:ubuntu/natty/lernid

[John S. Gruber]

A copy has been built in ppa:~jsjgruber/ppa and can be tested from there. The build log can be viewed from there.

I'd prefer to only minimally increase the version number in Ubuntu as there are unreleased upstream changes that would be candidates for a release 0.8.1 (so it would be best to keep the version in Ubuntu less than that).

This package is not currently in debian so nothing is proposed there. I intend to propose these changes for upstream after accceptance into ubuntu.

The fix for LP: #749848 regrettably makes slide loading synchronous again as this is less troublesome to the lernid user than an unexpected, permanent hang of the application when a url is posted to the classroom containing a flash video or certain other flash features.

[Michael Vogt (mvo)]

Thanks a bunch! Uploaded now and its waiting in the queue.

=== modified file 'bin/lernid'
--- bin/lernid	2010-07-31 08:42:13 +0000
+++ bin/lernid	2011-04-19 17:00:13 +0000
@@ -26,8 +26,6 @@
 import locale
 import pynotify
 
-gtk.gdk.threads_init()
-
 try:
     import appindicator
     HAVE_APPINDICATOR = True

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-01 02:58:23 +0000
+++ debian/changelog	2011-04-19 17:00:13 +0000
@@ -1,3 +1,13 @@
+lernid (0.8.0.1) natty; urgency=low
+
+  * Closes: LP: #749848: Revert the slide loading function to run synchronously
+            rather than using python threads.
+  * Closes: LP: #751019: Handle case where web page has no title.
+  * Closes: LP: #764069: Revise size parameters passed to poppler page render
+            call.
+
+ -- John S Gruber <[e-mail]>  Mon, 18 Apr 2011 23:58:23 -0400
+
 lernid (0.8) natty; urgency=low
 
   * Fix Significant bugs

=== modified file 'lernid/widgets/Browser.py'
--- lernid/widgets/Browser.py	2010-07-31 08:42:13 +0000
+++ lernid/widgets/Browser.py	2011-04-19 17:00:13 +0000
@@ -154,6 +154,7 @@
             storeiter = self._url_store.iter_next(storeiter)
         if not match:
             title = browser.get_property('title')
+            if title is None: title = ''
             urllen = 150 - len(title)
             shorturl = url
             if len(url) > urllen:

=== modified file 'lernid/widgets/Slide.py'
--- lernid/widgets/Slide.py	2010-07-31 08:42:13 +0000
+++ lernid/widgets/Slide.py	2011-04-19 17:00:13 +0000
@@ -24,7 +24,6 @@
 import re
 import logging
 import urllib
-from threading import Thread
 
 from lernid.widgets.Widget import Widget
 from lernid.lernidconfig import save_cache_path
@@ -104,7 +103,7 @@
             page = pdf.get_page(int(pagenumber) - 1)
             w, h = page.get_size()
             pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, int(w), int(h))
-            page.render_to_pixbuf(0,0,8,11,1,0, pixbuf)
+            page.render_to_pixbuf(0,0,int(w),int(h),1,0, pixbuf)
         except:
             Statusbar.push_message(_('An error was encountered while trying to load slide number {0}'.format(pagenumber)), duration=120)
             logging.debug("Something went wrong when loading slide %s" % pagenumber)
@@ -156,8 +155,7 @@
     def _session_changed(self, schedule, session):
         Statusbar.pop_message('slidesession')
         if session.slides:
-            thread = Thread(target=self._download_slides, args=(session,))
-            thread.start()
+            self._download_slides(session)
         else:
             self._image.clear()
             self.hide()