[evolution/f15/master] fix patch

Matthias Clasen mclasen at fedoraproject.org
Fri Feb 11 17:12:40 UTC 2011


commit dee29da7792d0e51671e166a992e3d9df6b2563c
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Fri Feb 11 12:11:40 2011 -0500

    fix patch

 evolution-gtk3.patch |   29 ++++++++++-------------------
 1 files changed, 10 insertions(+), 19 deletions(-)
---
diff --git a/evolution-gtk3.patch b/evolution-gtk3.patch
index 958c910..780f7d8 100644
--- a/evolution-gtk3.patch
+++ b/evolution-gtk3.patch
@@ -1,19 +1,12 @@
-From cdb1098cc61e4b123bfcecb0a1bcd15b293e8aba Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha at redhat.com>
-Date: Fri, 11 Feb 2011 09:31:38 +0000
-Subject: Fix a build break due to #error pragma
-
----
-diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
-index 6a277fc..467523d 100644
---- a/widgets/table/e-cell-tree.c
-+++ b/widgets/table/e-cell-tree.c
-@@ -669,10 +669,21 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
+diff -up evolution-2.91.6.1/widgets/table/e-cell-tree.c.gtk3 evolution-2.91.6.1/widgets/table/e-cell-tree.c
+--- evolution-2.91.6.1/widgets/table/e-cell-tree.c.gtk3	2011-01-30 11:33:28.000000000 -0500
++++ evolution-2.91.6.1/widgets/table/e-cell-tree.c	2011-02-11 12:05:27.983052606 -0500
+@@ -679,10 +679,22 @@ ect_print (ECellView *ecell_view, GtkPri
  
-                /* now draw our icon if we're expandable */
-                if (expandable) {
+ 		/* now draw our icon if we're expandable */
+ 		if (expandable) {
 -#if GTK_CHECK_VERSION (3, 0, 0)
--                       gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
+-			gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
 -#error Paint an expander here
 -#endif
 +                       gboolean expanded;
@@ -31,9 +24,7 @@ index 6a277fc..467523d 100644
 +                       r.height = height;
 +
 +                       draw_expander (tree_view, cr, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r);
-                }
++
+ 		}
  
-                cairo_stroke (cr);
---
-cgit v0.8.3.1
-
+ 		cairo_stroke (cr);


More information about the scm-commits mailing list