Merge lp:~jsjgruber/ubuntu/oneiric/lernid/lernid.fix799211 into lp:ubuntu/oneiric/lernid

[John S. Gruber]

Thanks to Chris Coulson for these changes.

[Stefano Rivera (stefanor)]

I'll add a dependency on python-webkit, merge with https://code.launchpad.net/~wibblymat/ubuntu/oneiric/lernid/remove-pycentral/+merge/65677
and upload

review: Approve

[Stefano Rivera (stefanor)]

There was an unexpected tab on line 143 of this diff

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-19 04:02:07 +0000
+++ debian/changelog	2011-06-23 12:26:08 +0000
@@ -1,3 +1,10 @@
+lernid (0.8.0.2~jsgppatwo3) oneiric; urgency=low
+
+  * Closes: LP: #799211 Remove dependency on python-gtkmozembed to support
+            Oneiric changes; address reported FTBFS under Oneiric 
+
+ -- John S Gruber <[e-mail]>  Sat, 18 Jun 2011 14:25:59 -0400
+
 lernid (0.8.0.1) natty; urgency=low
 
   * Closes: LP: #749848: Revert the slide loading function to run synchronously

=== modified file 'debian/control'
--- debian/control	2011-03-31 01:06:03 +0000
+++ debian/control	2011-06-23 12:26:08 +0000
@@ -16,7 +16,6 @@
 Depends: ${misc:Depends},
  ${python:Depends},
  python-xdg,
- python-gtkmozembed,
  python-telepathy,
  python-dbus,
  python-desktopcouch-records,

=== modified file 'debian/rules'
--- debian/rules	2010-02-24 22:58:17 +0000
+++ debian/rules	2011-06-23 12:26:08 +0000
@@ -4,7 +4,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/langpack.mk
 
 binary-fixup/lernid::
 	find debian/lernid/usr/share/ -type d -empty -delete

=== modified file 'lernid/AboutLernidDialog.py'
--- lernid/AboutLernidDialog.py	2010-02-24 22:58:17 +0000
+++ lernid/AboutLernidDialog.py	2011-06-23 12:26:08 +0000
@@ -47,7 +47,7 @@
         self.builder = builder
         self.builder.connect_signals(self)
 
-        self.set_comments(DESCRIPTION)
+        self.set_comments(_(DESCRIPTION))
         self.set_version(VERSION)
         self.set_website(WEBSITE)
         self.set_authors(CONTRIBUTORS)

=== modified file 'lernid/lernidconfig.py'
--- lernid/lernidconfig.py	2010-07-31 08:42:13 +0000
+++ lernid/lernidconfig.py	2011-06-23 12:26:08 +0000
@@ -29,7 +29,9 @@
 import os
 import xdg.BaseDirectory
 
-VERSION = '0.6'
+def _(message): return message
+
+VERSION = '0.8.0.2'
 DESCRIPTION = _('Connect to a world of online tutorials quickly and easily.')
 WEBSITE = 'http://wiki.ubuntu.com/Lernid'
 CONTRIBUTORS = [

=== modified file 'lernid/widgets/Classroom.py'
--- lernid/widgets/Classroom.py	2011-03-31 01:06:03 +0000
+++ lernid/widgets/Classroom.py	2011-06-23 12:26:08 +0000
@@ -19,7 +19,6 @@
 
 import gtk
 import gobject
-import gtkmozembed
 import pango
 import time
 

=== modified file 'lernid/widgets/IrcWidget.py'
--- lernid/widgets/IrcWidget.py	2010-07-31 08:42:13 +0000
+++ lernid/widgets/IrcWidget.py	2011-06-23 12:26:08 +0000
@@ -30,8 +30,15 @@
 
 class IrcWidget(Widget):
 
-    hand_cursor = gtk.gdk.Cursor(gtk.gdk.HAND2)
-    regular_cursor = gtk.gdk.Cursor(gtk.gdk.XTERM)
+    def get_hand_cursor(self):
+        if not hasattr(self, "_hand_cursor"):
+            self._hand_cursor = gtk.gdk.Cursor(gtk.gdk.HAND2)
+        return self._hand_cursor
+
+    def get_regular_cursor(self):
+        if not hasattr(self, "_regular_cursor"):
+            self._regular_cursor = gtk.gdk.Cursor(gtk.gdk.XTERM)
+        return self._regular_cursor
 
     def do_event_connect(self, event_man, event):
         self._browser = event_man.get_widget_by_name('browser')
@@ -92,9 +99,9 @@
             int(event.x), int(event.y))
         iter = text_view.get_iter_at_location(x, y)
         if (iter.has_tag(tag)):
-            text_view.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(self.hand_cursor)
+            text_view.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(self.get_hand_cursor())
         else:
-            text_view.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(self.regular_cursor)
+            text_view.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(self.get_regular_cursor())
         return False
 
     def _focus_out(self, widget, event):

=== modified file 'lernid/widgets/NativeChatroom.py'
--- lernid/widgets/NativeChatroom.py	2011-03-31 01:06:03 +0000
+++ lernid/widgets/NativeChatroom.py	2011-06-23 12:26:08 +0000
@@ -20,7 +20,6 @@
 
 import gtk
 import gobject
-import gtkmozembed
 import urlparse
 import logging
 import pango

=== modified file 'lernid/widgets/WebChatroom.py'
--- lernid/widgets/WebChatroom.py	2010-02-24 22:58:17 +0000
+++ lernid/widgets/WebChatroom.py	2011-06-23 12:26:08 +0000
@@ -19,7 +19,7 @@
 
 import gtk
 import gobject
-import gtkmozembed
+import webkit
 
 from lernid.widgets.Widget import Widget
 
@@ -37,7 +37,7 @@
         Widget.__init__(self, 'chatroom')
         scroll = gtk.ScrolledWindow()
         scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        self._chat = gtkmozembed.MozEmbed()
+	self._chat = webkit.WebView()
         scroll.add_with_viewport(self._chat)
         self.add(scroll)
 
@@ -50,11 +50,11 @@
     def do_event_connect(self, event_man, event):
         chatirc = 'http://webchat.freenode.net/?nick={nick}&channels={chans}'.format(
                 nick=event.nick, chans=event.chat)
-        self._chat.load_url(chatirc)
+        self._chat.load_uri(chatirc)
         self._chat.show()
 
     def do_event_disconnect(self, event_man, event):
-        self._chat.load_url('about:blank')
+        self._chat.load_uri('about:blank')
         self._chat.hide()
 
     def get_input_widget(self):

=== modified file 'setup.py'
--- setup.py	2010-02-24 22:58:17 +0000
+++ setup.py	2011-06-23 12:26:08 +0000
@@ -75,7 +75,7 @@
 
 DistUtilsExtra.auto.setup(
     name='lernid',
-    version='0.7',
+    version='0.8.0.2',
     license='GPL-3',
     author='Michael Budde',
     author_email='[e-mail]',