Merge lp:~larsu/evolution/revert-reverting-0cb0dc0 into lp:~ubuntu-desktop/evolution/ubuntu

Proposed by Lars Karlitski on 2014-02-17
Status: Merged
Merged at revision: 344
Proposed branch: lp:~larsu/evolution/revert-reverting-0cb0dc0
Merge into: lp:~ubuntu-desktop/evolution/ubuntu
Diff against target: 46 lines (+0/-34)
2 files modified
debian/patches/revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch (+0/-33)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~larsu/evolution/revert-reverting-0cb0dc0
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2014-02-17 Pending
Review via email: mp+206698@code.launchpad.net

Description of the change

Revert reverting upstream commit 0cb0dc0

Evolution's mail view was is black with gtk 3.10. We need this commit again so that the themes can set a background on the mail view widgets.

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=== removed file 'debian/patches/revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch'
2--- debian/patches/revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch 2013-12-02 17:55:58 +0000
3+++ debian/patches/revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch 1970-01-01 00:00:00 +0000
4@@ -1,33 +0,0 @@
5-Description: Revert 0cb0dc0dddf915d0c6d6baa522beaa0cfeb0fefe; it causes black backgrounds in evolution.
6-Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=699576
7-
8-reverted:
9---- b/em-format/e-mail-formatter.c
10-+++ a/em-format/e-mail-formatter.c
11-@@ -491,10 +491,6 @@
12- widget_path = gtk_widget_path_new ();
13- gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
14- gtk_style_context_set_path (style_context, widget_path);
15-- gtk_style_context_invalidate (style_context);
16--
17-- gtk_style_context_save (style_context);
18-- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_TOOLBAR);
19-
20- gtk_style_context_get_background_color (style_context, state, &rgba);
21- e_mail_formatter_set_color (
22-@@ -506,13 +502,12 @@
23- e_mail_formatter_set_color (
24- formatter, E_MAIL_FORMATTER_COLOR_FRAME, &rgba);
25-
26-- gtk_style_context_restore (style_context);
27-- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY);
28--
29- gtk_style_context_get_color (style_context, state, &rgba);
30- e_mail_formatter_set_color (
31- formatter, E_MAIL_FORMATTER_COLOR_HEADER, &rgba);
32-
33-+ gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY);
34-+
35- gtk_style_context_get_background_color (
36- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba);
37- e_mail_formatter_set_color (
38
39=== modified file 'debian/patches/series'
40--- debian/patches/series 2013-12-02 17:55:58 +0000
41+++ debian/patches/series 2014-02-17 11:54:47 +0000
42@@ -6,4 +6,3 @@
43 20_skip_broken_gconf_conversions.patch
44 91_add_u1_email_translations.patch
45 alarm-notify-nodisplay.patch
46-revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch

Subscribers

People subscribed via source and target branches