[glade3/signal-tree-model] Fixed a crasher and various merge conflicts

[Johannes Schmid <jhs src gnome org>]

commit 7cd0289ce8479e13f69703da9217b49cb7f5cdce
Author: Johannes Schmid <jhs gnome org>
Date:   Thu Dec 16 12:45:25 2010 +0100

    Fixed a crasher and various merge conflicts

 gladeui/glade-base-editor.c |    2 --
 gladeui/glade-project.c     |    3 ---
 2 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/gladeui/glade-base-editor.c b/gladeui/glade-base-editor.c
index 3f7181a..bf95b30 100644
--- a/gladeui/glade-base-editor.c
+++ b/gladeui/glade-base-editor.c
@@ -1246,8 +1246,6 @@ glade_base_editor_dispose (GObject *object)
 {
 	GladeBaseEditor *cobj = GLADE_BASE_EDITOR (object);
 
-	glade_signal_editor_load_widget (cobj->priv->signal_editor, NULL);
-
 	reset_child_types (cobj);
 
 	glade_base_editor_project_disconnect (cobj);
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index dab52cc..0a28714 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -101,9 +101,6 @@ struct _GladeProjectPrivate
 	gint stamp; /* Stamp used for the iterators, increment when iterators become invalid */
 	gboolean previewable;
 
-	gint   stamp;     /* A a random int per instance of project used to stamp/check the
-			   * GtkTreeIter->stamps */
-
 	GList *selection; /* We need to keep the selection in the project
 			   * because we have multiple projects and when the
 			   * user switchs between them, he will probably