[Xfce4-commits] <terminal:master> Check the tab-activity-color too.

[Nick Schermer]

Updating branch refs/heads/master
         to 36602dee475921c3e46e6b3c646cebb2a0f710d5 (commit)
       from a636c09a2c02a638d6258150ac1054b735397773 (commit)

commit 36602dee475921c3e46e6b3c646cebb2a0f710d5
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Dec 6 20:01:57 2009 +0100

    Check the tab-activity-color too.

 terminal/terminal-screen.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 9600073..047a2cd 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1113,6 +1113,7 @@ terminal_screen_vte_window_contents_changed (VteTerminal    *terminal,
 {
   guint    timeout;
   GdkColor color;
+  gboolean has_fg;
 
   terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
   terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
@@ -1131,8 +1132,8 @@ terminal_screen_vte_window_contents_changed (VteTerminal    *terminal,
     return;
 
   /* set label color */
-  terminal_preferences_get_color (screen->preferences, "tab-activity-color", &color);
-  gtk_widget_modify_fg (screen->tab_label, GTK_STATE_ACTIVE, &color);
+  has_fg = terminal_preferences_get_color (screen->preferences, "tab-activity-color", &color);
+  gtk_widget_modify_fg (screen->tab_label, GTK_STATE_ACTIVE, has_fg ? &color : NULL);
 
   /* stop running reset timeout */
   if (screen->activity_timeout_id != 0)