Ubuntu

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

Proposed by John S. Gruber on 2011-03-31
Status: Merged
Merged at revision: 3
Proposed branch: lp:~jsjgruber/ubuntu/natty/lernid/lernid.fix716937.fix727232
Merge into: lp:ubuntu/natty/lernid
Diff against target: 61 lines (+14/-5) 4 files modified
To merge this branch: bzr merge lp:~jsjgruber/ubuntu/natty/lernid/lernid.fix716937.fix727232
Reviewer Review Type Date Requested Status
Luke Yelavich Approve on 2011-04-01
Ubuntu branches 2011-03-31 Pending
Review via email: mp+55755@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Luke Yelavich (themuso) wrote :

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

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2010-07-31 08:42:13 +0000
3+++ debian/changelog 2011-03-31 14:05:49 +0000
4@@ -1,3 +1,11 @@
5+lernid (0.7ubuntu1) natty; urgency=low
6+
7+ * Fix Significant bugs
8+ (LP: #716937) - Correct specification of text tags colors
9+ (LP: #727232) - Add desktopcouch as dependency
10+
11+ -- John S Gruber <JohnSGruber@gmail.com> Tue, 29 Mar 2011 16:22:10 -0400
12+
13 lernid (0.7) maverick; urgency=low
14
15 * New upstream version, fixes bugs:
16
17=== modified file 'debian/control'
18--- debian/control 2010-07-31 08:42:13 +0000
19+++ debian/control 2011-03-31 14:05:49 +0000
20@@ -24,7 +24,8 @@
21 python-gobject,
22 python-vobject,
23 python-gtk2,
24- python-poppler
25+ python-poppler,
26+ desktopcouch
27 Recommends:
28 telepathy-idle,
29 python-vte,
30
31=== modified file 'lernid/widgets/Classroom.py'
32--- lernid/widgets/Classroom.py 2010-07-31 08:42:13 +0000
33+++ lernid/widgets/Classroom.py 2011-03-31 14:05:49 +0000
34@@ -62,9 +62,9 @@
35
36 self._buffer = self._textview.get_buffer()
37 text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]
38- self._buffer.create_tag('gray', foreground=text_color)
39+ self._buffer.create_tag('gray', foreground_gdk=text_color)
40 highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]
41- self._buffer.create_tag('highlight', foreground=highlight)
42+ self._buffer.create_tag('highlight', foreground_gdk=highlight)
43 self._init_hyperlinks()
44
45 self.show_all()
46
47=== modified file 'lernid/widgets/NativeChatroom.py'
48--- lernid/widgets/NativeChatroom.py 2010-07-31 08:42:13 +0000
49+++ lernid/widgets/NativeChatroom.py 2011-03-31 14:05:49 +0000
50@@ -58,9 +58,9 @@
51
52 self._buffer = self._textview.get_buffer()
53 text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]
54- self._buffer.create_tag('gray', foreground=text_color)
55+ self._buffer.create_tag('gray', foreground_gdk=text_color)
56 highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]
57- self._buffer.create_tag('highlight', foreground=highlight)
58+ self._buffer.create_tag('highlight', foreground_gdk=highlight)
59
60 self._input = builder.get_object('input')
61 self._input.connect('icon-press', self._send_text)

Subscribers

People subscribed via source and target branches