[glade3] * gladeui/glade-project.c: Fixed glade-project to unset the loading flag when loading project de

[Tristan Van Berkom <tvb src gnome org>]

commit 13514387bd73a98d46759561e0c326486a0532bd
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Mon Dec 27 14:05:51 2010 +0900

    	* gladeui/glade-project.c: Fixed glade-project to unset the loading flag when
    	  loading project dependancies are not satisfied and there is an early return.
    
    Conflicts:
    
    	ChangeLog

 ChangeLog               |   17 +++++++++++------
 gladeui/glade-project.c |   24 +++---------------------
 2 files changed, 14 insertions(+), 27 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8e4ecbe..2fdb6ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-27  Tristan Van Berkom <tristanvb openismus com>
+
+	* gladeui/glade-project.c: Fixed glade-project to unset the loading flag when
+	  loading project dependancies are not satisfied and there is an early return.
+
+	* gladui/glade-editor-table.c: Align name field on the right with all the other
+	  properties.
+
+	* gladui/glade-editor-property.c: Set a width-chars on the eprop label so that
+	  line wrapping kicks in.
+
 2010-12-26  Tristan Van Berkom <tristanvb openismus com>
 
 	* gladeui/glade-previewer.c: Added include <locale.h> for setlocale() (bug 638035).
@@ -12,12 +23,6 @@
 	* gladeui/glade-widget.c: Reduce processing of events by not running the
 	  widget lookup event redirection for events we're not interested in.
 
-	* gladui/glade-editor-table.c: Align name field on the right with all the other
-	  properties.
-
-	* gladui/glade-editor-property.c: Set a width-chars on the eprop label so that
-	  line wrapping kicks in.
-
 2010-12-23  Tristan Van Berkom <tristanvb openismus com>
 
 	* gladeui/glade-widget.c: Check if object is actually in the parent when rebuilding
diff --git a/gladeui/glade-project.c b/gladeui/glade-project.c
index 90d4eee..d2095cd 100644
--- a/gladeui/glade-project.c
+++ b/gladeui/glade-project.c
@@ -1494,27 +1494,6 @@ glade_project_push_progress (GladeProject *project)
 	g_signal_emit (project, glade_project_signals [LOAD_PROGRESS], 0,
 		       project->priv->progress_full,
 		       project->priv->progress_step);
-
-#if 0
-	if (project->priv->progress)
-	{
-		gchar  *text;
-		project->priv->progress_step++;
-
-		text = g_strdup_printf ("Loaded %d of %d objects", 
-					project->priv->progress_step,
-					project->priv->progress_full);
-		gtk_progress_bar_set_text (GTK_PROGRESS_BAR (project->priv->progress), text);
-		g_free (text);
-
-		gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (project->priv->progress),
-					       project->priv->progress_step * 1.0 / 
-					       project->priv->progress_full);
-
-		while (gtk_events_pending ())
-			gtk_main_iteration ();
-	}
-#endif
 }
 
 static gboolean
@@ -1540,6 +1519,7 @@ glade_project_load_internal (GladeProject *project)
 					       NULL)))
 	{
 		g_warning ("Couldn't open glade file [%s].", project->priv->path);
+		project->priv->loading = FALSE;
 		return FALSE;
 	}
 
@@ -1557,6 +1537,7 @@ glade_project_load_internal (GladeProject *project)
 		g_warning ("Couldnt determine project format, skipping %s", 
 			   project->priv->path);
 		glade_xml_context_free (context);
+		project->priv->loading = FALSE;
 		return FALSE;
 	}
 
@@ -1568,6 +1549,7 @@ glade_project_load_internal (GladeProject *project)
 
 	if (glade_project_read_requires (project, root, project->priv->path, &has_gtk_dep) == FALSE)
 	{
+		project->priv->loading = FALSE;
 		glade_xml_context_free (context);
 		return FALSE;
 	}