gnome-terminal r2588 - trunk/src

[chpe svn gnome org]

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

Log:
Remove more from terminal-widget.h.


Modified:
   trunk/src/skey-popup.c
   trunk/src/terminal-screen.c
   trunk/src/terminal-widget-vte.c
   trunk/src/terminal-widget.h

Modified: trunk/src/skey-popup.c
==============================================================================
--- trunk/src/skey-popup.c	(original)
+++ trunk/src/skey-popup.c	Thu May 29 19:36:16 2008
@@ -194,12 +194,11 @@
       response = skey (hash, seq, seed, password);
       if (response)
 	{
-	  terminal_widget_write_data_to_child (terminal_screen_get_widget (screen),
-					       response,
-					       strlen (response));
-	  terminal_widget_write_data_to_child (terminal_screen_get_widget (screen),
-					       "\n",
-					       strlen ("\n"));
+          VteTerminal *vte_terminal = VTE_TERMINAL (screen);
+          static const char newline[2] = "\n";
+
+	  vte_terminal_feed_child (vte_terminal, response, strlen (response));
+          vte_terminal_feed_child (vte_terminal, newline, strlen (newline));
 	  free (response);
 	}
     }

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:36:16 2008
@@ -1895,8 +1895,7 @@
 	 * to perform the correct conversion.
          */
         if (str && *str)
-	  terminal_widget_write_data_to_child (priv->term,
-					       str, strlen (str));
+          vte_terminal_feed_child (VTE_TERMINAL (screen), str, strlen (str));
         g_free (str);
       }
       break;
@@ -1913,9 +1912,10 @@
           }
         
         /* FIXME just brazenly ignoring encoding issues... */
-        terminal_widget_write_data_to_child (priv->term,
-                                             selection_data->data,
-                                             selection_data->length);
+        /* FIXMEchpe: just use the text conversion routines in gtk! */
+        vte_terminal_feed_child (VTE_TERMINAL (screen),
+                                 selection_data->data,
+                                 selection_data->length);
       }
       break;
       
@@ -2000,12 +2000,10 @@
          * child some UTF-8
          */
         if (filename)
-          terminal_widget_write_data_to_child (priv->term,
-                                               filename, strlen (filename));
+          vte_terminal_feed_child (VTE_TERMINAL (screen),
+                                   filename, strlen (filename));
         else
-          terminal_widget_write_data_to_child (priv->term,
-                                               str->str,
-                                               str->len);
+          vte_terminal_feed_child (VTE_TERMINAL (screen), str->str, str->len);
 
         g_free (filename);        
         g_string_free (str, TRUE);
@@ -2061,8 +2059,7 @@
             char *flat;
             
             flat = g_strjoinv (" ", uris);
-            terminal_widget_write_data_to_child (priv->term,
-                                                 flat, strlen (flat));
+            vte_terminal_feed_child (VTE_TERMINAL (screen), flat, strlen (flat));
             g_free (flat);
           }
 

Modified: trunk/src/terminal-widget-vte.c
==============================================================================
--- trunk/src/terminal-widget-vte.c	(original)
+++ trunk/src/terminal-widget-vte.c	Thu May 29 19:36:16 2008
@@ -74,11 +74,3 @@
 
   return TRUE;
 }
-
-void
-terminal_widget_write_data_to_child (GtkWidget  *widget,
-                                     const char *data,
-                                     int         len)
-{
-  vte_terminal_feed_child(VTE_TERMINAL(widget), data, len);
-}

Modified: trunk/src/terminal-widget.h
==============================================================================
--- trunk/src/terminal-widget.h	(original)
+++ trunk/src/terminal-widget.h	Thu May 29 19:36:16 2008
@@ -37,11 +37,6 @@
  *
  */
 
-
-void       terminal_widget_set_colors                 (GtkWidget            *widget,
-                                                       const GdkColor       *foreground,
-                                                       const GdkColor       *background,
-                                                       const GdkColor       *palette_entries);
 void terminal_widget_connect_child_died            (GtkWidget *widget,
                                                     GCallback  callback,
                                                     void      *data);
@@ -59,10 +54,6 @@
                                             int         *child_pid,
                                             GError     **err);
 
-void terminal_widget_write_data_to_child (GtkWidget  *widget,
-                                          const char *data,
-                                          int         len);
-
 G_END_DECLS
 
 #endif /* TERMINAL_WIDGET_H */