[anjuta/newproject: 125/126] pm: Use URI for saving shortcuts

[Sebastien Granjoux <sgranjoux src gnome org>]

commit c473ade7a85a01ff9ef27d9dda50642b9738e94e
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Sat Aug 28 09:56:57 2010 +0200

    pm: Use URI for saving shortcuts

 plugins/project-manager/plugin.c        |    4 +++-
 plugins/project-manager/project-model.c |   14 +++++++-------
 plugins/project-manager/project-view.c  |   18 ++++++++----------
 plugins/project-manager/tree-data.c     |    4 +++-
 4 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/plugins/project-manager/plugin.c b/plugins/project-manager/plugin.c
index e43d725..6e44d9f 100644
--- a/plugins/project-manager/plugin.c
+++ b/plugins/project-manager/plugin.c
@@ -1252,7 +1252,7 @@ add_primary_target (AnjutaProjectNode *node, gpointer data)
 	{
 		gchar *path;
 		
-		path = g_file_get_path (anjuta_project_node_get_file (node));
+		path = g_file_get_uri (anjuta_project_node_get_file (node));
 		
 		*list = g_list_prepend (*list, g_strconcat ("C ", path, NULL));
 		g_free (path);
@@ -1335,6 +1335,7 @@ on_project_loaded (AnjutaPmProject *project, AnjutaProjectNode *node, GError *er
 	else
 	{
 		/* Restore existing shortcut */
+#if 0
 		if (plugin->shortcuts != NULL)
 		{
 			GList *item;
@@ -1351,6 +1352,7 @@ on_project_loaded (AnjutaPmProject *project, AnjutaProjectNode *node, GError *er
 			}
 		}
 		else
+#endif
 		{
 			GList *list = NULL;
 			
diff --git a/plugins/project-manager/project-model.c b/plugins/project-manager/project-model.c
index 6d4120b..a110ec1 100644
--- a/plugins/project-manager/project-model.c
+++ b/plugins/project-manager/project-model.c
@@ -470,7 +470,7 @@ add_source (GbfProjectModel    	      *model,
 	
 	data = gbf_tree_data_new_source (source);
 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, parent);
-	g_message ("add source %p", data);
+	//g_message ("add source %p", data);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -513,13 +513,13 @@ add_target_shortcut (GbfProjectModel *model,
 	{
 		data = target;
 	}
-	g_message ("add target shortcut %p", data);
+	//g_message ("add target shortcut %p", data);
 	gtk_tree_store_insert_before (GTK_TREE_STORE (model), &iter, NULL, &sibling);
 	//g_message ("insert done %p ", data);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
-	g_message ("set done %p ", data);
+	//g_message ("set done %p ", data);
 	
 	/* add sources */
 	parent = anjuta_pm_project_get_node (model->priv->proj, target);
@@ -605,7 +605,7 @@ add_package (GbfProjectModel    	      *model,
 	
 	data = gbf_tree_data_new_package (package);
 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, parent);
-	g_message ("add package %p", data);
+	//g_message ("add package %p", data);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -631,7 +631,7 @@ add_module (GbfProjectModel 		*model,
 	
 	data = gbf_tree_data_new_module (module);
 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, parent);
-	g_message ("add_module %p", data);
+	//g_message ("add_module %p", data);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -657,7 +657,7 @@ add_target (GbfProjectModel 		*model,
 	
 	data = gbf_tree_data_new_target (target);
 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, parent);
-	g_message("add_target %p", data);
+	//g_message("add_target %p", data);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -693,7 +693,7 @@ add_target_group (GbfProjectModel 	*model,
 	
 	data = gbf_tree_data_new_group (group);
 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, parent);
-	g_message("add_target_group %p", data);
+	//g_message("add_target_group %p", data);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
diff --git a/plugins/project-manager/project-view.c b/plugins/project-manager/project-view.c
index 1763508..02f9d2a 100644
--- a/plugins/project-manager/project-view.c
+++ b/plugins/project-manager/project-view.c
@@ -175,7 +175,6 @@ set_pixbuf (GtkTreeViewColumn *tree_column,
 	
 	gtk_tree_model_get (model, iter,
 			    GBF_PROJECT_MODEL_COLUMN_DATA, &data, -1);
-	g_message("set_pixbuf data %p", data);
 	g_return_if_fail (data != NULL);
 	/* FIXME: segmentation fault with shortcut when corresponding
 	 * data is removed before the shortcut, so data = NULL.
@@ -249,7 +248,6 @@ set_text (GtkTreeViewColumn *tree_column,
 	gtk_tree_model_get (model, iter, GBF_PROJECT_MODEL_COLUMN_DATA, &data, -1);
 	/* data can be NULL just after gtk_tree_store_insert before
 	calling gtk_tree_store_set */ 
-	g_message ("data is %p", data);
 	g_object_set (GTK_CELL_RENDERER (cell), "text", 
 		      data == NULL ? "" : data->name, NULL);
 }
@@ -566,7 +564,7 @@ gbf_project_view_get_shortcut_list (GbfProjectView *view)
 				GtkTreePath *path;
 				gboolean expand;
 
-				uri = gbf_tree_data_get_path (data);
+				uri = gbf_tree_data_get_uri (data);
 				path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
 				expand = gtk_tree_view_row_expanded (GTK_TREE_VIEW (view), path);
 				gtk_tree_path_free (path);
@@ -637,19 +635,19 @@ gbf_project_view_set_shortcut_list (GbfProjectView *view, GList *shortcuts)
 				GFile *file;
 				GtkTreeIter shortcut;
 				gboolean expand = FALSE;
-				gchar *path = (gchar *)node->data;
+				gchar *uri = (gchar *)node->data;
 
-				if (strncmp (path, "E ", 2) == 0)
+				if (strncmp (uri, "E ", 2) == 0)
 				{
 					expand = TRUE;
-					path += 2;
+					uri += 2;
 				}
-				else if (strncmp (path, "C ", 2) == 0)
+				else if (strncmp (uri, "C ", 2) == 0)
 				{
 					expand = FALSE;
-					path += 2;
+					uri += 2;
 				}
-				file = g_file_new_for_path (path);
+				file = g_file_new_for_uri (uri);
 
 				if (gbf_project_model_find_file  (GBF_PROJECT_MODEL (model), &shortcut, NULL, ANJUTA_PROJECT_UNKNOWN, file))
 				{
@@ -676,7 +674,7 @@ gbf_project_view_set_shortcut_list (GbfProjectView *view, GList *shortcuts)
 							gtk_tree_path_free (path);
 						}
 						/* Mark the shortcut as used */
-						*path = 'U';
+						*uri = 'U';
 					}
 				}
 				g_object_unref (file);
diff --git a/plugins/project-manager/tree-data.c b/plugins/project-manager/tree-data.c
index 8394da2..2f99071 100644
--- a/plugins/project-manager/tree-data.c
+++ b/plugins/project-manager/tree-data.c
@@ -55,6 +55,8 @@
 gchar *
 gbf_tree_data_get_uri (GbfTreeData *data)
 {
+	return data->node ? g_file_get_uri (anjuta_project_node_get_file (data->node)) : NULL;
+	/*
 	//return g_file_get_uri (anjuta_project_node_get_file (data->node));
 	if (data->source != NULL)
 	{
@@ -76,7 +78,7 @@ gbf_tree_data_get_uri (GbfTreeData *data)
 		return g_file_get_uri (data->group);
 	}
 
-	return NULL;
+	return NULL;*/
 }
 
 GFile *