sync with 0.8.1cvs3

diff --git a/ChangeLog b/ChangeLog
index e98a52a7f29a04cd7684e00c72c7a279db16dfcf..ccc374cfa34b9c018cbe7c83250b159f76317bca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-29
+
+       * src/logwindow.c: freeze GtkText widget while hidden.
+         log_window_append(): changed the header for message and warning.
+

 2002-07-26
 
        * src/news.c: implement automatic cache expiration.
 2002-07-26
 
        * src/news.c: implement automatic cache expiration.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index bb5512ff468e82aea1ae26ecfc171aa6ac168d94..34246266bb3d3ee41f582aa3bd63f9f1435815ca 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-07-29 [paul]      0.8.0claws24
+
+       * sync with 0.8.1cvs3
+               see ChangeLog 2002-07-29
+

 2002-07-27 [christoph] 0.8.0claws23
 
        * src/folder.c
 2002-07-27 [christoph] 0.8.0claws23
 
        * src/folder.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index a065463a9afeb84610d224a4707573ff7a57c345..dbc114cc3111dc627658c7dcdf5238f3a5deac1e 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2002-07-29
+
+       * src/logwindow.c: ±£¤·¤Æ¤¤¤ë¤È¤­¤Ï GtkText ¥¦¥£¥¸¥§¥Ã¥È¤ò¥Õ¥ê¡¼¥º¡£
+         log_window_append(): ¥á¥Ã¥»¡¼¥¸¤È·Ù¹ð¤Î¥Ø¥Ã¥À¤òÊѹ¹¡£
+

 2002-07-26
 
        * src/news.c: ¼«Æ°¥­¥ã¥Ã¥·¥åºï½ü¤ò¼ÂÁõ¡£
 2002-07-26
 
        * src/news.c: ¼«Æ°¥­¥ã¥Ã¥·¥åºï½ü¤ò¼ÂÁõ¡£

diff --git a/configure.in b/configure.in
index 703b1bd8395ecc07f25cdbd0233f9a46cae8c9ad..1d3562dcf872599a7202ea623c3e0b9816e7b41c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws23
+EXTRA_VERSION=claws24

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/logwindow.c b/src/logwindow.c
index 39ce93654903ab92ec6c235d6331737fb6370814..98298298486eb590dccb89e51edb225996445f68 100644 (file)
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -38,8 +38,11 @@
 
 static LogWindow *logwindow;
 
 
 static LogWindow *logwindow;
 

-static void key_pressed(GtkWidget *widget, GdkEventKey *event,
-                       LogWindow *logwin);
+static void hide_cb    (GtkWidget      *widget,
+                        LogWindow      *logwin);
+static void key_pressed        (GtkWidget      *widget,
+                        GdkEventKey    *event,
+                        LogWindow      *logwin);

 void log_window_clear(GtkWidget *text);
 
 LogWindow *log_window_create(void)
 void log_window_clear(GtkWidget *text);
 
 LogWindow *log_window_create(void)


@@ -49,7 +52,7 @@ LogWindow *log_window_create(void)
        GtkWidget *scrolledwin;
        GtkWidget *text;
 
        GtkWidget *scrolledwin;
        GtkWidget *text;
 

-       debug_print(_("Creating log window...\n"));
+       debug_print("Creating log window...\n");

        logwin = g_new0(LogWindow, 1);
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        logwin = g_new0(LogWindow, 1);
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);


@@ -61,6 +64,8 @@ LogWindow *log_window_create(void)
                           GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
                           GTK_SIGNAL_FUNC(key_pressed), logwin);
                           GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
                           GTK_SIGNAL_FUNC(key_pressed), logwin);

+       gtk_signal_connect(GTK_OBJECT(window), "hide",
+                          GTK_SIGNAL_FUNC(hide_cb), logwin);

        gtk_widget_realize(window);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_realize(window);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);


@@ -75,6 +80,7 @@ LogWindow *log_window_create(void)
                            (GTK_SCROLLED_WINDOW(scrolledwin)));
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
        gtk_widget_show(text);
                            (GTK_SCROLLED_WINDOW(scrolledwin)));
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
        gtk_widget_show(text);

+       gtk_text_freeze(GTK_TEXT(text));

 
        logwin->window = window;
        logwin->scrolledwin = scrolledwin;
 
        logwin->window = window;
        logwin->scrolledwin = scrolledwin;


@@ -117,7 +123,14 @@ void log_window_init(LogWindow *logwin)
 
 void log_window_show(LogWindow *logwin)
 {
 
 void log_window_show(LogWindow *logwin)
 {

+       GtkText *text = GTK_TEXT(logwin->text);
+

        gtk_widget_hide(logwin->window);
        gtk_widget_hide(logwin->window);

+
+       gtk_text_thaw(text);
+       text->vadj->value = text->vadj->upper - text->vadj->page_size;
+       gtk_signal_emit_by_name(GTK_OBJECT(text->vadj), "value_changed");
+

        gtk_widget_show(logwin->window);
 }
 
        gtk_widget_show(logwin->window);
 }
 


@@ -132,17 +145,18 @@ void log_window_append(const gchar *str, LogType type)
        text = GTK_TEXT(logwindow->text);
 
        switch (type) {
        text = GTK_TEXT(logwindow->text);
 
        switch (type) {

+       case LOG_MSG:
+               color = &logwindow->msg_color;
+               head = "* ";
+               break;

        case LOG_WARN:
                color = &logwindow->warn_color;
        case LOG_WARN:
                color = &logwindow->warn_color;

-               head = "*** ";
+               head = "** ";

                break;
        case LOG_ERROR:
                color = &logwindow->error_color;
                head = "*** ";
                break;
                break;
        case LOG_ERROR:
                color = &logwindow->error_color;
                head = "*** ";
                break;

-       case LOG_MSG:
-               color = &logwindow->msg_color;
-               break;

        default:
                break;
        }
        default:
                break;
        }


@@ -153,6 +167,12 @@ void log_window_append(const gchar *str, LogType type)
               log_window_clear (GTK_WIDGET (text));
 }
 
               log_window_clear (GTK_WIDGET (text));
 }
 

+static void hide_cb(GtkWidget *widget, LogWindow *logwin)
+{
+       if (GTK_TEXT(logwin->text)->freeze_count == 0)
+               gtk_text_freeze(GTK_TEXT(logwin->text));
+}
+

 static void key_pressed(GtkWidget *widget, GdkEventKey *event,
                        LogWindow *logwin)
 {
 static void key_pressed(GtkWidget *widget, GdkEventKey *event,
                        LogWindow *logwin)
 {