glade3 r1710 - in trunk: . gladeui plugins/gtk+

[tvb svn gnome org]

Author: tvb
Date: Sun Mar  9 20:14:39 2008
New Revision: 1710
URL: http://svn.gnome.org/viewvc/glade3?rev=1710&view=rev

Log:
	* plugins/gtk+/glade-gtk.c: 
	  - Reset "events" property for newly created widgets
	    (workaround for bug 472555).

	* gladeui/glade-editor-property.c: added return_if_fail guard
	  as per bug 479468.



Modified:
   trunk/ChangeLog
   trunk/gladeui/glade-editor-property.c
   trunk/plugins/gtk+/glade-gtk.c

Modified: trunk/gladeui/glade-editor-property.c
==============================================================================
--- trunk/gladeui/glade-editor-property.c	(original)
+++ trunk/gladeui/glade-editor-property.c	Sun Mar  9 20:14:39 2008
@@ -4037,6 +4037,8 @@
 
 	adaptor = glade_widget_adaptor_from_pspec (eprop->klass->pspec);
 
+	g_return_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor));
+
 	g_object_get (adaptor, "book", &book, NULL);
 
 	if (eprop->klass->virt == FALSE &&

Modified: trunk/plugins/gtk+/glade-gtk.c
==============================================================================
--- trunk/plugins/gtk+/glade-gtk.c	(original)
+++ trunk/plugins/gtk+/glade-gtk.c	Sun Mar  9 20:14:39 2008
@@ -270,6 +270,11 @@
 				   GladeCreateReason   reason)
 {
 	GladeWidget *gwidget = glade_widget_get_from_gobject (widget);
+
+	/* Work around bug 472555 by resetting the default event mask,
+	 * this way only user edits will be saved to the glade file. */
+	if (reason == GLADE_CREATE_USER)
+		glade_widget_property_reset (gwidget, "events");
 	
 	glade_widget_set_action_sensitive (gwidget, "remove_parent", FALSE);