gnome-terminal r2590 - trunk/src

[chpe svn gnome org]

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

Log:
Remove terminal_screen_get_widget.


Modified:
   trunk/src/terminal-screen.c
   trunk/src/terminal-screen.h
   trunk/src/terminal-window.c

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Thu May 29 19:36:27 2008
@@ -1027,13 +1027,6 @@
   return (const char**) screen->priv->override_command;
 }
 
-
-GtkWidget*
-terminal_screen_get_widget (TerminalScreen *screen)
-{
-  return screen->priv->term;
-}
-
 static void
 show_command_error_dialog (TerminalScreen *screen,
                            GError         *error)

Modified: trunk/src/terminal-screen.h
==============================================================================
--- trunk/src/terminal-screen.h	(original)
+++ trunk/src/terminal-screen.h	Thu May 29 19:36:27 2008
@@ -80,10 +80,6 @@
                                                    char           **argv);
 const char** terminal_screen_get_override_command (TerminalScreen  *screen);
 
-
-
-GtkWidget* terminal_screen_get_widget (TerminalScreen *screen);
-
 void terminal_screen_launch_child (TerminalScreen *screen);
 
 const char* terminal_screen_get_title          (TerminalScreen *screen);

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu May 29 19:36:27 2008
@@ -914,7 +914,7 @@
   
   remove_popup_info (window);
 
-  if (!GTK_WIDGET_REALIZED (terminal_screen_get_widget (info->screen)))
+  if (!GTK_WIDGET_REALIZED (info->screen))
     {
       terminal_screen_popup_info_unref (info);
       return;
@@ -1787,7 +1787,7 @@
 
   /* be sure our geometry is up-to-date */
   terminal_window_update_geometry (window);
-  widget = terminal_screen_get_widget (screen);
+  widget = GTK_WIDGET (screen);
   
   app = gtk_widget_get_toplevel (widget);
   g_assert (app != NULL);
@@ -1850,12 +1850,10 @@
    */
   if (priv->active_term)
   {
-    GtkWidget *old_widget;
-    old_widget = terminal_screen_get_widget (priv->active_term);
-    gtk_widget_hide (old_widget); /* FIXMEchpe */
+    gtk_widget_hide (GTK_WIDGET (priv->active_term)); /* FIXMEchpe */
   }
   
-  widget = terminal_screen_get_widget (screen);
+  widget = GTK_WIDGET (screen);
   
   /* Make sure that the widget is no longer hidden due to the workaround */
   gtk_widget_show (widget);
@@ -1944,7 +1942,6 @@
 {
   TerminalWindowPrivate *priv = window->priv;
   TerminalScreen *screen;
-  GtkWidget *term;
 
   screen = terminal_screen_container_get_screen (container);
 
@@ -1981,12 +1978,11 @@
 
   update_tab_visibility (window, 0);
 
-  term = terminal_screen_get_widget (screen);
-
   /* ZvtTerm is a broken POS and requires this realize to get
    * the size request right.
    */
-  gtk_widget_realize (GTK_WIDGET (term));
+  /* FIXMEchpe: does this apply to VTE? */
+  gtk_widget_realize (GTK_WIDGET (screen));
 
   /* If we have an active screen, match its size and zoom */
   if (priv->active_term)
@@ -2092,16 +2088,16 @@
 terminal_window_update_geometry (TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
+  GtkWidget *widget;
   GdkGeometry hints;
-  GtkWidget *widget;  
   int char_width;
   int char_height;
   
   if (priv->active_term == NULL)
     return;
-  
-  widget = terminal_screen_get_widget (priv->active_term);
-  
+
+  widget = GTK_WIDGET (priv->active_term);
+
   /* We set geometry hints from the active term; best thing
    * I can think of to do. Other option would be to try to
    * get some kind of union of all hints from all terms in the