rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patches to fix folder names in Mail view's folder tree and colors in preview

Browse Source
This commit is contained in:
Milan Crha 2014-06-26 08:08:26 +02:00
parent 567f66cdf8
commit c605dad9cb
3 changed files with 188 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
evolution-3.12.3-folder-tree-columns-expand.patch Normal file
View File

@ -0,0 +1,25 @@
From 33dd6d93ca6e4fa3f1d3b846650504d419d88f9b Mon Sep 17 00:00:00 2001
From: Sebastian Keller <sebastian-keller@gmx.de>
Date: Tue, 17 Jun 2014 10:07:48 +0200
Subject: Bug 731549 - EMFolderTree: Text column doesn't expand with recent
gtk+
gtk commit 73ff6a8e0ff307b8d14986c64918022364ff10e7 removed the code
that made the column expand previously, resulting in only ellipses being
shown.
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 5b5a3b9..a8967d6 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1259,6 +1259,7 @@ folder_tree_constructed (GObject *object)
priv->selection_changed_handler_id = handler_id;
column = gtk_tree_view_column_new ();
+ gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_column_set_sizing (
column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column (tree_view, column);
--
cgit v0.10.1

153
evolution-3.12.3-webview-named-theme-colors.patch Normal file
View File

@ -0,0 +1,153 @@
From 5f197603700d0e0cbfc2dab7c4750fd04c41de25 Mon Sep 17 00:00:00 2001
From: Sebastian Keller <sebastian-keller@gmx.de>
Date: Mon, 23 Jun 2014 11:39:46 +0200
Subject: Bug 731872 - EWebView: Use named colors from themes
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index 8703ee1..7615db4 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -574,20 +574,20 @@ style_updated_cb (EWebView *web_view)
gchar *style;
GtkStateFlags state_flags;
GtkStyleContext *style_context;
- GtkWidgetPath *widget_path;
+ gboolean backdrop;
state_flags = gtk_widget_get_state_flags (GTK_WIDGET (web_view));
- style_context = gtk_style_context_new ();
- 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_add_class (style_context, GTK_STYLE_CLASS_ENTRY);
-
- gtk_style_context_get_background_color (
- style_context,
- state_flags | GTK_STATE_FLAG_FOCUSED,
- &color);
- color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color));
+ style_context = gtk_widget_get_style_context (GTK_WIDGET (web_view));
+ backdrop = (state_flags & GTK_STATE_FLAG_BACKDROP) != 0;
+
+ if (gtk_style_context_lookup_color (
+ style_context,
+ backdrop ? "theme_unfocused_base_color" : "theme_base_color",
+ &color))
+ color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color));
+ else
+ color_value = g_strdup("#ffffff");
+
style = g_strconcat ("background-color: ", color_value, ";", NULL);
e_web_view_add_css_rule_into_style_sheet (
@@ -599,11 +599,14 @@ style_updated_cb (EWebView *web_view)
g_free (color_value);
g_free (style);
- gtk_style_context_get_color (
- style_context,
- state_flags | GTK_STATE_FLAG_FOCUSED,
- &color);
- color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color));
+ if (gtk_style_context_lookup_color (
+ style_context,
+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color",
+ &color))
+ color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color));
+ else
+ color_value = g_strdup("#000000");
+
style = g_strconcat ("color: ", color_value, ";", NULL);
e_web_view_add_css_rule_into_style_sheet (
@@ -612,9 +615,6 @@ style_updated_cb (EWebView *web_view)
".-e-web-view-text-color",
style);
- gtk_widget_path_free (widget_path);
- g_object_unref (style_context);
-
g_free (color_value);
g_free (style);
}
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 2efe8eb..a81802b 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -489,20 +489,21 @@ mail_formatter_update_style (EMailFormatter *formatter,
GtkStyleContext *style_context;
GtkWidgetPath *widget_path;
GdkRGBA rgba;
+ gboolean backdrop;
g_object_freeze_notify (G_OBJECT (formatter));
- /* derive colors from top-level window */
style_context = gtk_style_context_new ();
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);
+ backdrop = (state & GTK_STATE_FLAG_BACKDROP) != 0;
- 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);
+ if (!gtk_style_context_lookup_color (
+ style_context,
+ backdrop ? "theme_unfocused_bg_color" : "theme_bg_color",
+ &rgba))
+ gdk_rgba_parse (&rgba, "#eeeeee");
e_mail_formatter_set_color (
formatter, E_MAIL_FORMATTER_COLOR_BODY, &rgba);
@@ -512,20 +513,27 @@ mail_formatter_update_style (EMailFormatter *formatter,
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);
+ if (!gtk_style_context_lookup_color (
+ style_context,
+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color",
+ &rgba))
+ gdk_rgba_parse (&rgba, "#000000");
e_mail_formatter_set_color (
formatter, E_MAIL_FORMATTER_COLOR_HEADER, &rgba);
- gtk_style_context_get_background_color (
- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba);
+ if (!gtk_style_context_lookup_color (
+ style_context,
+ backdrop ? "theme_unfocused_base_color" : "theme_base_color",
+ &rgba))
+ gdk_rgba_parse (&rgba, "#ffffff");
e_mail_formatter_set_color (
formatter, E_MAIL_FORMATTER_COLOR_CONTENT, &rgba);
- gtk_style_context_get_color (
- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba);
+ if (!gtk_style_context_lookup_color (
+ style_context,
+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color",
+ &rgba))
+ gdk_rgba_parse (&rgba, "#000000");
e_mail_formatter_set_color (
formatter, E_MAIL_FORMATTER_COLOR_TEXT, &rgba);
@@ -605,7 +613,7 @@ e_mail_formatter_class_init (EMailFormatterClass *class)
gdk_rgba_parse (rgba, "#3f3f3f");
rgba = &class->colors[E_MAIL_FORMATTER_COLOR_HEADER];
- gdk_rgba_parse (rgba, "#eeeeee");
+ gdk_rgba_parse (rgba, "#000000");
rgba = &class->colors[E_MAIL_FORMATTER_COLOR_TEXT];
gdk_rgba_parse (rgba, "#000000");
--
cgit v0.10.1

11
evolution.spec
View File

@ -30,7 +30,7 @@
Name: evolution Name: evolution
Version: 3.12.3 Version: 3.12.3
Release: 2%{?dist} Release: 3%{?dist}
Group: Applications/Productivity Group: Applications/Productivity
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
@ -52,6 +52,9 @@ Patch02: evolution-2.30.1-help-contents.patch
Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch
Patch04: evolution-3.12.3-folder-tree-columns-expand.patch
Patch05: evolution-3.12.3-webview-named-theme-colors.patch
## Dependencies ### ## Dependencies ###
Requires: gvfs Requires: gvfs
@ -208,6 +211,8 @@ This package contains the plugin to import Microsoft Personal Storage Table
%patch01 -p1 -b .ldaphack %patch01 -p1 -b .ldaphack
%patch02 -p1 -b .help-contents %patch02 -p1 -b .help-contents
%patch03 -p1 -b .drop-gnome-icon-theme-dep %patch03 -p1 -b .drop-gnome-icon-theme-dep
%patch04 -p1 -b .folder-tree-columns-expand
%patch05 -p1 -b .webview-named-theme-colors
# Remove the welcome email from Novell # Remove the welcome email from Novell
for inbox in mail/default/*/Inbox; do for inbox in mail/default/*/Inbox; do
@ -529,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Jun 26 2014 Milan Crha <mcrha@redhat.com> - 3.12.3-3
- Add upstream patch to fix folder names in Mail view's folder tree
- Add upstream patch to fix colors in preview
* Mon Jun 09 2014 Milan Crha <mcrha@redhat.com> - 3.12.3-2 * Mon Jun 09 2014 Milan Crha <mcrha@redhat.com> - 3.12.3-2
- Drop gnome-icon-theme dependency - Drop gnome-icon-theme dependency