anjuta r3507 - in trunk: . plugins/build-basic-autotools plugins/terminal

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Sun Jan 20 16:39:01 2008
New Revision: 3507
URL: http://svn.gnome.org/viewvc/anjuta?rev=3507&view=rev

Log:
	* plugins/build-basic-autotools/executer.c:
	Fix #502508, use anjuta_launcher to keep program output

	* plugins/terminal/terminal.c:
	Remove unused child_initizlized member
	Start the shell on plugin activation


Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/executer.c
   trunk/plugins/terminal/terminal.c

Modified: trunk/plugins/build-basic-autotools/executer.c
==============================================================================
--- trunk/plugins/build-basic-autotools/executer.c	(original)
+++ trunk/plugins/build-basic-autotools/executer.c	Sun Jan 20 16:39:01 2008
@@ -393,6 +393,21 @@
 										   IAnjutaTerminal, NULL);
 		if (term)
 		{
+			gchar* prog_path = g_find_program_in_path("anjuta_launcher");
+			
+			if (prog_path != NULL)
+			{
+				gchar* oldcmd = cmd;
+			
+				cmd = g_strconcat ("anjuta_launcher ", oldcmd, NULL);
+				g_free (oldcmd);
+				g_free (prog_path);
+			}
+			else
+			{
+				DEBUG_PRINT("Missing anjuta_launcher");
+			}
+				
 			ianjuta_terminal_execute_command (term, dir, cmd, NULL);
 		}
 		else

Modified: trunk/plugins/terminal/terminal.c
==============================================================================
--- trunk/plugins/terminal/terminal.c	(original)
+++ trunk/plugins/terminal/terminal.c	Sun Jan 20 16:39:01 2008
@@ -89,7 +89,6 @@
 	GtkWidget *pref_profile_combo;
 	GtkWidget *pref_default_button;
 	GList *gconf_notify_ids;
-	gboolean child_initizlized;
 #if OLD_VTE == 1
 	gboolean first_time_realization;
 #endif
@@ -424,13 +423,9 @@
 terminal_focus_cb (GtkWidget *widget, GdkEvent  *event,
 				   TerminalPlugin *term) 
 {
-	if (term->child_pid > 0)
-		term->child_initizlized = TRUE;
-	
-	if (term->child_initizlized == FALSE)
+	if (term->child_pid == 0)
 	{
 		terminal_init_cb (widget, term);
-		term->child_initizlized = TRUE;
 	}
 	gtk_widget_grab_focus (widget);
 	return FALSE;
@@ -563,6 +558,8 @@
 	term_plugin->scrollbar = sb;
 	term_plugin->frame = frame;
 	term_plugin->hbox = hbox;
+
+	terminal_init_cb (GTK_WIDGET (term_plugin->term), term_plugin);
 }
 
 static void
@@ -637,7 +634,7 @@
 	term_plugin->term = NULL;
 	term_plugin->scrollbar = NULL;
 	term_plugin->hbox = NULL;
-	term_plugin->child_initizlized = FALSE;
+	term_plugin->child_pid = 0;
 #if OLD_VTE == 1
 	term_plugin->first_time_realization = TRUE;
 #endif
@@ -663,7 +660,7 @@
 {
 	TerminalPlugin *plugin = ANJUTA_PLUGIN_TERMINAL (obj);
 	plugin->gconf_notify_ids = NULL;
-	plugin->child_initizlized = FALSE;
+	plugin->child_pid = 0;
 	plugin->pref_profile_combo = NULL;
 #if OLD_VTE == 1
 	plugin->first_time_realization = TRUE;