* gladeui/glade-widget.c: Fixed glade_widget_hide() in the case that the project is

	  already gone.

	* gladeui/glade-command.c: Fixed glade_command_remove() to push the command on the
	  right GladeProject pointer.

3 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 18912833..5cb2f482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,12 @@
 	parentless widget references (i.e. you can add a parent to a GtkToolItemGroup's label widget
 	or a GtkButton's image widget, or remove the parent of a child of a label-widget, etc).
 
+	* gladeui/glade-widget.c: Fixed glade_widget_hide() in the case that the project is
+	  already gone.
+
+	* gladeui/glade-command.c: Fixed glade_command_remove() to push the command on the
+	  right GladeProject pointer.
+
 2011-04-29  Javier Jardón <jjardon@gnome.org>
 
 	* gladeui/glade-utils.c: Correctly detect the required devhelp version
diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c
index c0eb9b87..98197660 100644
--- a/gladeui/glade-command.c
+++ b/gladeui/glade-command.c
@@ -1238,7 +1238,7 @@ glade_command_remove (GList *widgets)
 	glade_command_check_group (GLADE_COMMAND (me));
 
 	if (glade_command_add_remove_execute (GLADE_COMMAND (me)))
-		glade_project_push_undo (GLADE_PROJECT (widget->project), GLADE_COMMAND (me));
+		glade_project_push_undo (me->project, GLADE_COMMAND (me));
 	else
 		g_object_unref (G_OBJECT (me));
 
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 118dc55d..c83ab8d1 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -2011,8 +2011,12 @@ glade_widget_hide (GladeWidget *widget)
 	{
 		GladeDesignView *view;
 		GtkWidget *layout;
-		
-		if ((view = glade_design_view_get_from_project (glade_widget_get_project (widget))) != NULL)
+		GladeProject *project;
+
+		project = glade_widget_get_project (widget);
+
+		if (project &&
+		    (view = glade_design_view_get_from_project (project)) != NULL)
 		{
 			GtkWidget *child;