[gtk+/native-layout: 331/335] Fixed merge problem



commit c3da4007db8dc199791a6226f876f7871703885b
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Aug 5 16:55:35 2010 -0400

    Fixed merge problem

 gtk/gtkexpander.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 023fe27..ce49601 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -568,8 +568,6 @@ gtk_expander_size_allocate (GtkWidget     *widget,
 
   widget->allocation = *allocation;
 
-  widget->allocation = *allocation;
-
   gtk_widget_style_get (widget,
 			"interior-focus", &interior_focus,
 			"focus-line-width", &focus_width,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]