[anjuta] project-manager: Default parent was not selected when adding new project node

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 95ff5df0fed4c6897c875450ca94fe36f728d5dc
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Fri Jul 29 16:08:24 2011 +0200

    project-manager: Default parent was not selected when adding new project node

 plugins/project-manager/plugin.c        |   14 ++++++++------
 plugins/project-manager/project-model.c |    2 +-
 plugins/project-manager/project-model.h |    2 +-
 plugins/project-manager/project-view.c  |    2 +-
 plugins/project-manager/tree-data.c     |    6 +++---
 plugins/project-manager/tree-data.h     |    2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/plugins/project-manager/plugin.c b/plugins/project-manager/plugin.c
index 21b9a5c..06a445c 100644
--- a/plugins/project-manager/plugin.c
+++ b/plugins/project-manager/plugin.c
@@ -449,8 +449,8 @@ on_new_group (GtkAction *action, ProjectManagerPlugin *plugin)
 		ianjuta_project_manager_add_group (IANJUTA_PROJECT_MANAGER (plugin),
 										   "", default_group,
 										   NULL);
-	g_object_unref (group);
-	g_object_unref (default_group);
+	if (group != NULL) g_object_unref (group);
+	if (default_group != NULL) g_object_unref (default_group);
 }
 
 static void
@@ -504,8 +504,9 @@ on_new_target (GtkAction *action, ProjectManagerPlugin *plugin)
 		ianjuta_project_manager_add_target (IANJUTA_PROJECT_MANAGER (plugin),
 											"", default_group,
 											NULL);
-	g_object_unref (target);
-	g_object_unref (default_group);
+
+	if (target != NULL) g_object_unref (target);
+	if (default_group != NULL) g_object_unref (default_group);
 }
 
 static void
@@ -526,8 +527,9 @@ on_add_source (GtkAction *action, ProjectManagerPlugin *plugin)
 		ianjuta_project_manager_add_source (IANJUTA_PROJECT_MANAGER (plugin),
 											source_uri,
 											default_group, NULL);
-	g_object_unref (source);
-	g_object_unref (default_group);
+
+	if (source != NULL) g_object_unref (source);
+	if (default_group != NULL) g_object_unref (default_group);
 }
 
 static void
diff --git a/plugins/project-manager/project-model.c b/plugins/project-manager/project-model.c
index fb6d963..810ea94 100644
--- a/plugins/project-manager/project-model.c
+++ b/plugins/project-manager/project-model.c
@@ -828,7 +828,7 @@ gboolean
 gbf_project_model_find_file (GbfProjectModel 	*model,
     GtkTreeIter		*found,
     GtkTreeIter		*parent,
-    AnjutaProjectNodeType type,
+     GbfTreeNodeType type,
     GFile		*file)
 {
 	GtkTreeIter iter;
diff --git a/plugins/project-manager/project-model.h b/plugins/project-manager/project-model.h
index 371044a..598dfec 100644
--- a/plugins/project-manager/project-model.h
+++ b/plugins/project-manager/project-model.h
@@ -71,7 +71,7 @@ gboolean         gbf_project_model_find_tree_data    (GbfProjectModel   *model,
 gboolean         gbf_project_model_find_file         (GbfProjectModel   *model,
                                                       GtkTreeIter       *iter,
                                                       GtkTreeIter       *parent,
-                                                      AnjutaProjectNodeType type,
+                                                       GbfTreeNodeType type,
                                                       GFile             *file);
 gboolean         gbf_project_model_find_node         (GbfProjectModel   *model,
                                                       GtkTreeIter       *iter,
diff --git a/plugins/project-manager/project-view.c b/plugins/project-manager/project-view.c
index 0002e3d..b48d0cf 100644
--- a/plugins/project-manager/project-view.c
+++ b/plugins/project-manager/project-view.c
@@ -531,7 +531,7 @@ static gboolean
 draw (GtkWidget *widget, cairo_t *cr)
 {
 	GtkTreeModel *view_model;
-	GtkTreeModel *model;
+	GtkTreeModel *model = NULL;
 	GtkTreeView *tree_view;
 	gint event_handled = FALSE;
 
diff --git a/plugins/project-manager/tree-data.c b/plugins/project-manager/tree-data.c
index 87e1d65..99b85a0 100644
--- a/plugins/project-manager/tree-data.c
+++ b/plugins/project-manager/tree-data.c
@@ -141,7 +141,7 @@ gbf_tree_data_equal (GbfTreeData *data_a, GbfTreeData *data_b)
 }
 
 gboolean
-gbf_tree_data_equal_file (GbfTreeData *data, AnjutaProjectNodeType type, GFile *file)
+gbf_tree_data_equal_file (GbfTreeData *data,  GbfTreeNodeType type, GFile *file)
 {
 	gboolean equal = FALSE;
 
@@ -151,7 +151,7 @@ gbf_tree_data_equal_file (GbfTreeData *data, AnjutaProjectNodeType type, GFile *
 
 		if (node != NULL)
 		{
-			if ((type == ANJUTA_PROJECT_UNKNOWN) || (type == anjuta_project_node_get_node_type (node)))
+			if ((type == ANJUTA_PROJECT_UNKNOWN) || (type == data->type))
 			{
 				GFile* node_file = anjuta_project_node_get_file (node);
 				if (node_file && g_file_equal (node_file, file))
@@ -389,7 +389,7 @@ gbf_tree_data_new_package (AnjutaProjectNode *package)
 GbfTreeData *
 gbf_tree_data_new_node (AnjutaProjectNode *node)
 {
-	GbfTreeData *data;
+	GbfTreeData *data = NULL;
 	
 	switch (anjuta_project_node_get_node_type (node))
 	{
diff --git a/plugins/project-manager/tree-data.h b/plugins/project-manager/tree-data.h
index 091da06..6647c25 100644
--- a/plugins/project-manager/tree-data.h
+++ b/plugins/project-manager/tree-data.h
@@ -69,7 +69,7 @@ gchar		  *gbf_tree_data_get_path		    (GbfTreeData           *data);
 gboolean       gbf_tree_data_equal              (GbfTreeData           *data_a,
                                                  GbfTreeData           *data_b);
 gboolean       gbf_tree_data_equal_file         (GbfTreeData           *data,
-                                                 AnjutaProjectNodeType type,
+                                                  GbfTreeNodeType type,
                                                  GFile                 *file);
 gboolean       gbf_tree_data_equal_name         (GbfTreeData           *data,
                                                  const gchar           *name);