[Xfce4-commits] r30083 - terminal/branches/xfce_4_6/terminal

[Nick Schermer]

Author: nick
Date: 2009-06-27 19:21:52 +0000 (Sat, 27 Jun 2009)
New Revision: 30083

Modified:
   terminal/branches/xfce_4_6/terminal/terminal-screen.c
Log:
Don't set contents change on resize (bug #5443).


Modified: terminal/branches/xfce_4_6/terminal/terminal-screen.c
===================================================================
--- terminal/branches/xfce_4_6/terminal/terminal-screen.c	2009-06-27 19:18:55 UTC (rev 30082)
+++ terminal/branches/xfce_4_6/terminal/terminal-screen.c	2009-06-27 19:21:52 UTC (rev 30083)
@@ -36,6 +36,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
 
 #include <terminal/terminal-dialogs.h>
 #include <terminal/terminal-enum-types.h>
@@ -145,6 +148,7 @@
   
   gboolean             activity;
   guint                reset_activity_cb;
+  time_t               last_size_change;
 };
 
 
@@ -237,6 +241,7 @@
 {
   screen->working_directory = g_get_current_dir ();
   screen->custom_title = g_strdup ("");
+  screen->last_size_change = 0;
 
   screen->terminal = terminal_widget_new ();
   g_object_connect (G_OBJECT (screen->terminal),
@@ -895,6 +900,8 @@
   _terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
   _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
+  if (time (NULL) - screen->last_size_change <= 1)
+    return;
   if (terminal_window_is_screen_active (screen))
     return;
 
@@ -983,6 +990,8 @@
 #endif
     }
 
+  screen->last_size_change = time (NULL);
+
   GDK_THREADS_LEAVE ();
 
   return FALSE;