2004-10-01 [paul] 0.9.12cvs116.1

	* ChangeLog.claws
	* configure.ac
	* src/account.c
	* src/prefs_common.c
	* src/gtk/colorlabel.c
		sync with HEAD

diff --git a/ChangeLog b/ChangeLog
index 5311e4e..1c32e6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2004-09-30
+
+       * src/filter.c: filter_apply_msginfo(): don't apply filter if
+         FilterRule::enabled == FALSE.
+       * src/prefs_filter.c: implemented Enabled column.
+       * src/account.c: account_selected(): modified the behavior of
+         double-click.
+
+2004-09-30
+
+       * src/colorlabel.c: modified the menu label size. Removed "None" from
+         color menu.
+       * src/filter.[ch]
+         src/prefs_filter_edit.c: implemented color label action.
+       * src/summaryview.c: summary_filter_func(): update summary flags
+         when flag action is performed.
+
+2004-09-29
+
+       * src/prefs_filter_edit.c: added color label.
+       * src/colorlabel.c: modified the menu label size and border.
+
+2004-09-28
+
+       * src/filter.[ch]
+         src/prefs_filter_edit.c: improved error handling when creating a
+         rule.
+
+2004-09-28
+
+       * src/prefs_common.c: adjusted the default size of views.
+
+2004-09-27
+
+       * src/filter.c
+         src/prefs_filter_edit.c: implemented size/age condition.
+       * src/menu.[ch]: menu_get_option_menu_active_user_data(): new.
+
+2004-09-22
+
+       * src/prefs_filter_edit.c: select previous item when editing header
+         finished.
+
+2004-09-22
+
+       * src/prefs_filter.[ch]
+         src/prefs_filter_edit.c
+         src/procheader.[ch]: implemented user-defined header dialog.
+
 2004-09-17
 
        * src/filter.c:

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 0b03529..28e95a4 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2004-10-01 [paul]      0.9.12cvs116.1
+
+       * ChangeLog.claws
+       * configure.ac
+       * src/account.c
+       * src/prefs_common.c
+       * src/gtk/colorlabel.c
+               sync with HEAD
+
 2004-09-30 [colin]     0.9.12cvs115.1
 
        * src/stock_pixmap.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index c9098e2..63d3b6b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,94 @@
+2004-10-01 [paul]      0.9.12cvs116
+
+       * ChangeLog
+       * ChangeLog.jp
+       * src/account.c
+       * src/prefs_common.c
+       * src/gtk/colorlabel.c
+               sync with main 0.9.12cvs17
+
+2004-09-30 [colin]     0.9.12cvs115
+
+       * src/stock_pixmap.c
+       * src/stock_pixmap.h
+       * src/folderview.c
+       * src/Makefile.am
+       * src/pixmaps/read.xpm
+               Add icon for total # column
+
+2004-09-29 [colin]     0.9.12cvs114
+
+       * src/compose.c
+               Don't close compose until message is sent if 
+               Show Send Dialog is Always
+
+2004-09-29 [paul]      0.9.12cvs113
+
+       * src/quote_fmt_parse.y
+               In the quotation templates recognise sender's first and last 
+               names (%F %L) when the name is in the format "Duck, Donald".
+               Patch submitted by Thomas Gilgin, <thomas_gilgin@users.sourceforge.net>
+
+
+2004-09-28 [colin]     0.9.12cvs112
+
+       * src/mainwindow.c
+               Put back mnemonic
+       * src/folderview.c
+               Fix Empty trash being visible-invisible-visible...
+
+2004-09-28 [colin]     0.9.12cvs111
+
+       * src/mainwindow.c
+               Relabel Empty all Trash folders
+
+2004-09-28 [colin]     0.9.12cvs110
+
+       * src/folderview.c
+               Add contextual Empty trash menu
+       * src/mainwindow.c
+               Revert cvs109 which was useless
+
+2004-09-28 [colin]     0.9.12cvs109
+
+       * src/mainwindow.c
+               Fix uninialized var
+
+2004-09-28 [colin]     0.9.12cvs108
+
+       * src/addressbook.c
+               Fix triple-click
+
+2004-09-28 [colin]     0.9.12cvs107
+
+       * src/addressbook.c
+               Fix double-click on entries
+
+2004-09-28 [colin]     0.9.12cvs106
+
+       * src/inc.c
+               Reintroduce folder_item update freeze on incorporation
+
+2004-09-27 [christoph] 0.9.12cvs105
+
+       * src/folderview.c
+               right-align new and unread column
+
+2004-09-27 [paul]
+
+       * 0.9.12b released
+
+2004-09-27 [paul]      0.9.12cvs104
+
+       * src/main.c
+               revert 0.9.12cvs101, it causes another segfault
+
+2004-09-23 [christoph] 0.9.12cvs103
+
+       * src/plugins/spamassassin/libspamc.[ch]
+       * src/plugins/spamassassin/utils.[ch]
+               update libspamc to SpamAssassin 3.0.0
+
 2004-09-17 [paul]      0.9.12cvs102
 
        * ChangeLog

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 024bae6..a1e1001 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,50 @@
+2004-09-30
+
+       * src/filter.c: filter_apply_msginfo(): FilterRule::enabled == FALSE
+         ¤Î¾ì¹ç¥Õ¥£¥ë¥¿¤òŬÍѤ·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+       * src/prefs_filter.c: ¡ÖÍ­¸ú¡×¥«¥é¥à¤ò¼ÂÁõ¡£
+       * src/account.c: account_selected(): ¥À¥Ö¥ë¥¯¥ê¥Ã¥¯¤ÎµóÆ°¤ò½¤Àµ¡£
+
+2004-09-30
+
+       * src/colorlabel.c: ¥á¥Ë¥å¡¼¥é¥Ù¥ë¥µ¥¤¥º¤òÄ´À°¡£¥«¥é¡¼¥á¥Ë¥å¡¼¤«¤é
+         ¡Ö¤Ê¤·¡×¤òºï½ü¡£
+       * src/filter.[ch]
+         src/prefs_filter_edit.c: ¥«¥é¡¼¥é¥Ù¥ë¥¢¥¯¥·¥ç¥ó¤ò¼ÂÁõ¡£
+       * src/summaryview.c: summary_filter_func(): ¥Õ¥é¥°¥¢¥¯¥·¥ç¥ó¤¬¼Â¹Ô
+         ¤µ¤ì¤¿¤È¤­¤Ë¥µ¥Þ¥ê¤Î¥Õ¥é¥°¤ò¹¹¿·¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2004-09-29
+
+       * src/prefs_filter_edit.c: ¥«¥é¡¼¥é¥Ù¥ë¤òÄɲá£
+       * src/colorlabel.c: ¥á¥Ë¥å¡¼¤Î¥é¥Ù¥ë¤Î¥µ¥¤¥º¤ÈÎسÔÀþ¤ò½¤Àµ¡£
+
+2004-09-28
+
+       * src/filter.[ch]
+         src/prefs_filter_edit.c: ¥ë¡¼¥ëºîÀ®»þ¤Î¥¨¥é¡¼½èÍý¤ò²þÎÉ¡£
+
+2004-09-28
+
+       * src/prefs_common.c: ¥Ó¥å¡¼¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥µ¥¤¥º¤òÄ´À°¡£
+
+2004-09-27
+
+       * src/filter.c
+         src/prefs_filter_edit.c: ¥µ¥¤¥º/·Ð²áÆü¿ô¾ò·ï¤ò¼ÂÁõ¡£
+       * src/menu.[ch]: menu_get_option_menu_active_user_data(): ¿·µ¬¡£
+
+2004-09-22
+
+       * src/prefs_filter_edit.c: ¥Ø¥Ã¥À¤ÎÊÔ½¸¤¬´°Î»¤·¤¿¤é°ÊÁ°¤Î¹àÌܤò
+         ÁªÂò¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2004-09-22
+
+       * src/prefs_filter.[ch]
+         src/prefs_filter_edit.c
+         src/procheader.[ch]: ¥æ¡¼¥¶ÄêµÁ¥Ø¥Ã¥À¤Î¥À¥¤¥¢¥í¥°¤ò¼ÂÁõ¡£
+
 2004-09-17
 
        * src/filter.c:

diff --git a/PATCHSETS b/PATCHSETS
index e2f3ab8..aec2c5b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -184,3 +184,4 @@
 ( cvs diff -u -r 1.654.2.215 -r 1.654.2.216 configure.ac; cvs diff -u -r 1.22.2.2 -r 1.22.2.3 src/quote_fmt_parse.y; ) > 0.9.12cvs113.1.patchset
 ( cvs diff -u -r 1.382.2.47 -r 1.382.2.48 src/compose.c; ) > 0.9.12cvs114.1.patchset
 ( cvs diff -u -r 1.25.2.7 -r 1.25.2.8 src/stock_pixmap.c; cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/stock_pixmap.h; cvs diff -u -r 1.207.2.17 -r 1.207.2.18 src/folderview.c; cvs diff -u -r 1.155.2.11 -r 1.155.2.12 src/Makefile.am; cvs diff -u -r 0 -r 1 src/pixmaps/read.xpm; ) > 0.9.12cvs115.1.patchset
+( cvs diff -u -r 1.2504.2.22 -r 1.2504.2.23 ChangeLog.claws; cvs diff -u -r 1.654.2.218 -r 1.654.2.219 configure.ac; cvs diff -u -r 1.61.2.11 -r 1.61.2.12 src/account.c; cvs diff -u -r 1.204.2.20 -r 1.204.2.21 src/prefs_common.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/gtk/colorlabel.c; ) > 0.9.12cvs116.1.patchset

diff --git a/configure.ac b/configure.ac
index 2720ca7..7b9d302 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=115
+EXTRA_VERSION=116
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/account.c b/src/account.c
index 7eb844b..97769b8 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -998,8 +998,10 @@ static gint account_delete_event(GtkWidget *widget, GdkEventAny *event,
 static void account_selected(GtkCList *clist, gint row, gint column,
                             GdkEvent *event, gpointer data)
 {
-       if (event && event->type == GDK_2BUTTON_PRESS)
+       if (event && event->type == GDK_2BUTTON_PRESS) {
                account_edit_prefs();
+               return;
+       }
 
        if (column == COL_GETALL) {
                PrefsAccount *ac;

diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index 48fb50b..73c130d 100644 (file)
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2003 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 2001-2004 Hiroyuki Yamamoto & The Sylpheed Claws Team
  *
  * 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
@@ -81,6 +81,9 @@ static struct
        { LCCF_ALL, { 0, 0x66 << 8, 0x33 << 8, 0x33 << 8 },     NULL, NULL }
 };
 
+#define LABEL_COLOR_WIDTH      28
+#define LABEL_COLOR_HEIGHT     16
+
 #define LABEL_COLORS_ELEMS (sizeof label_colors / sizeof label_colors[0])
 
 #define G_RETURN_VAL_IF_INVALID_COLOR(color, val) \
@@ -129,11 +132,11 @@ static gboolean colorlabel_drawing_area_expose_event_cb
 
        gdk_gc_set_foreground(gc, &color);
        gdk_draw_rectangle(drawable, gc,
-                          TRUE, 0, 0, widget->allocation.width,
-                          widget->allocation.height);
+                          TRUE, 0, 0, widget->allocation.width - 1,
+                          widget->allocation.height - 1);
        gdk_draw_rectangle(drawable, widget->style->black_gc,
-                          FALSE, 0, 0, widget->allocation.width,
-                          widget->allocation.height);
+                          FALSE, 0, 0, widget->allocation.width - 1,
+                          widget->allocation.height - 1);
 
        gdk_gc_unref(gc);                          
 
@@ -145,7 +148,8 @@ static GtkWidget *colorlabel_create_color_widget(GdkColor color)
        GtkWidget *widget;
 
        widget = gtk_drawing_area_new();
-       gtk_widget_set_size_request(widget, 16, 16);
+       gtk_widget_set_size_request(widget, LABEL_COLOR_WIDTH - 2, 
+                                   LABEL_COLOR_HEIGHT - 4);
 
 #define CL(x)          (((gulong) (x) >> (gulong) 8) & 0xFFUL) 
 #define CR(r, g, b)    ((CL(r) << (gulong) 16) | \
@@ -233,7 +237,7 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index)
 
        G_RETURN_VAL_IF_INVALID_COLOR(color_index, NULL);
 
-       item  = gtk_check_menu_item_new();
+       item = gtk_check_menu_item_new();
 
        colorlabel_recreate(color_index);
 
@@ -253,7 +257,8 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index)
 
        gtk_container_add(GTK_CONTAINER(align), label_colors[color_index].widget);
        gtk_widget_show(label_colors[color_index].widget);
-       gtk_widget_set_size_request(align, 16, 16);
+       gtk_widget_set_size_request(align, LABEL_COLOR_WIDTH, 
+                                   LABEL_COLOR_HEIGHT);
 
        gtk_box_pack_start(GTK_BOX(hbox), align, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4);
@@ -278,11 +283,13 @@ GtkWidget *colorlabel_create_color_menu(void)
        menu = gtk_menu_new();
        g_object_set_data(G_OBJECT(menu), "label_color_menu", menu);
 
+#if 0
        item = gtk_menu_item_new_with_label(_("None"));
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
        g_object_set_data(G_OBJECT(item), "color", GUINT_TO_POINTER(0));
        gtk_widget_show(item);
-       
+#endif
+
        /* and the color items */
        for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
                GtkWidget *widget = colorlabel_create_color_widget(label_colors[i].color);
@@ -304,7 +311,8 @@ GtkWidget *colorlabel_create_color_menu(void)
 
                gtk_container_add(GTK_CONTAINER(align), widget);
                gtk_widget_show(widget);
-               gtk_widget_set_size_request(align, 16, 16);
+               gtk_widget_set_size_request(align, LABEL_COLOR_WIDTH, 
+                                           LABEL_COLOR_HEIGHT);
 
                gtk_box_pack_start(GTK_BOX(hbox), align, FALSE, FALSE, 0);
                gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 4);
@@ -321,12 +329,10 @@ GtkWidget *colorlabel_create_color_menu(void)
 guint colorlabel_get_color_menu_active_item(GtkWidget *menu)
 {
        GtkWidget *menuitem;
-       guint      color;
+       guint color;
 
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
        color = GPOINTER_TO_UINT
                (g_object_get_data(G_OBJECT(menuitem), "color"));
        return color;
 }
-
-

diff --git a/src/prefs_common.c b/src/prefs_common.c
index fc142f6..bd369b9 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -510,7 +510,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"folderview_width", "179", &prefs_common.folderview_width, P_INT,
         NULL, NULL, NULL},
-       {"folderview_height", "600", &prefs_common.folderview_height, P_INT,
+       {"folderview_height", "450", &prefs_common.folderview_height, P_INT,
         NULL, NULL, NULL},
        {"folderview_visible", "TRUE", &prefs_common.folderview_visible, P_BOOL,
         NULL, NULL, NULL},
@@ -526,7 +526,7 @@ static PrefParam param[] = {
 
        {"summaryview_width", "600", &prefs_common.summaryview_width, P_INT,
         NULL, NULL, NULL},
-       {"summaryview_height", "173", &prefs_common.summaryview_height, P_INT,
+       {"summaryview_height", "157", &prefs_common.summaryview_height, P_INT,
         NULL, NULL, NULL},
 
        {"main_messagewin_x", "256", &prefs_common.main_msgwin_x, P_INT,
@@ -535,7 +535,7 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"messageview_width", "600", &prefs_common.msgview_width, P_INT,
         NULL, NULL, NULL},
-       {"messageview_height", "540", &prefs_common.msgview_height, P_INT,
+       {"messageview_height", "300", &prefs_common.msgview_height, P_INT,
         NULL, NULL, NULL},
        {"messageview_visible", "TRUE", &prefs_common.msgview_visible, P_BOOL,
         NULL, NULL, NULL},