[glade3] * gladeui/glade-editor-property.c: Unload currently loaded property in glade_editor_property_loa



commit bb70daa05f0f07cf9008633f9e03cb30dca90bba
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sat Dec 18 19:35:47 2010 +0900

    	* gladeui/glade-editor-property.c: Unload currently loaded property in
    	  glade_editor_property_load_by_widget() when a NULL widget is specified or the property
    	  is not found.

 ChangeLog                       |    4 ++++
 gladeui/glade-editor-property.c |   11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b9d5828..81ddd32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 	* gladeui/glade-editor-property.c: Hide editor properties when the property is not available
 	  on the widget, bug 585299, fix by Marco Diego Aurélio Mesquita.
 
+	* gladeui/glade-editor-property.c: Unload currently loaded property in
+	  glade_editor_property_load_by_widget() when a NULL widget is specified or the property
+	  is not found.
+
 2010-12-17  Tristan Van Berkom <tristanvb openismus com>
 
 	* gladeui/glade-project.c: Restore proper sorting of objects at save time.
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c
index 4b3183c..2fc8422 100644
--- a/gladeui/glade-editor-property.c
+++ b/gladeui/glade-editor-property.c
@@ -3767,15 +3767,20 @@ glade_editor_property_load_by_widget (GladeEditorProperty *eprop,
 		/* properties are allowed to be missing on some internal widgets */
 		property = glade_widget_get_property (widget, eprop->klass->id);
 
-		if(property) {
-			glade_editor_property_load (eprop, property);
+		glade_editor_property_load (eprop, property);
+
+		if (property) 
+		{
 			gtk_widget_show (GTK_WIDGET (eprop));
 			gtk_widget_show (GTK_WIDGET (eprop->item_label));
 		}
-		else {
+		else 
+		{
 			gtk_widget_hide (GTK_WIDGET (eprop));
 			gtk_widget_hide (GTK_WIDGET (eprop->item_label));
 		}
 	}
+	else
+		glade_editor_property_load (eprop, NULL);
 }
 



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