gnome-terminal r2589 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:36:21 2008
New Revision: 2589
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2589&view=rev

Log:
Remove last vestiges of terminal-widget.h and terminal-widget-vte.c.


Removed:
   trunk/src/terminal-widget-vte.c
   trunk/src/terminal-widget.h
Modified:
   trunk/src/Makefile.am
   trunk/src/terminal-screen.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu May 29 19:36:21 2008
@@ -43,8 +43,6 @@
 	terminal-tabs-menu.h			\
 	terminal-type-builtins.c		\
 	terminal-type-builtins.h		\
-	terminal-widget.h			\
-	terminal-widget-vte.c			\
 	terminal-window.c			\
 	terminal-window.h			\
 	$(NULL)

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:36:21 2008
@@ -388,9 +388,9 @@
                     G_CALLBACK (terminal_screen_icon_title_changed),
                     screen);
 
-  terminal_widget_connect_child_died (priv->term,
-                                      G_CALLBACK (terminal_screen_widget_child_died),
-                                      screen);
+  g_signal_connect (screen, "child-exited",
+                    G_CALLBACK (terminal_screen_widget_child_died),
+                    screen);
 
   connect_monospace_font_change (screen);
 
@@ -1284,6 +1284,8 @@
   char  *path;
   char **argv;
   GError *err;
+  gboolean update_records;
+  
   
   profile = priv->profile;
 
@@ -1297,21 +1299,22 @@
   
   env = get_child_environment (priv->term, screen);  
 
-  err = NULL;
-  if (!terminal_widget_fork_command (priv->term,
-                                     terminal_profile_get_login_shell (profile),
-                                     terminal_profile_get_update_records (profile),
-                                     path,
-                                     argv,
-                                     env,
-                                     terminal_screen_get_working_dir (screen),
-                                     &priv->child_pid,
-                                     &err))
+  update_records = terminal_profile_get_update_records (profile);
+
+  priv->child_pid = vte_terminal_fork_command (VTE_TERMINAL (screen),
+                                               path,
+                                               argv,
+                                               env,
+                                               terminal_screen_get_working_dir (screen),
+                                               terminal_profile_get_login_shell (profile),
+                                               update_records,
+                                               update_records);
+
+  if (priv->child_pid == -1)
     {
 
       terminal_util_show_error_dialog ((GtkWindow*) gtk_widget_get_ancestor (priv->term, GTK_TYPE_WINDOW), NULL,
-                                       "%s", err->message);
-      g_error_free (err);
+                                       "%s", _("There was an error creating the child process for this terminal"));
     }
   
   g_free (path);