anjuta r3767 - in branches/anjuta-2-4: . plugins/build-basic-autotools

[jhs svn gnome org]

Author: jhs
Date: Tue Mar 11 14:08:02 2008
New Revision: 3767
URL: http://svn.gnome.org/viewvc/anjuta?rev=3767&view=rev

Log:
2008-03-11  Johannes Schmid  <jhs idefix>

	Patch by Rob Bradford:
	* plugins/build-basic-autotools/executer.c (execute_program):
	520324 â Execute command is not overridable

Modified:
   branches/anjuta-2-4/ChangeLog
   branches/anjuta-2-4/plugins/build-basic-autotools/executer.c

Modified: branches/anjuta-2-4/plugins/build-basic-autotools/executer.c
==============================================================================
--- branches/anjuta-2-4/plugins/build-basic-autotools/executer.c	(original)
+++ branches/anjuta-2-4/plugins/build-basic-autotools/executer.c	Tue Mar 11 14:08:02 2008
@@ -393,21 +393,35 @@
 										   IAnjutaTerminal, NULL);
 		if (term)
 		{
-			gchar* prog_path = g_find_program_in_path("anjuta_launcher");
 			
-			if (prog_path != NULL)
+
+			if (plugin->commands[IANJUTA_BUILDABLE_COMMAND_EXECUTE])
 			{
-				gchar* oldcmd = cmd;
-			
-				cmd = g_strconcat ("anjuta_launcher ", oldcmd, NULL);
+				gchar *oldcmd = cmd;
+
+				cmd = g_strdup_printf (plugin->commands[IANJUTA_BUILDABLE_COMMAND_EXECUTE],
+					oldcmd);
+
 				g_free (oldcmd);
-				g_free (prog_path);
-			}
-			else
-			{
-				DEBUG_PRINT("Missing anjuta_launcher");
-			}
+			} else {
+				gchar* launcher_path = g_find_program_in_path("anjuta_launcher");
+
+				if (launcher_path != NULL)
+				{
+					gchar* oldcmd = cmd;
+				
+					cmd = g_strconcat ("anjuta_launcher ", oldcmd, NULL);
+
+					g_free (oldcmd);
+					g_free (launcher_path);
+				}
+				else
+				{
+					DEBUG_PRINT("Missing anjuta_launcher");
+				}
 				
+			}
+
 			ianjuta_terminal_execute_command (term, dir, cmd, NULL);
 		}
 		else