gnome-terminal r2881 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Sun Jun  8 11:37:00 2008
New Revision: 2881
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2881&view=rev

Log:
Fix session saving. Bug #537215.


Modified:
   trunk/src/terminal-app.c
   trunk/src/terminal-tabs-menu.c
   trunk/src/terminal-window.c
   trunk/src/terminal-window.h

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Sun Jun  8 11:37:00 2008
@@ -29,6 +29,8 @@
 
 #include "terminal-app.h"
 #include "terminal-accels.h"
+#include "terminal-screen.h"
+#include "terminal-screen-container.h"
 #include "terminal-window.h"
 #include "terminal-util.h"
 #include "profile-editor.h"
@@ -1204,16 +1206,17 @@
 
       active_screen = terminal_window_get_active (window);
       
-      tabs = terminal_window_list_screens (window);
+      tabs = terminal_window_list_screen_containers (window);
 
       for (lt = tabs; lt != NULL; lt = lt->next)
         {
-          TerminalScreen *screen = lt->data;
+          TerminalScreen *screen;
           const char *profile_id;
           const char **override_command;
           const char *title;
           double zoom;
-          
+
+          screen = terminal_screen_container_get_screen (GTK_WIDGET (lt->data));
           profile_id = terminal_profile_get_property_string (terminal_screen_get_profile (screen),
                                                              TERMINAL_PROFILE_NAME);
           

Modified: trunk/src/terminal-tabs-menu.c
==============================================================================
--- trunk/src/terminal-tabs-menu.c	(original)
+++ trunk/src/terminal-tabs-menu.c	Sun Jun  8 11:37:00 2008
@@ -465,7 +465,7 @@
 
 	terminal_tabs_menu_clean (menu);
 
-	tabs = terminal_window_list_screens (p->window);
+	tabs = terminal_window_list_screen_containers (p->window);
 
 	n = g_list_length (tabs);
 	if (n == 0) return;

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Sun Jun  8 11:37:00 2008
@@ -1908,7 +1908,7 @@
 }
 
 GList*
-terminal_window_list_screens (TerminalWindow *window)
+terminal_window_list_screen_containers (TerminalWindow *window)
 {
   TerminalWindowPrivate *priv = window->priv;
   

Modified: trunk/src/terminal-window.h
==============================================================================
--- trunk/src/terminal-window.h	(original)
+++ trunk/src/terminal-window.h	Sun Jun  8 11:37:00 2008
@@ -79,8 +79,7 @@
                                                TerminalScreen *screen);
 TerminalScreen* terminal_window_get_active (TerminalWindow *window);
 
-/* In order of their tabs in the notebook */
-GList* terminal_window_list_screens (TerminalWindow *window);
+GList* terminal_window_list_screen_containers (TerminalWindow *window);
 
 void terminal_window_update_geometry  (TerminalWindow *window);
 void terminal_window_set_size         (TerminalWindow *window,