Merge lp:~chrisccoulson/lernid/no-mozembed into lp:lernid

[Chris Coulson]

lernid depends on python-gtkmozembed, which is being dropped from Ubuntu (see https://blueprints.launchpad.net/ubuntu/+spec/desktop-o-mozilla-rapid-release-maintenance). This ports the remaining gtkmozembed part to webkit

[John S. Gruber (jsjgruber)]

Thanks for keeping us in mind as the mozilla software changes. I'm not aware of all you are doing as part of rapid development, but I don't see any problem with removing the dependency--that was on my list to do as well as we are now using webkit for our embeded web browser.

How urgent is this dependency change? In particular, can it wait until late August or should it be done now?

I don't see the exception at build time you were referring to wrt cursors. Can you point it out to me? On occasion I have seen an exception at lernid start-up. I'd like to know what I'm missing in the build, however, if you can spare the time to explain it.

I'm afraid I don't understand the point of the gettext changes. I must be missing something here. The change you propose seems to redefine the gettext call in lernidconfig.py to be the identity function which would remove the DESCRIPTION translation from the about box. I built this merge and tested the about box while running lernid with LANGUAGE=fr lernid -v and, indeed, the description mistakenly goes from french to english. I don't understand adding the gettext import to the AboutLearnidDialog.py either, I'm afraid.

I'm afraid my questions may not be very intelligent ones, so please excuse me. I certainly appreciate your attention to lernid and I'm grateful for your time.

[lp:~chrisccoulson/lernid/no-mozembed]

227. By Chris Coulson on 2011-06-15

Fix the translation in the about dialog

[Chris Coulson (chrisccoulson)]

Oops, yes I broke the translations in the about dialog. Sorry. I've fixed that now. The reason for that change is because I get this when I try to build it on oneiric:

cd . && \
  python2.6 setup.py clean \
  -a
running clean
'build/lib.linux-x86_64-2.6' does not exist -- can't clean it
'build/bdist.linux-x86_64' does not exist -- can't clean it
'build/scripts-2.6' does not exist -- can't clean it
WARNING: the following files are not recognized by DistUtilsExtra.auto:
  Copyright
  lernid.desktop.in
  po/lernid.pot
rm -rf debian/python-module-stampdir
find "/home/chr1s/src/lernid/lernid" -name '*.py[co]' -delete
find "/home/chr1s/src/lernid/lernid" -name __pycache__ -type d -empty -delete
find "/home/chr1s/src/lernid/lernid" -prune -name '*.egg-info' -exec rm -rf '{}' ';'
 debian/rules build
test -x debian/rules
mkdir -p "."
mkdir -p debian/python-module-stampdir
cd . && \
  python2.6 setup.py build \
  --build-base="/home/chr1s/src/lernid/lernid/./build"
/usr/lib/python2.6/dist-packages/gtk-2.0/gtk/__init__.py:57: GtkWarning: could not open display
  warnings.warn(str(e), _gtk.Warning)
ERROR: Python module lernid.CouchDBPreferences not found
Traceback (most recent call last):
  File "setup.py", line 86, in <module>
    'install': InstallAndUpdateDataDirectory
  File "/usr/lib/python2.6/dist-packages/DistUtilsExtra/auto.py", line 96, in setup
    __requires(attrs, src_all)
  File "/usr/lib/python2.6/dist-packages/DistUtilsExtra/auto.py", line 414, in __requires
    __add_imports(imports, s, attrs)
  File "/usr/lib/python2.6/dist-packages/DistUtilsExtra/auto.py", line 361, in __add_imports
    if __external_mod(cur_module, node.module, attrs):
  File "/usr/lib/python2.6/dist-packages/DistUtilsExtra/auto.py", line 315, in __external_mod
    mod = __import__(module)
  File "/home/chr1s/src/lernid/lernid/lernid/LernidOptions.py", line 23, in <module>
    from lernid.lernidconfig import VERSION
  File "/home/chr1s/src/lernid/lernid/lernid/lernidconfig.py", line 33, in <module>
    DESCRIPTION = _('Connect to a world of online tutorials quickly and easily.')
NameError: name '_' is not defined
make: *** [debian/python-module-stampdir/lernid] Error 1

Also, the GdkCursor change is required to fix this issue (also at build time), which occurs because there is no DISPLAY:

cd . && \
  python setup.py build \
  --build-base="/home/chr1s/src/lernid/lernid/./build"
/usr/lib/python2.7/dist-packages/gtk-2.0/gtk/__init__.py:57: GtkWarning: could not open display
  warnings.warn(str(e), _gtk.Warning)
/home/chr1s/src/lernid/lernid/lernid/widgets/IrcWidget.py:33: GtkWarning: IA__gdk_cursor_new_for_display: assertion `GDK_IS_DISPLAY (display)' failed
  hand_cursor = gtk.gdk.Cursor(gtk.gdk.HAND2)
Traceback (most recent call last):
  File "setup.py", line 86, in <module>
    'install': InstallAndUpdateDataDirectory
  File "/usr/lib/python2.7/dist-packages/DistUtilsExtra/auto.py", line 96, in setup
    __requires(attrs, src_all)
  File "/usr/lib/python2.7/dist-packages/DistUtilsExtra/auto.py", line 414, in __requires
    __add_imports(imports, s, attrs)
  File "/usr/lib/python2.7/dist-packages/DistUtilsExtra/auto.py", line 361, in __add_imports
    if __external_m...

[John S. Gruber (jsjgruber)]

So I gather the idea is that DESCRIPTIONS should be untranslated but
the _('something') form is necessary to keep the translation in the
translation system?

Thanks again for pointing out the FTBS issues as well as the
dependency problem. I'm apologize for all the questions.

[Chris Coulson (chrisccoulson)]

Hi,

Yeah, the identity function in lernidconfig.py is there just ensure that the string ends up in the translation template.

=== modified file 'debian/control'
--- debian/control	2011-03-14 03:20:05 +0000
+++ debian/control	2011-06-15 11:22:58 +0000
@@ -17,7 +17,6 @@
  ${python:Depends},
  telepathy-idle,
  python-xdg,
- python-gtkmozembed,
  python-telepathy,
  python-webkit,
  python-dbus,

=== modified file 'lernid/AboutLernidDialog.py'
--- lernid/AboutLernidDialog.py	2010-02-08 16:49:55 +0000
+++ lernid/AboutLernidDialog.py	2011-06-15 11:22:58 +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	2011-06-02 04:43:14 +0000
+++ lernid/lernidconfig.py	2011-06-15 11:22:58 +0000
@@ -29,6 +29,8 @@
 import os
 import xdg.BaseDirectory
 
+def _(message): return message
+
 VERSION = '0.8.1'
 DESCRIPTION = _('Connect to a world of online tutorials quickly and easily.')
 WEBSITE = 'http://wiki.ubuntu.com/Lernid'

=== modified file 'lernid/widgets/Classroom.py'
--- lernid/widgets/Classroom.py	2011-03-14 03:19:11 +0000
+++ lernid/widgets/Classroom.py	2011-06-15 11:22:58 +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-03-05 00:45:41 +0000
+++ lernid/widgets/IrcWidget.py	2011-06-15 11:22:58 +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-14 03:19:11 +0000
+++ lernid/widgets/NativeChatroom.py	2011-06-15 11:22:58 +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-08 16:49:55 +0000
+++ lernid/widgets/WebChatroom.py	2011-06-15 11:22:58 +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):