From a0363ab8f7e0679d74f400a18facd4fa036ddfa9 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Wed, 14 Mar 2007 22:51:23 +0000 Subject: [PATCH] 2007-03-14 [wwp] 2.8.1cvs11 * src/gtk/logwindow.h Complete 2.8.1cvs10. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/logwindow.h | 7 ++++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c21f4f13..fc10a14d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-14 [wwp] 2.8.1cvs11 + + * src/gtk/logwindow.h + Complete 2.8.1cvs10. + 2007-03-14 [colin] 2.8.1cvs10 * src/gtk/logwindow.c diff --git a/PATCHSETS b/PATCHSETS index 9b5bc4d20..7a2a26ba3 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2427,3 +2427,4 @@ ( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/wizard.c; ) > 2.8.1cvs8.patchset ( cvs diff -u -r 1.115.2.141 -r 1.115.2.142 src/main.c; ) > 2.8.1cvs9.patchset ( cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/gtk/logwindow.c; ) > 2.8.1cvs10.patchset +( cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/logwindow.h; ) > 2.8.1cvs11.patchset diff --git a/configure.ac b/configure.ac index d1009c299..1de1ad9d0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=10 +EXTRA_VERSION=11 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/logwindow.h b/src/gtk/logwindow.h index 461e920a9..09d86770b 100644 --- a/src/gtk/logwindow.h +++ b/src/gtk/logwindow.h @@ -23,6 +23,8 @@ #include #include +#include "log.h" + typedef struct _LogWindow LogWindow; struct _LogWindow @@ -36,6 +38,8 @@ struct _LogWindow GdkColor error_color; GdkColor in_color; GdkColor out_color; + GdkColor status_ok_color; + GdkColor status_nok_color; gboolean clip; guint clip_length; @@ -44,9 +48,10 @@ struct _LogWindow GtkTextTag *error_tag; GtkTextMark *end_mark; gboolean hidden; + gboolean never_shown; }; -LogWindow *log_window_create(void); +LogWindow *log_window_create(LogInstance instance); void log_window_init(LogWindow *logwin); void log_window_show(LogWindow *logwin); void log_window_show_error(LogWindow *logwin); -- 2.25.1