anjuta r3937 - in branches/anjuta-2-4: . plugins/glade

[jhs svn gnome org]

Author: jhs
Date: Sun May 18 22:16:20 2008
New Revision: 3937
URL: http://svn.gnome.org/viewvc/anjuta?rev=3937&view=rev

Log:
2008-05-19  Johannes Schmid  <jhs gnome org>

  Patch from Pavel Kostyuchenko:
	* plugins/glade/anjuta-design-document.h:
	* plugins/glade/plugin.c (update_current_project),
	(value_added_current_editor), (glade_update_ui),
	(on_document_destroy), (glade_plugin_add_project):
	
	#532625 â Wrong consecution of functions calls when opening a glade file

Modified:
   branches/anjuta-2-4/ChangeLog
   branches/anjuta-2-4/plugins/glade/anjuta-design-document.h
   branches/anjuta-2-4/plugins/glade/plugin.c

Modified: branches/anjuta-2-4/plugins/glade/anjuta-design-document.h
==============================================================================
--- branches/anjuta-2-4/plugins/glade/anjuta-design-document.h	(original)
+++ branches/anjuta-2-4/plugins/glade/anjuta-design-document.h	Sun May 18 22:16:20 2008
@@ -50,6 +50,7 @@
 struct _AnjutaDesignDocument
 {
 	GladeDesignView parent_instance;
+	gboolean is_project_added;
 };
 
 GType anjuta_design_document_get_type (void) G_GNUC_CONST;

Modified: branches/anjuta-2-4/plugins/glade/plugin.c
==============================================================================
--- branches/anjuta-2-4/plugins/glade/plugin.c	(original)
+++ branches/anjuta-2-4/plugins/glade/plugin.c	Sun May 18 22:16:20 2008
@@ -57,6 +57,27 @@
 	N_COLUMNS
 };
 
+static void 
+update_current_project (GtkComboBox *projects_combo,
+                        GladeProject* project)
+{	
+	GtkTreeIter iter;
+	GladeProject *cur_project;	
+	GtkTreeModel* model = gtk_combo_box_get_model (projects_combo);
+	
+	if (gtk_tree_model_get_iter_first (model, &iter))
+		do
+		{
+			gtk_tree_model_get (model, &iter, PROJECT_COL, &cur_project, -1);
+			if (project == cur_project)
+			{
+				gtk_combo_box_set_active_iter (projects_combo, &iter);
+				break;
+			}
+		}
+		while (gtk_tree_model_iter_next (model, &iter));
+}
+
 static void
 value_added_current_editor (AnjutaPlugin *plugin, const char *name,
 							const GValue *value, gpointer data)
@@ -68,25 +89,12 @@
 	{
 		AnjutaDesignDocument* view = ANJUTA_DESIGN_DOCUMENT(editor);
 		GladeProject* project = glade_design_view_get_project(GLADE_DESIGN_VIEW(view));
-		/* Update current project */
-		GtkTreeIter iter;
-		GtkTreeModel* model = 
-			gtk_combo_box_get_model (GTK_COMBO_BOX (glade_plugin->priv->projects_combo));
-		if (gtk_tree_model_get_iter_first (model, &iter))
+		if (!view->is_project_added)
 		{
-			do
-			{
-				GladeProject *cur_project;
-				gtk_tree_model_get (model, &iter, PROJECT_COL, &cur_project, -1);
-				if (project == cur_project)
-				{
-					gtk_combo_box_set_active_iter (GTK_COMBO_BOX (glade_plugin->priv->projects_combo), &iter);
-					glade_app_set_project(project);
-					break;
-				}
-			}
-			while (gtk_tree_model_iter_next (model, &iter));
+			glade_app_add_project (project);
+			view->is_project_added = TRUE;
 		}
+		glade_app_set_project (project);
 	}
 }
 
@@ -100,29 +108,12 @@
 static void
 glade_update_ui (GladeApp *app, GladePlugin *plugin)
 {
-	GtkTreeModel *model;
-	GtkTreeIter iter;;
 	IAnjutaDocument* doc;
 	IAnjutaDocumentManager* docman = 
 		anjuta_shell_get_interface(ANJUTA_PLUGIN(plugin)->shell,
 								   IAnjutaDocumentManager, NULL);
 	
-	/* Update current project */
-	model = gtk_combo_box_get_model (GTK_COMBO_BOX (plugin->priv->projects_combo));
-	if (gtk_tree_model_get_iter_first (model, &iter))
-	{
-		do
-		{
-			GladeProject *project;
-			gtk_tree_model_get (model, &iter, PROJECT_COL, &project, -1);
-			if (project == glade_app_get_project ())
-			{
-				gtk_combo_box_set_active_iter (GTK_COMBO_BOX (plugin->priv->projects_combo), &iter);
-				break;
-			}
-		}
-		while (gtk_tree_model_iter_next (model, &iter));
-	}
+	update_current_project (GTK_COMBO_BOX (plugin->priv->projects_combo), glade_app_get_project ());
 	/* Emit IAnjutaDocument signal */	
 	doc = ianjuta_document_manager_get_current_document(docman, NULL);
 	if (doc && ANJUTA_IS_DESIGN_DOCUMENT(doc))
@@ -179,8 +170,6 @@
 	GladeProject *project;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	IAnjutaDocumentManager *docman;
-	GList *docwids, *node;
 
 	DEBUG_PRINT(__FUNCTION__);
 	
@@ -379,9 +368,7 @@
 					  G_CALLBACK (on_document_destroy), glade_plugin);
 	gtk_widget_show (view);
 	g_object_set_data (G_OBJECT (project), "design_view", view);
-	/* add document before adding project, cuz that changes the document */
 	ianjuta_document_manager_add_document(docman, IANJUTA_DOCUMENT(view), NULL);
-	glade_app_add_project (project);
 }
 
 #if (GLADEUI_VERSION >= 330)