sync with 0.8.10cvs14

diff --git a/ChangeLog b/ChangeLog
index 48624205781de14ec721b12c496c50bb3666e0df..8fb508ba2b5e4e7517e62152ebb90f4a6659d047 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-02-18
+
+       * src/prefs_common.[ch]
+         src/sourcewindow.c: remember the size of source window.
+       * src/md5.c: fixed a compile problem with gcc 3.3.
+
+2003-02-17
+
+       * src/about.c: about_create(): modified the copyright notice.
+

 2003-02-17
 
        * src/colorlabel.c: don't use pixmaps for label color rect but draw
 2003-02-17
 
        * src/colorlabel.c: don't use pixmaps for label color rect but draw

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a1f3a0eb4671c21089ef10129fd712e4160cd1c2..950975ce5dafe3e892048e701664cb34fa351d5c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-18 [paul]      0.8.10claws19
+
+       * sync with 0.8.10cvs14
+               see ChangeLog 2003-02-18
+

 2003-02-17 [jens]       0.8.10claws18
 
         * src/common/md5.c
 2003-02-17 [jens]       0.8.10claws18
 
         * src/common/md5.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 98b0ba798d2f3f357ed8d8cd8dd5beaa496c32aa..9be1224289b91a02154311de9b6b32498e08455c 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,13 @@
+2003-02-18
+
+       * src/prefs_common.[ch]
+         src/sourcewindow.c: ¥½¡¼¥¹¥¦¥£¥ó¥É¥¦¤Î¥µ¥¤¥º¤òµ­²±¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/md5.c: gcc 3.1 ¤Ç¤Î¥³¥ó¥Ñ¥¤¥ë¤ÎÌäÂê¤ò½¤Àµ¡£
+
+2003-02-17
+
+       * src/about.c: about_create(): Ãøºî·ïɽ¼¨¤ò½¤Àµ¡£
+

 2003-02-17
 
        * src/colorlabel.c: ¥«¥é¡¼¥é¥Ù¥ë¤Î¶ë·Á¤Ë pixmap ¤ò»È¤ï¤º¡¢¶ë·Á¤ò
 2003-02-17
 
        * src/colorlabel.c: ¥«¥é¡¼¥é¥Ù¥ë¤Î¶ë·Á¤Ë pixmap ¤ò»È¤ï¤º¡¢¶ë·Á¤ò

diff --git a/configure.ac b/configure.ac
index 908d577fb108233f109adeb43534f9278e701efd..ecdeca13c55cebd09c3e4acd52ff16561c58958c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws18
+EXTRA_VERSION=claws19

 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/prefs_common.c b/src/prefs_common.c
index e59327cc09c20cfae7972764e2d617338f1c2580..33701f1f72a0d954d97749d8f989324776708bbb 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -633,6 +633,10 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"messagewin_height", "540", &prefs_common.msgwin_height, P_INT,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"messagewin_height", "540", &prefs_common.msgwin_height, P_INT,
         NULL, NULL, NULL},

+       {"sourcewin_width", "600", &prefs_common.sourcewin_width, P_INT,
+        NULL, NULL, NULL},
+       {"sourcewin_height", "500", &prefs_common.sourcewin_height, P_INT,
+        NULL, NULL, NULL},

        {"compose_width", "600", &prefs_common.compose_width, P_INT,
         NULL, NULL, NULL},
        {"compose_height", "560", &prefs_common.compose_height, P_INT,
        {"compose_width", "600", &prefs_common.compose_width, P_INT,
         NULL, NULL, NULL},
        {"compose_height", "560", &prefs_common.compose_height, P_INT,

diff --git a/src/prefs_common.h b/src/prefs_common.h
index a3750a95d69992a055cde8ca2d279c00791d5a6d..a2a2c8532ccbe5be6d9b80240e317185573639d0 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -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-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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


@@ -187,6 +187,9 @@ struct _PrefsCommon
        gint msgwin_width;
        gint msgwin_height;
 
        gint msgwin_width;
        gint msgwin_height;
 

+       gint sourcewin_width;
+       gint sourcewin_height;
+

        gint compose_width;
        gint compose_height;
 
        gint compose_width;
        gint compose_height;
 

diff --git a/src/sourcewindow.c b/src/sourcewindow.c
index bec50ce226018c217afebf182d87c29483ce4cc0..87273c3ef36febef577b03cdbaebfe43e6558b61 100644 (file)
--- a/src/sourcewindow.c
+++ b/src/sourcewindow.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-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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


@@ -36,6 +36,8 @@
 #include "gtkutils.h"
 #include "prefs_common.h"
 
 #include "gtkutils.h"
 #include "prefs_common.h"
 

+static void source_window_size_alloc_cb        (GtkWidget      *widget,
+                                        GtkAllocation  *allocation);

 static void source_window_destroy_cb   (GtkWidget      *widget,
                                         SourceWindow   *sourcewin);
 static void key_pressed                        (GtkWidget      *widget,
 static void source_window_destroy_cb   (GtkWidget      *widget,
                                         SourceWindow   *sourcewin);
 static void key_pressed                        (GtkWidget      *widget,


@@ -64,7 +66,11 @@ SourceWindow *source_window_create(void)
        gtk_window_set_title(GTK_WINDOW(window), _("Source of the message"));
        gtk_window_set_wmclass(GTK_WINDOW(window), "source_window", "Sylpheed");
        gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
        gtk_window_set_title(GTK_WINDOW(window), _("Source of the message"));
        gtk_window_set_wmclass(GTK_WINDOW(window), "source_window", "Sylpheed");
        gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);

-       gtk_widget_set_usize(window, 600, 500);
+       gtk_widget_set_usize(window, prefs_common.sourcewin_width,
+                            prefs_common.sourcewin_height);
+       gtk_signal_connect(GTK_OBJECT(window), "size_allocate",
+                          GTK_SIGNAL_FUNC(source_window_size_alloc_cb),
+                          sourcewin);

        gtk_signal_connect(GTK_OBJECT(window), "destroy",
                           GTK_SIGNAL_FUNC(source_window_destroy_cb),
                           sourcewin);
        gtk_signal_connect(GTK_OBJECT(window), "destroy",
                           GTK_SIGNAL_FUNC(source_window_destroy_cb),
                           sourcewin);


@@ -141,8 +147,23 @@ void source_window_show_msg(SourceWindow *sourcewin, MsgInfo *msginfo)
 
 void source_window_append(SourceWindow *sourcewin, const gchar *str)
 {
 
 void source_window_append(SourceWindow *sourcewin, const gchar *str)
 {

+       gchar *out;
+       gint len;
+
+       len = strlen(str) + 1;
+       Xalloca(out, len, return);
+       conv_localetodisp(out, len, str);

        gtk_text_insert(GTK_TEXT(sourcewin->text), msgfont, NULL, NULL,
        gtk_text_insert(GTK_TEXT(sourcewin->text), msgfont, NULL, NULL,

-                       str, -1);
+                       out, -1);
+}
+
+static void source_window_size_alloc_cb(GtkWidget *widget,
+                                       GtkAllocation *allocation)
+{
+       g_return_if_fail(allocation != NULL);
+
+       prefs_common.sourcewin_width  = allocation->width;
+       prefs_common.sourcewin_height = allocation->height;

 }
 
 static void source_window_destroy_cb(GtkWidget *widget,
 }
 
 static void source_window_destroy_cb(GtkWidget *widget,