anjuta r4052 - in trunk: . plugins/build-basic-autotools plugins/debug-manager plugins/run-program

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Sat Jul  5 12:32:49 2008
New Revision: 4052
URL: http://svn.gnome.org/viewvc/anjuta?rev=4052&view=rev

Log:
	* plugins/debug-manager/start.c,
	plugins/build-basic-autotools/build-basic-autotools.c,
	plugins/run-program/plugin.c,
	plugins/run-program/plugin.h:
	Fix bug #538217: Run in terminal option isn't remembered
	Fix bug: Debugger sources directories isn't remembered neither


Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/build-basic-autotools.c
   trunk/plugins/debug-manager/start.c
   trunk/plugins/run-program/plugin.c
   trunk/plugins/run-program/plugin.h

Modified: trunk/plugins/build-basic-autotools/build-basic-autotools.c
==============================================================================
--- trunk/plugins/build-basic-autotools/build-basic-autotools.c	(original)
+++ trunk/plugins/build-basic-autotools/build-basic-autotools.c	Sat Jul  5 12:32:49 2008
@@ -1944,16 +1944,6 @@
 {
 	if (phase != ANJUTA_SESSION_PHASE_NORMAL)
 		return;
-	if (plugin->program_args)
-		anjuta_session_set_string (session, "Execution",
-								   "Program arguments", plugin->program_args);
-	anjuta_session_set_int (session, "Execution", "Run in terminal",
-							plugin->run_in_terminal + 1);
-	if (plugin->last_exec_uri)
-	{
-		anjuta_session_set_string (session, "Execution",
-								   "Last selected uri", plugin->last_exec_uri);
-	}		
 	
 	if (plugin->configure_args)
 		anjuta_session_set_string (session, "Build",
@@ -1965,20 +1955,11 @@
 on_session_load (AnjutaShell *shell, AnjutaSessionPhase phase,
 				 AnjutaSession *session, BasicAutotoolsPlugin *plugin)
 {
-	gchar *program_args, *configure_args, *last_uri;
-	gint run_in_terminal;
+	gchar *configure_args;
 				
 	if (phase != ANJUTA_SESSION_PHASE_NORMAL)
 		return;
 	
-	program_args = anjuta_session_get_string (session, "Execution",
-											  "Program arguments");
-	if (program_args)
-	{
-		g_free (plugin->program_args);
-		plugin->program_args = program_args;
-	}
-	
 	configure_args = anjuta_session_get_string (session, "Build",
 											  "Configure parameters");
 	if (configure_args)
@@ -1986,22 +1967,6 @@
 		g_free (plugin->configure_args);
 		plugin->configure_args = configure_args;
 	}
-	
-	last_uri = anjuta_session_get_string (session, "Execution",
-								   "Last selected uri");
-	
-	if (last_uri)
-	{
-		plugin->last_exec_uri = last_uri;
-	}
-	
-	/* The flag is store as 1 == FALSE, 2 == TRUE */
-	run_in_terminal =
-		anjuta_session_get_int (session, "Execution", "Run in terminal");
-	run_in_terminal--;
-	
-	if (run_in_terminal >= 0)
-		plugin->run_in_terminal = run_in_terminal;
 }
 
 static void

Modified: trunk/plugins/debug-manager/start.c
==============================================================================
--- trunk/plugins/debug-manager/start.c	(original)
+++ trunk/plugins/debug-manager/start.c	Sat Jul  5 12:32:49 2008
@@ -242,6 +242,7 @@
 	if (phase != ANJUTA_SESSION_PHASE_NORMAL)
 		return;
 
+	anjuta_session_set_string_list (session, "Debugger", "Source directories", self->source_dirs);
 	anjuta_session_set_int (session, "Debugger", "Stop at beginning", self->stop_at_beginning + 1);
 }
 
@@ -252,6 +253,14 @@
 	if (phase != ANJUTA_SESSION_PHASE_NORMAL)
 		return;
 
+	/* Initialize source_dirs */
+ 	if (self->source_dirs != NULL)
+	{		
+ 		g_list_foreach (self->source_dirs, (GFunc)g_free, NULL);
+ 		g_list_free (self->source_dirs);
+ 	}
+ 	self->source_dirs = anjuta_session_get_string_list (session, "Debugger", "Source directories");
+
 	stop_at_beginning = anjuta_session_get_int (session, "Debugger", "Stop at beginning");
 	if (stop_at_beginning == 0)
 		self->stop_at_beginning = TRUE;	/* Default value */

Modified: trunk/plugins/run-program/plugin.c
==============================================================================
--- trunk/plugins/run-program/plugin.c	(original)
+++ trunk/plugins/run-program/plugin.c	Sat Jul  5 12:32:49 2008
@@ -120,12 +120,11 @@
 	if (phase != ANJUTA_SESSION_PHASE_NORMAL)
 		return;
 
-	anjuta_session_set_limited_string_list (session, "Debugger", "Program arguments", &self->recent_args);
-	anjuta_session_set_limited_string_list (session, "Debugger", "Program uri", &self->recent_target);
+	anjuta_session_set_limited_string_list (session, "Execution", "Program arguments", &self->recent_args);
+	anjuta_session_set_limited_string_list (session, "Execution", "Program uri", &self->recent_target);
 	anjuta_session_set_int (session, "Execution", "Run in terminal", self->run_in_terminal + 1);
-	anjuta_session_set_string_list (session, "Debugger", "Source directories", self->source_dirs);
-	anjuta_session_set_string_list (session, "Debugger", "Working directories", self->recent_dirs);
-	anjuta_session_set_strv (session, "Debugger", "Environment variables", self->environment_vars);
+	anjuta_session_set_string_list (session, "Execution", "Working directories", self->recent_dirs);
+	anjuta_session_set_strv (session, "Execution", "Environment variables", self->environment_vars);
 }
 
 static void on_session_load (AnjutaShell *shell, AnjutaSessionPhase phase, AnjutaSession *session, RunProgramPlugin *self)
@@ -140,14 +139,14 @@
  		g_list_foreach (self->recent_args, (GFunc)g_free, NULL);
  		g_list_free (self->recent_args);
  	}
- 	self->recent_args = anjuta_session_get_string_list (session, "Debugger", "Program arguments");
+ 	self->recent_args = anjuta_session_get_string_list (session, "Execution", "Program arguments");
 
  	if (self->recent_target != NULL)
  	{		
  		g_list_foreach (self->recent_target, (GFunc)g_free, NULL);
  		g_list_free (self->recent_target);
  	}
- 	self->recent_target = anjuta_session_get_string_list (session, "Debugger", "Program uri");
+ 	self->recent_target = anjuta_session_get_string_list (session, "Execution", "Program uri");
 	
 	/* The flag is store as 1 == FALSE, 2 == TRUE */
 	run_in_terminal = anjuta_session_get_int (session, "Execution", "Run in terminal");
@@ -156,23 +155,15 @@
 	else
 		self->run_in_terminal = run_in_terminal - 1;
 	
-	/* Initialize source_dirs */
- 	if (self->source_dirs != NULL)
- 	{		
- 		g_list_foreach (self->source_dirs, (GFunc)g_free, NULL);
- 		g_list_free (self->source_dirs);
- 	}
- 	self->source_dirs = anjuta_session_get_string_list (session, "Debugger", "Source directories");
-	
  	if (self->recent_dirs != NULL)
  	{		
  		g_list_foreach (self->recent_dirs, (GFunc)g_free, NULL);
  		g_list_free (self->recent_dirs);
  	}
- 	self->recent_dirs = anjuta_session_get_string_list (session, "Debugger", "Working directories");
+ 	self->recent_dirs = anjuta_session_get_string_list (session, "Execution", "Working directories");
 
 	g_strfreev (self->environment_vars);
- 	self->environment_vars = anjuta_session_get_strv (session, "Debugger", "Environment variables");
+ 	self->environment_vars = anjuta_session_get_strv (session, "Execution", "Environment variables");
 	
 	run_plugin_update_shell_value (self);
 }
@@ -313,7 +304,6 @@
 {
 	RunProgramPlugin *self = ANJUTA_PLUGIN_RUN_PROGRAM (obj);
 	
-	self->source_dirs = NULL;
 	self->recent_target = NULL;
 	self->recent_args = NULL;
 	self->recent_dirs = NULL;
@@ -343,8 +333,6 @@
 {
 	RunProgramPlugin *self = ANJUTA_PLUGIN_RUN_PROGRAM (obj);
 	
-	g_list_foreach (self->source_dirs, (GFunc)g_free, NULL);
-	g_list_free (self->source_dirs);
 	g_list_foreach (self->recent_target, (GFunc)g_free, NULL);
 	g_list_free (self->recent_target);
 	g_list_foreach (self->recent_args, (GFunc)g_free, NULL);

Modified: trunk/plugins/run-program/plugin.h
==============================================================================
--- trunk/plugins/run-program/plugin.h	(original)
+++ trunk/plugins/run-program/plugin.h	Sat Jul  5 12:32:49 2008
@@ -53,7 +53,6 @@
 	
 	/* Save data */
 	gboolean run_in_terminal;
- 	GList *source_dirs;
 	gchar **environment_vars;
 	GList *recent_target;
 	GList *recent_dirs;