SF.net SVN: geany:[2855] trunk

[eht16 at users.sourceforge.net]

Revision: 2855
          http://geany.svn.sourceforge.net/geany/?rev=2855&view=rev
Author:   eht16
Date:     2008-08-05 08:52:59 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
Revert the recent VTE realisation changes as they don't make things better.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/vte.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-08-04 14:10:16 UTC (rev 2854)
+++ trunk/ChangeLog	2008-08-05 08:52:59 UTC (rev 2855)
@@ -1,3 +1,10 @@
+2008-08-05  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/vte.c:
+   Revert the recent VTE realisation changes as they don't make things
+   better.
+
+
 2008-08-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/vte.c:

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2008-08-04 14:10:16 UTC (rev 2854)
+++ trunk/src/vte.c	2008-08-05 08:52:59 UTC (rev 2855)
@@ -288,12 +288,13 @@
 	g_signal_connect(vte, "motion-notify-event", G_CALLBACK(on_motion_event), NULL);
 	g_signal_connect(vte, "drag-data-received", G_CALLBACK(vte_drag_data_received), NULL);
 
+	vte_start(vte);
+
 	gtk_widget_show_all(frame);
 	gtk_notebook_insert_page(GTK_NOTEBOOK(msgwindow.notebook), frame, gtk_label_new(_("Terminal")), MSG_VTE);
 
 	/* the vte widget has to be realised before color changes take effect */
 	g_signal_connect_after(vte, "realize", G_CALLBACK(vte_apply_user_settings), NULL);
-	gtk_widget_realize(vte);
 }
 
 
@@ -442,8 +443,6 @@
 	if (! ui_prefs.msgwindow_visible)
 		return;
 
-	geany_debug("VTE widget realized"); /* temporary :) */
-
 	vf->vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->vte), vc->scrollback_lines);
 	vf->vte_terminal_set_scroll_on_keystroke(VTE_TERMINAL(vc->vte), vc->scroll_on_key);
 	vf->vte_terminal_set_scroll_on_output(VTE_TERMINAL(vc->vte), vc->scroll_on_out);
@@ -453,9 +452,6 @@
 	vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), vc->colour_back);
 
 	override_menu_key();
-
-	if (pid == 0)
-		vte_start(vc->vte);
 }
 
 
@@ -558,37 +554,12 @@
 }
 
 
-static gboolean vte_send_cmd_cb(gpointer data)
-{
-	gchar *cmd = data;
-	if (! vte_send_cmd(cmd))
-	{
-		ui_set_statusbar(FALSE,
-	_("Could not execute the command \"%s\" in the VTE because it probably contains a command."),
-		cmd);
-	}
-	g_free(data);
-
-	return FALSE;
-}
-
 /* if the command could be executed, TRUE is returned, FALSE otherwise (i.e. there was some text
  * on the prompt). */
 gboolean vte_send_cmd(const gchar *cmd)
 {
 	if (clean)
 	{
-		/* the shell is started once the widget is realized but it might happen we send commands
-		 * before this happened, so start it manually */
-		if (! GTK_WIDGET_REALIZED(vc->vte))
-		{
-			gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_VTE);
-			/* wait until the notebook page has been switched which will realize the widget
-			 * implicitly, after this has been done the idle function willsend the command */
-			g_idle_add(vte_send_cmd_cb, g_strdup(cmd));
-			return TRUE;
-		}
-
 		vf->vte_terminal_feed_child(VTE_TERMINAL(vc->vte), cmd, strlen(cmd));
 		clean = TRUE; /* vte_terminal_feed_child() also marks the vte as not clean */
 		return TRUE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.