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

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
=== modified file 'debian/changelog'
--- debian/changelog 2010-09-16 14:08:50 +0000
+++ debian/changelog 2011-03-15 03:07:56 +0000
@@ -1,3 +1,10 @@
1lernid (0.7.2~ppajsg1) natty; urgency=low
2
3 * Closes: LP: #716937: Correct color setting in tags in Classroom.py and
4 NativeChatroom.py
5
6 -- John S Gruber <JohnSGruber@gmail.com> Tue, 08 Mar 2011 13:55:40 -0500
7
1lernid (0.7.1) maverick; urgency=low8lernid (0.7.1) maverick; urgency=low
29
3 [ Michael Budde ]10 [ Michael Budde ]
411
=== modified file 'lernid/widgets/Classroom.py'
--- lernid/widgets/Classroom.py 2010-03-03 09:46:21 +0000
+++ lernid/widgets/Classroom.py 2011-03-15 03:07:56 +0000
@@ -62,9 +62,9 @@
6262
63 self._buffer = self._textview.get_buffer()63 self._buffer = self._textview.get_buffer()
64 text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]64 text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]
65 self._buffer.create_tag('gray', foreground=text_color)65 self._buffer.create_tag('gray', foreground_gdk=text_color)
66 highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]66 highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]
67 self._buffer.create_tag('highlight', foreground=highlight)67 self._buffer.create_tag('highlight', foreground_gdk=highlight)
68 self._init_hyperlinks()68 self._init_hyperlinks()
6969
70 self.show_all()70 self.show_all()
7171
=== modified file 'lernid/widgets/NativeChatroom.py'
--- lernid/widgets/NativeChatroom.py 2010-03-03 09:46:21 +0000
+++ lernid/widgets/NativeChatroom.py 2011-03-15 03:07:56 +0000
@@ -58,9 +58,9 @@
5858
59 self._buffer = self._textview.get_buffer()59 self._buffer = self._textview.get_buffer()
60 text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]60 text_color = self._textview.get_style().text[gtk.STATE_INSENSITIVE]
61 self._buffer.create_tag('gray', foreground=text_color)61 self._buffer.create_tag('gray', foreground_gdk=text_color)
62 highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]62 highlight = self._textview.get_style().bg[gtk.STATE_SELECTED]
63 self._buffer.create_tag('highlight', foreground=highlight)63 self._buffer.create_tag('highlight', foreground_gdk=highlight)
6464
65 self._input = builder.get_object('input')65 self._input = builder.get_object('input')
66 self._input.connect('icon-press', self._send_text)66 self._input.connect('icon-press', self._send_text)

Subscribers

People subscribed via source and target branches