GNOME.org
 

[anjuta/newproject] am, pm: Remove dead code and useless debugging messages

commit cdff7a12dce6f3aa379a51b0edf3ba5460a4185c
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Sat Nov 6 19:14:58 2010 +0100

    am, pm: Remove dead code and useless debugging messages

 libanjuta/anjuta-token-list.c           |    3 ---
 plugins/am-project/ac-writer.c          |    2 --
 plugins/am-project/am-node.c            |   12 +-----------
 plugins/am-project/am-project.c         |   31 ++++---------------------------
 plugins/am-project/command-queue.c      |    2 +-
 plugins/dir-project/dir-project.c       |    2 --
 plugins/project-manager/plugin.c        |   25 -------------------------
 plugins/project-manager/project-model.c |   12 ------------
 plugins/project-manager/project.c       |    4 ++--
 9 files changed, 8 insertions(+), 85 deletions(-)
---
diff --git a/libanjuta/anjuta-token-list.c b/libanjuta/anjuta-token-list.c
index ec72579..5b211af 100644
--- a/libanjuta/anjuta-token-list.c
+++ b/libanjuta/anjuta-token-list.c
@@ -572,7 +572,6 @@ anjuta_token_insert_word_after (AnjutaToken *list, AnjutaToken *sibling, AnjutaT
 		
 		next = anjuta_token_next_item (token);
 		
-		fprintf(stderr, "anjuta_token_first_item list %p sibling %p item %p token %p\n", list, sibling, item, token);
 		switch (anjuta_token_get_type (token))
 		{
 		case ANJUTA_TOKEN_LAST:
@@ -607,7 +606,6 @@ anjuta_token_insert_word_after (AnjutaToken *list, AnjutaToken *sibling, AnjutaT
 
 		if (next == NULL)
 		{
-			fprintf(stderr, "anjuta_token_word_after list %p sibling %p item %p token %p\n", list, sibling, item, token);
 			token = anjuta_token_insert_after (token, anjuta_token_new_static (ANJUTA_TOKEN_NEXT | ANJUTA_TOKEN_ADDED, NULL));
 			anjuta_token_insert_after (token, item);
 			return item;
@@ -615,7 +613,6 @@ anjuta_token_insert_word_after (AnjutaToken *list, AnjutaToken *sibling, AnjutaT
 		token = next;
 	}
 
-	fprintf(stderr, "anjuta_token_word_after list %p sibling %p item %p\n", list, sibling, item);
 	anjuta_token_prepend_items (list, item);
 
 	return item;
diff --git a/plugins/am-project/ac-writer.c b/plugins/am-project/ac-writer.c
index e45bd0c..f2fe322 100644
--- a/plugins/am-project/ac-writer.c
+++ b/plugins/am-project/ac-writer.c
@@ -316,7 +316,6 @@ amp_module_delete_token (AmpProject  *project, AnjutaAmModuleNode *module, GErro
 	}
 
 	token = amp_module_get_token (module);
-	g_message ("amp_module_delete_token %p", token);
 	if (token != NULL)
 	{
 		token = anjuta_token_list (token);
@@ -431,7 +430,6 @@ amp_package_delete_token (AmpProject  *project, AnjutaAmPackageNode *package, GE
 	}
 		
 	token = amp_package_get_token (package);
-	g_message ("amp_module_delete_token %p", package);
 	if (token != NULL)
 	{
 		AnjutaToken *args;
diff --git a/plugins/am-project/am-node.c b/plugins/am-project/am-node.c
index cfb89ba..c5a2863 100644
--- a/plugins/am-project/am-node.c
+++ b/plugins/am-project/am-node.c
@@ -502,7 +502,6 @@ on_group_monitor_changed (GFileMonitor *monitor,
 											gpointer data)
 {
 	AnjutaAmGroupNode *node = ANJUTA_AM_GROUP_NODE (data);
-	g_message ("on_group_monitor_changed %p monitor %p", node, monitor);
 
 	switch (event_type) {
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
@@ -510,15 +509,7 @@ on_group_monitor_changed (GFileMonitor *monitor,
 		case G_FILE_MONITOR_EVENT_DELETED:
 			/* project can be NULL, if the node is dummy node because the
 			 * original one is reloaded. */
-			if (!(anjuta_project_node_get_full_type (ANJUTA_PROJECT_NODE (node)) & ANJUTA_PROJECT_PROXY))
-			{
-				g_signal_emit_by_name (G_OBJECT (node->project), "file-changed", data);
-			}
-			else
-			{
-				g_message ("proxy changed");
-			}
-			g_message ("signal emitted");
+			g_signal_emit_by_name (G_OBJECT (node->project), "file-changed", data);
 			break;
 		default:
 			break;
@@ -667,7 +658,6 @@ amp_group_new (GFile *file, gboolean dist_only, GError **error)
 void
 amp_group_free (AnjutaAmGroupNode *node)
 {
-	g_message ("amp_group_free %p", node);
 	g_object_unref (G_OBJECT (node));
 }
 
diff --git a/plugins/am-project/am-project.c b/plugins/am-project/am-project.c
index 929b619..1a3e863 100644
--- a/plugins/am-project/am-project.c
+++ b/plugins/am-project/am-project.c
@@ -280,8 +280,6 @@ file_type (GFile *file, const gchar *filename)
 
 	child = filename != NULL ? g_file_get_child (file, filename) : g_object_ref (file);
 
-	//g_message ("check file %s", g_file_get_path (child));
-	
 	info = g_file_query_info (child,
 	                          G_FILE_ATTRIBUTE_STANDARD_TYPE, 
 	                          G_FILE_QUERY_INFO_NONE,
@@ -715,9 +713,6 @@ amp_project_load_properties (AmpProject *project, AnjutaToken *macro, AnjutaToke
 {
 	GList *item;
 	
-	//fprintf (stderr, "property list:\n");
-	//anjuta_token_dump (args);
-
 	project->ac_init = macro;
 	project->args = args;
 
@@ -745,7 +740,6 @@ amp_project_load_properties (AmpProject *project, AnjutaToken *macro, AnjutaToke
 			anjuta_project_node_insert_property (project->root, (AnjutaProjectProperty *)prop, new_prop);
 		}
 	}
-	//g_message ("prop list %p get prop %p", *list, anjuta_project_node_get_property (project->root);
 }
 
 void
@@ -834,7 +828,6 @@ amp_project_load_config (AmpProject *project, AnjutaToken *arg_list)
 
 		/* File list */
 		scanner = amp_ac_scanner_new (project);
-		fprintf (stderr, "\nParse list\n");
 		
 		arg = anjuta_token_first_item (arg_list);
 		list = amp_ac_scanner_parse_token (scanner, arg, AC_SPACE_LIST_STATE, NULL);
@@ -881,7 +874,6 @@ project_load_target (AmpProject *project, AnjutaToken *name, AnjutaTokenType tok
 
 	amp_group_add_token (ANJUTA_AM_GROUP_NODE (parent), name, AM_GROUP_TARGET);
 
-	//fprintf (stderr, "load_target list %p word %p next %p\n", list, anjuta_token_first_word (list), anjuta_token_next_word (anjuta_token_first_word (list)));
 	for (arg = anjuta_token_first_word (list); arg != NULL; arg = anjuta_token_next_word (arg))
 	{
 		gchar *value;
@@ -893,7 +885,6 @@ project_load_target (AmpProject *project, AnjutaToken *name, AnjutaTokenType tok
 
 		value = anjuta_token_evaluate (arg);
 
-		//fprintf (stderr, "target arg %p value =%s=\n", arg, value);
 		/* This happens for variable token which are considered as value */
 		if (value == NULL) continue;
 		canon_id = canonicalize_automake_variable (value);
@@ -911,7 +902,6 @@ project_load_target (AmpProject *project, AnjutaToken *name, AnjutaTokenType tok
 
 		/* Create target */
 		target = amp_target_new (value, info->base.type, install, flags, NULL);
-		//fprintf(stderr, "create target %s %p\n", value, target);
 		if (target != NULL)
 		{
 			amp_target_add_token (target, ANJUTA_TOKEN_ARGUMENT, arg);
@@ -1328,7 +1318,6 @@ project_load_makefile (AmpProject *project, AnjutaAmGroupNode *group)
 			g_object_unref (final_file);
 			if (config != NULL)
 			{
-				//g_message ("add group =%s= token %p group %p", *filename, config->token, anjuta_token_list (config->token));
 				amp_group_add_token (group, config->token, AM_GROUP_TOKEN_CONFIGURE);
 				break;
 			}
@@ -1634,15 +1623,8 @@ amp_project_load_root (AmpProject *project, GError **error)
 	g_hash_table_insert (project->files, configure_file, configure_token_file);
 	g_object_add_toggle_ref (G_OBJECT (configure_token_file), remove_config_file, project);
 	arg = anjuta_token_file_load (configure_token_file, NULL);
-	//fprintf (stderr, "AC file before parsing\n");
-	//anjuta_token_dump (arg);
-	//fprintf (stderr, "\n");
 	scanner = amp_ac_scanner_new (project);
 	AMP_ROOT_DATA (project->root)->configure_token = amp_ac_scanner_parse_token (scanner, arg, 0, &err);
-	//fprintf (stderr, "AC file after parsing\n");
-	//anjuta_token_check (arg);
-	//anjuta_token_dump (project->configure_token);
-	//fprintf (stderr, "\n");
 	amp_ac_scanner_free (scanner);
 	if (AMP_ROOT_DATA (project->root)->configure_token == NULL)
 	{
@@ -1783,9 +1765,9 @@ AnjutaProjectNode *
 amp_project_load_node (AmpProject *project, AnjutaProjectNode *node, GError **error) 
 {
 	AnjutaProjectNode *loaded = NULL;
-	GTimer *timer;
+	//GTimer *timer;
 	
-	timer = g_timer_new ();		
+	//timer = g_timer_new ();		
 	switch (anjuta_project_node_get_node_type (node))
 	{
 	case ANJUTA_PROJECT_ROOT:
@@ -1800,8 +1782,8 @@ amp_project_load_node (AmpProject *project, AnjutaProjectNode *node, GError **er
 	default:
 		break;
 	}
-	g_message ("Node %x loaded in %g", anjuta_project_node_get_node_type (node), g_timer_elapsed (timer, NULL));
-	g_timer_destroy (timer);
+	//g_message ("Node %x loaded in %g", anjuta_project_node_get_node_type (node), g_timer_elapsed (timer, NULL));
+	//g_timer_destroy (timer);
 
 	return loaded;
 }
@@ -2244,7 +2226,6 @@ amp_load_setup (PmJob *job)
 {
 	job->parent = anjuta_project_node_parent (job->node);
 	job->proxy = amp_project_duplicate_node (job->node);
-	// g_message ("amp_load_setup type %x proxy %x parent %p node %p proxy %p", job->node->type, job->proxy->type, job->parent, job->node, job->proxy);
 
 	return TRUE;
 }
@@ -2263,15 +2244,12 @@ amp_load_complete (PmJob *job)
 	GHashTable *map;
 
 	map = amp_project_map_node (job->node, job->proxy);
-	// g_message ("amp_load_complete type %x proxy %x", job->node->type, job->proxy->type);
 	g_hash_table_foreach (map, (GHFunc)amp_project_replace_node, map);
 	job->node->parent = job->parent;
 	job->proxy->parent = NULL;
 	g_hash_table_destroy (map);
-	//g_object_unref (job->proxy);
 	job->proxy = NULL;
 	g_signal_emit_by_name (AMP_PROJECT (job->user_data), "node-loaded", job->node,  job->error);
-	g_error_free (job->error);
 
 	return TRUE;
 }
@@ -2304,7 +2282,6 @@ static gboolean
 amp_save_complete (PmJob *job)
 {
 	g_signal_emit_by_name (AMP_PROJECT (job->user_data), "node-saved", job->node,  job->error);
-	g_error_free (job->error);
 
 	return TRUE;
 }
diff --git a/plugins/am-project/command-queue.c b/plugins/am-project/command-queue.c
index d388769..73fa2e6 100644
--- a/plugins/am-project/command-queue.c
+++ b/plugins/am-project/command-queue.c
@@ -356,7 +356,7 @@ pm_command_queue_push (PmCommandQueue *queue, PmJob *job)
 gboolean
 pm_command_queue_is_busy (PmCommandQueue *queue)
 {
-	g_message ("pm_command_queue_is_empty %d %d %d busy %d", g_queue_get_length (queue->job_queue), g_async_queue_length(queue->work_queue), g_async_queue_length(queue->done_queue), queue->busy);
+	//g_message ("pm_command_queue_is_empty %d %d %d busy %d", g_queue_get_length (queue->job_queue), g_async_queue_length(queue->work_queue), g_async_queue_length(queue->done_queue), queue->busy);
 	return queue->busy;
 }
 
diff --git a/plugins/dir-project/dir-project.c b/plugins/dir-project/dir-project.c
index 5dc9d81..9af9bfb 100644
--- a/plugins/dir-project/dir-project.c
+++ b/plugins/dir-project/dir-project.c
@@ -182,8 +182,6 @@ project_node_new (DirProject *project, AnjutaProjectNode *parent, AnjutaProjectN
 		ANJUTA_PROJECT_NODE_DATA (node)->parent = parent;
 	}
 	
-	//g_message ("dir new node %p type %x", node, type);
-	
 	return node;
 }
 
diff --git a/plugins/project-manager/plugin.c b/plugins/project-manager/plugin.c
index 1236e8a..985a430 100644
--- a/plugins/project-manager/plugin.c
+++ b/plugins/project-manager/plugin.c
@@ -1248,7 +1248,6 @@ add_primary_target (AnjutaProjectNode *node, gpointer data)
 {
 	GList ** list = (GList **)data;
 
-	//g_message ("add_primary_target %s %x", anjuta_project_node_get_name (node), anjuta_project_node_get_full_type (node));
 	if (anjuta_project_node_get_full_type (node) & ANJUTA_PROJECT_PRIMARY)
 	{
 		gchar *path;
@@ -1257,7 +1256,6 @@ add_primary_target (AnjutaProjectNode *node, gpointer data)
 		
 		*list = g_list_prepend (*list, g_strconcat ("C ", path, NULL));
 		g_free (path);
-		g_message ("     added %s", anjuta_project_node_get_name (node));
 	}
 }
 
@@ -1297,7 +1295,6 @@ on_project_updated (AnjutaPmProject *project, AnjutaProjectNode *node, GError *e
 			GList *list = NULL;
 			
 			/* Add new shortcut for PRIMARY target */
-			g_message ("add new shortcut on project_updated");
 			anjuta_project_node_foreach (node, G_POST_ORDER, add_primary_target, &list);
 
 			if (list != NULL)
@@ -1359,7 +1356,6 @@ on_project_loaded (AnjutaPmProject *project, AnjutaProjectNode *node, GError *er
 			GList *list = NULL;
 			
 			/* Add new shortcut for PRIMARY target */
-			g_message ("add new shortcut on project_loaded");
 			anjuta_project_node_foreach (node, G_POST_ORDER, add_primary_target, &list);
 
 			if (list != NULL)
@@ -1939,17 +1935,6 @@ iproject_manager_get_elements (IAnjutaProjectManager *project_manager,
 	plugin = ANJUTA_PLUGIN_PROJECT_MANAGER (G_OBJECT (project_manager));
 
 	return gbf_project_util_replace_by_file (gbf_project_util_node_all (anjuta_pm_project_get_root (plugin->project), element_type)); 
-	/*GList *list;
-	GList *item;
-	
-	g_message ("get elements root %p", anjuta_pm_project_get_root (plugin->project));
-	list = gbf_project_util_replace_by_file (gbf_project_util_node_all (anjuta_pm_project_get_root (plugin->project), element_type)); 
-	for (item = g_list_first (list); item != NULL; item = g_list_next (item))
-	{
-		g_message ("get element type %d file %s", element_type, g_file_get_path ((GFile *)item->data));
-	}
-	
-	return list;*/
 }
 
 static AnjutaProjectNodeType
@@ -2262,16 +2247,6 @@ iproject_manager_get_packages (IAnjutaProjectManager *project_manager, GError **
 	plugin = ANJUTA_PLUGIN_PROJECT_MANAGER (G_OBJECT (project_manager));
 
 	return anjuta_pm_project_get_packages (plugin->project);
-	/*GList *list;
-	GList *item;
-	
-	list = anjuta_pm_project_get_packages (plugin->project);
-	for (item = g_list_first (list); item != NULL; item = g_list_next (item))
-	{
-		g_message ("get package %s", (const gchar *)item->data);
-	}
-	
-	return list;*/
 }
 
 static void
diff --git a/plugins/project-manager/project-model.c b/plugins/project-manager/project-model.c
index 5805832..0ed9c73 100644
--- a/plugins/project-manager/project-model.c
+++ b/plugins/project-manager/project-model.c
@@ -318,7 +318,6 @@ gbf_project_model_remove_invalid_shortcut (GbfProjectModel *model, GtkTreeIter *
 	gboolean valid;
 	GbfTreeData *data;
 
-	g_message ("remove_invalid_shortcut %p", iter);
 	/* Get all shortcut */
 	valid = gtk_tree_model_iter_children (GTK_TREE_MODEL (model), &child, iter);
 	while (valid)
@@ -331,7 +330,6 @@ gbf_project_model_remove_invalid_shortcut (GbfProjectModel *model, GtkTreeIter *
 		
 		if (data->shortcut->type == GBF_TREE_NODE_INVALID)
 		{
-			g_message ("remove shortcut %p", data);
 			gbf_project_model_remove_children (model, &child);
 			valid = gtk_tree_store_remove (GTK_TREE_STORE (model), &child);
 			if (data != NULL) gbf_tree_data_free (data);
@@ -470,7 +468,6 @@ 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);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -513,13 +510,10 @@ add_target_shortcut (GbfProjectModel *model,
 	{
 		data = target;
 	}
-	//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);
 	
 	/* add sources */
 	parent = anjuta_pm_project_get_node (model->priv->proj, target);
@@ -575,7 +569,6 @@ move_target_shortcut (GbfProjectModel *model,
 	{
 		gtk_tree_store_remove (GTK_TREE_STORE (model), iter);			
 		gtk_tree_store_insert_before (GTK_TREE_STORE (model), iter, NULL, &sibling);
-		g_message ("move_target_shortcut %p", shortcut);
 		gtk_tree_store_set (GTK_TREE_STORE (model), iter, 
 				    GBF_PROJECT_MODEL_COLUMN_DATA, shortcut,
 				    -1);
@@ -605,7 +598,6 @@ 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);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -631,7 +623,6 @@ 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);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -657,7 +648,6 @@ 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);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -693,7 +683,6 @@ 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);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 
 			    GBF_PROJECT_MODEL_COLUMN_DATA, data,
 			    -1);
@@ -774,7 +763,6 @@ insert_empty_node (GbfProjectModel *model)
 	empty_node = gbf_tree_data_new_string (_("No project loaded"));
 
 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
-	g_message ("insert_empty_node %p", empty_node);
 	gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
 			    GBF_PROJECT_MODEL_COLUMN_DATA, empty_node,
 			    -1);
diff --git a/plugins/project-manager/project.c b/plugins/project-manager/project.c
index ec38daf..a139e22 100644
--- a/plugins/project-manager/project.c
+++ b/plugins/project-manager/project.c
@@ -65,7 +65,7 @@ on_pm_project_load_incomplete (AnjutaProjectNode *node, AnjutaPmProject *project
 static gboolean
 pm_command_load_complete (AnjutaPmProject *project, AnjutaProjectNode *node, GError *error)
 {
-	g_message ("pm_command_load_complete");
+	//g_message ("pm_command_load_complete");
 	
 	if (error != NULL)
 	{
@@ -98,7 +98,7 @@ pm_command_load_complete (AnjutaPmProject *project, AnjutaProjectNode *node, GEr
 		anjuta_project_node_clear_state (node, ANJUTA_PROJECT_LOADING | ANJUTA_PROJECT_INCOMPLETE);
 		anjuta_project_node_foreach (node, G_POST_ORDER, (AnjutaProjectNodeForeachFunc)on_pm_project_load_incomplete, project);
 
-		g_message ("emit node %p", node);
+		//g_message ("emit node %p", node);
 		if (!project->loaded && (project->incomplete_node == 0))
 		{
 			g_signal_emit (G_OBJECT (project), signals[LOADED], 0, node, NULL);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]