gnome-terminal r2458 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Mar 19 15:21:38 2008
New Revision: 2458
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2458&view=rev

Log:
Remove terminal_window_get_screen_count.


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

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Wed Mar 19 15:21:38 2008
@@ -840,8 +840,8 @@
   TerminalWindowPrivate *priv = window->priv;
 
   /* Unref the event from idle since we still need it
-    * from the action callbacks which will run before idle.
-    */
+   * from the action callbacks which will run before idle.
+   */
   if (priv->remove_popup_info_idle == 0 &&
       priv->popup_info != NULL)
     {
@@ -1789,13 +1789,6 @@
   return gtk_container_get_children (GTK_CONTAINER (priv->notebook));
 }
 
-int
-terminal_window_get_screen_count (TerminalWindow *window)
-{
-  TerminalWindowPrivate *priv = window->priv;
-  return priv->terms;
-}
-
 void
 terminal_window_set_menubar_visible (TerminalWindow *window,
                                      gboolean        setting)
@@ -2151,13 +2144,14 @@
   update_tab_sensitivity (window);
   update_tab_visibility (window, 0);
 
-  pages = terminal_window_get_screen_count (window);
+  pages = priv->terms;
   if (pages == 1)
     {
       terminal_window_set_size (window, priv->active_term, TRUE);
     }
   else if (pages == 0)
     {
+      /* FIXMEchpe!!! DO NOT DO THIS FROM THIS CALLBACK !!!!!!! */
       gtk_widget_destroy (GTK_WIDGET (window));
     }
 }

Modified: trunk/src/terminal-window.h
==============================================================================
--- trunk/src/terminal-window.h	(original)
+++ trunk/src/terminal-window.h	Wed Mar 19 15:21:38 2008
@@ -78,7 +78,6 @@
 
 /* In order of their tabs in the notebook */
 GList* terminal_window_list_screens (TerminalWindow *window);
-int    terminal_window_get_screen_count (TerminalWindow *window);
 
 void terminal_window_update_icon      (TerminalWindow *window);
 void terminal_window_update_geometry  (TerminalWindow *window);