Merge lp:~jsjgruber/lernid/lernid-proposed into lp:lernid

[John S. Gruber]

Proposed changes to lp:lernid and ppa:lernid-devs/lernid-releases

[lp:~jsjgruber/lernid/lernid-proposed]

228. By John S. Gruber on 2011-07-22

* Note that LP: #808982 is fixed
* Allow anyone (with voice) to change slides or switch browser if channel
    is moderated.
* Wrap notification requests in try: clause so failure doesn't cause lernid to
    error. Fixes LP: #808982
* Set user-stylesheet-uri in webkit settings to circumvent webkit problem
    with webkit-box-shadow. Fixes LP: #793780. Thanks to the Midori
    project for covering this in their FAQ at http://wiki.xfce.org/midori/faq

* Set new version number

=== modified file 'bin/lernid'
--- bin/lernid	2011-06-29 00:23:41 +0000
+++ bin/lernid	2011-07-21 05:26:00 +0000
@@ -154,7 +154,10 @@
         def event_interrupted(self, event):
             logging.error("event interrupted")
             n=pynotify.Notification(_('Event Connection Interrupted'), _('Please reestablish your Internet connection\nand reconnect to the event'), 'lernid')
-            n.show()
+            try:
+                n.show()
+            except:
+                logging.error("Notification failed to show for Interrupted Event Message")
             Statusbar.push_message(_('Event Connection Interrupted -- '
             'Please reestablish your Internet connection and reconnect to the event'))
             self.emit('event-disconnect', event)
@@ -215,7 +218,10 @@
                      'Add "Question:" to the beginning of your query  '
                      'to direct it to the classroom instructor.')
             notification = pynotify.Notification(message1, message2, 'lernid')
-            notification.show()
+            try:
+                notification.show()
+            except:
+                logging.error("Notification failed for Interaction Message")
 
         self._eventman.connect('event-connect', event_connected)
 

=== added file 'data/stylesheet'
--- data/stylesheet	1970-01-01 00:00:00 +0000
+++ data/stylesheet	2011-07-21 05:26:00 +0000
@@ -0,0 +1,1 @@
+* {-webkit-box-shadow: none !important;}

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-06 20:12:53 +0000
+++ debian/changelog	2011-07-21 05:26:00 +0000
@@ -1,3 +1,21 @@
+lernid (0.8.1.5) natty; urgency=low
+
+  * Note that LP: #808982 is fixed
+ 
+  * Allow anyone (with voice) to change slides or switch browser if channel
+      is moderated.
+
+  * Wrap notification requests in try: clause so failure doesn't cause lernid to
+      error. Fixes LP: #808982
+
+  * Set user-stylesheet-uri in webkit settings to circumvent webkit problem
+      with webkit-box-shadow. Fixes LP: #793780. Thanks to the Midori
+      project for covering this in their FAQ at http://wiki.xfce.org/midori/faq 
+    
+  * Set new version number 
+
+ -- John S Gruber <[e-mail]>  Thu, 21 Jul 2011 01:14:04 -0400
+
 lernid (0.8.1.4.1) natty; urgency=low
 
   No change entry to note fixed bugs in bazaar. 

=== modified file 'lernid/lernidconfig.py'
--- lernid/lernidconfig.py	2011-06-27 23:02:17 +0000
+++ lernid/lernidconfig.py	2011-07-21 05:26:00 +0000
@@ -31,7 +31,7 @@
 
 def _(message): return message
 
-VERSION = '0.8.1.4'
+VERSION = '0.8.1.5'
 DESCRIPTION = _('Connect to a world of online tutorials quickly and easily.')
 WEBSITE = 'http://wiki.ubuntu.com/Lernid'
 CONTRIBUTORS = [

=== modified file 'lernid/widgets/Browser.py'
--- lernid/widgets/Browser.py	2011-06-27 16:39:33 +0000
+++ lernid/widgets/Browser.py	2011-07-21 05:26:00 +0000
@@ -25,6 +25,7 @@
 
 from lernid.widgets.Widget import Widget
 from lernid.LernidOptions import Options
+from lernid.lernidconfig import get_data_path
 
 class Browser(Widget):
 
@@ -82,6 +83,9 @@
 
         self._toolbar.set_sensitive(False)
 
+        self._browser_settings = self._browser.get_settings()
+        self._browser_settings.set_property('user-stylesheet-uri', 'file://'+get_data_path()+'/stylesheet')
+
     def do_event_connect(self, eventman, event):
         classroom = eventman.get_widget_by_name('classroom')
         self.event_connect_signal(classroom, 'message-received', self._classroom_msg_received)
@@ -182,7 +186,7 @@
             self.set_location(url)
 
     def _classroom_msg_received(self, classroom, chan, sender, text):
-        if not Options.get('unsafe-override') and not self._on_faculty(sender):
+        if not Options.get('unsafe-override') and not chan.is_moderated() and not self._on_faculty(sender):
             return
         load, ignore = self._parse_urls(text)
         if load and not self._paused:

=== modified file 'lernid/widgets/Schedule.py'
--- lernid/widgets/Schedule.py	2011-06-27 23:02:17 +0000
+++ lernid/widgets/Schedule.py	2011-07-21 05:26:00 +0000
@@ -211,4 +211,7 @@
 
     def show_notification(self, summary, body):
         n = pynotify.Notification(summary, body, 'lernid')
-        n.show()
+        try:
+            n.show()
+        except:
+            logging.debug("Notification failed from Schedule Widget")

=== modified file 'lernid/widgets/Slide.py'
--- lernid/widgets/Slide.py	2011-06-27 23:02:17 +0000
+++ lernid/widgets/Slide.py	2011-07-21 05:26:00 +0000
@@ -93,7 +93,7 @@
     def _classroom_msg_received(self, classroom, chan, sender, text):
         matches = re.search(r'\[SLIDE (\d+)\]', text.upper())
         if matches and self._session_slide_downloaded:
-            if self._on_faculty(sender):
+            if chan.is_moderated() or self._on_faculty(sender):
                 self._change_slide_page(int(matches.groups()[0]))
 
     def _change_slide_page(self, pagenumber):

=== modified file 'setup.py'
--- setup.py	2011-06-27 15:06:48 +0000
+++ setup.py	2011-07-21 05:26:00 +0000
@@ -68,7 +68,7 @@
 
 setup(
     name = 'lernid',
-    version = '0.8.1.4',
+    version = '0.8.1.5',
     license = 'GPL-3',
     author = 'John S Gruber',
     author_email = '[e-mail]',