Lernid

Merge lp:~jsjgruber/lernid/lernid.fix716937 into lp:lernid

  1. lernid.fix716937
  2. Merge into trunk
Proposed by John S. Gruber
Status: Merged
Merged at revision: 217
Proposed branch: lp:~jsjgruber/lernid/lernid.fix716937
Merge into: lp:lernid
Diff against target: 46 lines (+11/-4)
3 files modified
debian/changelog (+7/-0)
lernid/widgets/Classroom.py (+2/-2)
lernid/widgets/NativeChatroom.py (+2/-2)
To merge this branch: bzr merge lp:~jsjgruber/lernid/lernid.fix716937
Reviewer Review Type Date Requested Status
Lernid Development Team Pending
Michael Budde Pending
Review via email: mp+53358@code.launchpad.net

Description of the change

Proposed fix for lp: #716937

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-09-16 14:08:50 +0000
3+++ debian/changelog 2011-03-15 03:07:56 +0000
4@@ -1,3 +1,10 @@
5+lernid (0.7.2~ppajsg1) natty; urgency=low
6+
7+ * Closes: LP: #716937: Correct color setting in tags in Classroom.py and
8+ NativeChatroom.py
9+
10+ -- John S Gruber <JohnSGruber@gmail.com> Tue, 08 Mar 2011 13:55:40 -0500
11+
12 lernid (0.7.1) maverick; urgency=low
13
14 [ Michael Budde ]
15
16=== modified file 'lernid/widgets/Classroom.py'
17--- lernid/widgets/Classroom.py 2010-03-03 09:46:21 +0000
18+++ lernid/widgets/Classroom.py 2011-03-15 03:07:56 +0000
19@@ -62,9 +62,9 @@
20
21 self._buffer = self._textview.get_buffer()
22 text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]
23- self._buffer.create_tag('gray', foreground=text_color)
24+ self._buffer.create_tag('gray', foreground_gdk=text_color)
25 highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]
26- self._buffer.create_tag('highlight', foreground=highlight)
27+ self._buffer.create_tag('highlight', foreground_gdk=highlight)
28 self._init_hyperlinks()
29
30 self.show_all()
31
32=== modified file 'lernid/widgets/NativeChatroom.py'
33--- lernid/widgets/NativeChatroom.py 2010-03-03 09:46:21 +0000
34+++ lernid/widgets/NativeChatroom.py 2011-03-15 03:07:56 +0000
35@@ -58,9 +58,9 @@
36
37 self._buffer = self._textview.get_buffer()
38 text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]
39- self._buffer.create_tag('gray', foreground=text_color)
40+ self._buffer.create_tag('gray', foreground_gdk=text_color)
41 highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]
42- self._buffer.create_tag('highlight', foreground=highlight)
43+ self._buffer.create_tag('highlight', foreground_gdk=highlight)
44
45 self._input = builder.get_object('input')
46 self._input.connect('icon-press', self._send_text)

Subscribers

People subscribed via source and target branches