[glade3] Fixed bad merge on last cherry-pick



commit 295db1f5920fdbd9eb6a9117a5d4f250c9f30449
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Fri Dec 31 13:45:08 2010 +0900

    Fixed bad merge on last cherry-pick

 plugins/gtk+/glade-gtk.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index ccfffae..ec59960 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -7208,10 +7208,11 @@ glade_gtk_tool_item_constructor (GType type,
 }
 
 void
-glade_gtk_tool_item_post_create (GladeWidgetAdaptor * adaptor,
-                                 GObject * object, GladeCreateReason reason)
+glade_gtk_tool_item_post_create (GladeWidgetAdaptor *adaptor,
+                                 GObject            *object, 
+				 GladeCreateReason   reason)
 {
-  g_return_if_fail (GTK_IS_TOOL_ITEM (object));
+  GladeWidget *gitem = glade_widget_get_from_gobject (object);
 
   if (GTK_IS_SEPARATOR_TOOL_ITEM (object))
     return;



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