sync with 0.8.10cvs14
authorPaul Mangan <paul@claws-mail.org>
Tue, 18 Feb 2003 05:42:13 +0000 (05:42 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 18 Feb 2003 05:42:13 +0000 (05:42 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/prefs_common.c
src/prefs_common.h
src/sourcewindow.c

index 4862420..8fb508b 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
index a1f3a0e..950975c 100644 (file)
@@ -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
index 98b0ba7..9be1224 100644 (file)
@@ -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 ¤ò»È¤ï¤º¡¢¶ë·Á¤ò
index 908d577..ecdeca1 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 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
index e59327c..33701f1 100644 (file)
@@ -633,6 +633,10 @@ static PrefParam param[] = {
         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,
index a3750a9..a2a2c85 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -187,6 +187,9 @@ struct _PrefsCommon
        gint msgwin_width;
        gint msgwin_height;
 
+       gint sourcewin_width;
+       gint sourcewin_height;
+
        gint compose_width;
        gint compose_height;
 
index bec50ce..87273c3 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -36,6 +36,8 @@
 #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,
@@ -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_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);
@@ -141,8 +147,23 @@ void source_window_show_msg(SourceWindow *sourcewin, MsgInfo *msginfo)
 
 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,
-                       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,