[anjuta/newproject] project-manager: Fix few bugs due to recent changes

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 250de2ac7faa9dafb6c37a78fb4a008eb410af14
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Mon May 24 22:57:16 2010 +0200

    project-manager: Fix few bugs due to recent changes

 plugins/am-project/am-project.c   |    4 +++-
 plugins/mk-project/mk-scanner.l   |    2 +-
 plugins/project-manager/dialogs.c |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/plugins/am-project/am-project.c b/plugins/am-project/am-project.c
index 83b518b..e924a29 100644
--- a/plugins/am-project/am-project.c
+++ b/plugins/am-project/am-project.c
@@ -1128,6 +1128,8 @@ static void
 foreach_node_destroy (AnjutaProjectNode    *g_node,
 		      gpointer  data)
 {
+	AmpProject *project = (AmpProject *)data;
+	
 	switch (AMP_NODE_DATA (g_node)->type & ANJUTA_PROJECT_TYPE_MASK) {
 		case ANJUTA_PROJECT_GROUP:
 			//g_hash_table_remove (project->groups, g_file_get_uri (AMP_GROUP_NODE (g_node)->file));
@@ -2171,7 +2173,7 @@ amp_project_unload (AmpProject *project)
 	monitors_remove (project);
 	
 	/* project data */
-	project_node_destroy (project, project->root_node);
+	//project_node_destroy (project, project->root_node);
 	project->root_node = NULL;
 
 	if (project->configure_file)	g_object_unref (G_OBJECT (project->configure_file));
diff --git a/plugins/mk-project/mk-scanner.l b/plugins/mk-project/mk-scanner.l
index 37ec054..092aa38 100644
--- a/plugins/mk-project/mk-scanner.l
+++ b/plugins/mk-project/mk-scanner.l
@@ -233,7 +233,7 @@ mkp_scanner_parse_token (MkpScanner *scanner, AnjutaToken *token, GError **error
     AnjutaToken *first;
     AnjutaTokenStream *stream;
 
-    stream = anjuta_token_stream_push (scanner->stream, token, NULL);
+    stream = anjuta_token_stream_push (scanner->stream, NULL, token, NULL);
     first = anjuta_token_stream_get_root (stream);
 
     if (scanner->stream != NULL)
diff --git a/plugins/project-manager/dialogs.c b/plugins/project-manager/dialogs.c
index 3145f3b..7ba728b 100644
--- a/plugins/project-manager/dialogs.c
+++ b/plugins/project-manager/dialogs.c
@@ -37,7 +37,7 @@
 
 #define ICON_SIZE 16
 
-#define GLADE_FILE  PACKAGE_DATA_DIR "/glade/create_dialogs.ui"
+#define GLADE_FILE  PACKAGE_DATA_DIR "/glade/pm_dialogs.ui"
 
 /* Types
   *---------------------------------------------------------------------------*/