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

[Lars Karlitski]

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.

=== removed file 'debian/patches/revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch'
--- debian/patches/revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch	2013-12-02 17:55:58 +0000
+++ debian/patches/revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-Description: Revert 0cb0dc0dddf915d0c6d6baa522beaa0cfeb0fefe; it causes black backgrounds in evolution.
-Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=699576
-
-reverted:
---- b/em-format/e-mail-formatter.c
-+++ a/em-format/e-mail-formatter.c
-@@ -491,10 +491,6 @@
- 	widget_path = gtk_widget_path_new ();
- 	gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
- 	gtk_style_context_set_path (style_context, widget_path);
--	gtk_style_context_invalidate (style_context);
--
--	gtk_style_context_save (style_context);
--	gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_TOOLBAR);
- 
- 	gtk_style_context_get_background_color (style_context, state, &rgba);
- 	e_mail_formatter_set_color (
-@@ -506,13 +502,12 @@
- 	e_mail_formatter_set_color (
- 		formatter, E_MAIL_FORMATTER_COLOR_FRAME, &rgba);
- 
--	gtk_style_context_restore (style_context);
--	gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY);
--
- 	gtk_style_context_get_color (style_context, state, &rgba);
- 	e_mail_formatter_set_color (
- 		formatter, E_MAIL_FORMATTER_COLOR_HEADER, &rgba);
- 
-+	gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY);
-+
- 	gtk_style_context_get_background_color (
- 		style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba);
- 	e_mail_formatter_set_color  (
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-02 17:55:58 +0000
+++ debian/patches/series	2014-02-17 11:54:47 +0000
@@ -6,4 +6,3 @@
 20_skip_broken_gconf_conversions.patch
 91_add_u1_email_translations.patch
 alarm-notify-nodisplay.patch
-revert-0001-Bug-699576-Mail-reader-frame-is-black-in-the-mail-vi.patch