Merge lp:~jsjgruber/ubuntu/natty/lernid/lernid.fix716937.fix727232 into lp:ubuntu/natty/lernid

[John S. Gruber]

Fix lp: 716937 -- text tag color setting, and lp: 727232 desktopcouch dependency

[Luke Yelavich (themuso)]

Looks good, approved, and uploaded. I tweaked the version number, since the package is an Ubuntu native package.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-31 08:42:13 +0000
+++ debian/changelog	2011-03-31 14:05:49 +0000
@@ -1,3 +1,11 @@
+lernid (0.7ubuntu1) natty; urgency=low
+
+  * Fix Significant bugs
+    (LP: #716937) - Correct specification of text tags colors
+    (LP: #727232) - Add desktopcouch as dependency
+
+ -- John S Gruber <[e-mail]>  Tue, 29 Mar 2011 16:22:10 -0400
+
 lernid (0.7) maverick; urgency=low
 
   * New upstream version, fixes bugs:
 
=== modified file 'debian/control'
--- debian/control	2010-07-31 08:42:13 +0000
+++ debian/control	2011-03-31 14:05:49 +0000
@@ -24,7 +24,8 @@
  python-gobject,
  python-vobject,
  python-gtk2,
- python-poppler
+ python-poppler,
+ desktopcouch
 Recommends:
  telepathy-idle,
  python-vte,
 
=== modified file 'lernid/widgets/Classroom.py'
--- lernid/widgets/Classroom.py	2010-07-31 08:42:13 +0000
+++ lernid/widgets/Classroom.py	2011-03-31 14:05:49 +0000
@@ -62,9 +62,9 @@
 
         self._buffer = self._textview.get_buffer()
         text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]
-        self._buffer.create_tag('gray', foreground=text_color)
+        self._buffer.create_tag('gray', foreground_gdk=text_color)
         highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]
-        self._buffer.create_tag('highlight', foreground=highlight)
+        self._buffer.create_tag('highlight', foreground_gdk=highlight)
         self._init_hyperlinks()
 
         self.show_all()
 
=== modified file 'lernid/widgets/NativeChatroom.py'
--- lernid/widgets/NativeChatroom.py	2010-07-31 08:42:13 +0000
+++ lernid/widgets/NativeChatroom.py	2011-03-31 14:05:49 +0000
@@ -58,9 +58,9 @@
 
         self._buffer = self._textview.get_buffer()
         text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]
-        self._buffer.create_tag('gray', foreground=text_color)
+        self._buffer.create_tag('gray', foreground_gdk=text_color)
         highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]
-        self._buffer.create_tag('highlight', foreground=highlight)
+        self._buffer.create_tag('highlight', foreground_gdk=highlight)
 
         self._input = builder.get_object('input')
         self._input.connect('icon-press', self._send_text)