sync with sylpheed 0.5.0pre4 release
authorPaul Mangan <paul@claws-mail.org>
Thu, 5 Jul 2001 08:47:25 +0000 (08:47 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 5 Jul 2001 08:47:25 +0000 (08:47 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
src/folderview.h
src/mainwindow.c
src/summaryview.c
src/summaryview.h

index a674ce9..7510b83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-07-05
+
+       * version 0.5.0pre4
+
+       * manual/ja/sylpheed.sgml
+         manual/ja/*.html: updated the Japanese manual (thanks to Imai).
+       * src/summaryview.c: summary_set_row_marks(): fixed a bug that
+         didn't set foreground correctly.
+       * src/folderview.h
+         src/summaryview.h: removed the member color_normal from FolderView
+         and SummaryView.
+       * src/mainwindow.c: main_window_create(): removed color_normal.
+
 2001-07-04
 
        * src/prefs_account.[ch]: the port numbers of IMAP4 and NNTP
index 58b468a..171b1ee 100644 (file)
@@ -1,3 +1,8 @@
+2001-07-05 [paul]
+
+       sync with sylpheed 0.5.0pre4 release
+               /po and /manual/ja not sync'ed
+
 2001-07-04 [paul]
 
        more sync with sylpheed 0.5.0pre4
index 63aa5fb..9c88c9d 100644 (file)
@@ -1,3 +1,16 @@
+2001-07-05
+
+       * version 0.5.0pre4
+
+       * manual/ja/sylpheed.sgml
+         manual/ja/*.html: ÆüËܸì¥Þ¥Ë¥å¥¢¥ë¤ò¹¹¿·(º£°æ¤µ¤ó thanks)¡£
+       * src/summaryview.c: summary_set_row_marks(): ¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¤ò
+         Àµ¤·¤¯»ØÄꤷ¤Æ¤¤¤Ê¤«¤Ã¤¿¥Ð¥°¤ò½¤Àµ¡£
+       * src/folderview.h
+         src/summaryview.h: color_normal ¥á¥ó¥Ð¤ò FolderView ¤È SummaryView
+         ¤«¤éºï½ü¡£
+       * src/mainwindow.c: main_window_create(): color_normal ¤òºï½ü¡£
+
 2001-07-04
 
        * src/prefs_account.[ch]: IMAP4 ¤È NNTP ¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò»ØÄê²Äǽ¤Ë¤·¤¿¡£
index 52fdad9..1b6d1cb 100644 (file)
@@ -51,7 +51,6 @@ struct _FolderView
        gboolean open_folder;
 
        GdkColor color_new;
-       GdkColor color_normal;
 
        MainWindow   *mainwin;
        SummaryView  *summaryview;
index b5a19fb..daf3538 100644 (file)
@@ -592,8 +592,8 @@ MainWindow *main_window_create(SeparateType type)
        SummaryView *summaryview;
        MessageView *messageview;
        GdkColormap *colormap;
-       GdkColor color[5];
-       gboolean success[5];
+       GdkColor color[3];
+       gboolean success[3];
        guint n_menu_entries;
        GtkItemFactory *ifactory;
        GtkWidget *ac_menu;
@@ -700,28 +700,20 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->color_dim.red = summaryview->color_dim.green =
                summaryview->color_dim.blue = COLOR_DIM;
 
-       summaryview->color_normal.red = summaryview->color_normal.green =
-               summaryview->color_normal.blue = 0;
-
        folderview->color_new.red = (guint16)55000;
        folderview->color_new.green = folderview->color_new.blue = 15000;
 
-       folderview->color_normal.red = folderview->color_normal.green =
-               folderview->color_normal.blue = 0;
-
        summaryview->color_important.red = 0;
        summaryview->color_marked.green = 0;
        summaryview->color_important.blue = (guint16)65535;
 
        color[0] = summaryview->color_marked;
        color[1] = summaryview->color_dim;
-       color[2] = summaryview->color_normal;
-       color[3] = folderview->color_new;
-       color[4] = folderview->color_normal;
+       color[2] = folderview->color_new;
 
        colormap = gdk_window_get_colormap(window->window);
-       gdk_colormap_alloc_colors(colormap, color, 5, FALSE, TRUE, success);
-       for (i = 0; i < 5; i++) {
+       gdk_colormap_alloc_colors(colormap, color, 3, FALSE, TRUE, success);
+       for (i = 0; i < 3; i++) {
                if (success[i] == FALSE)
                        g_warning(_("MainWindow: color allocation %d failed\n"), i);
        }
index fa34635..7ee64d0 100644 (file)
@@ -2161,7 +2161,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
        flags = msginfo->flags;
 
-       gtk_ctree_node_set_foreground(ctree, row, &summaryview->color_normal);
+       gtk_ctree_node_set_foreground(ctree, row, NULL);
 
        /* set new/unread column */
        if (MSG_IS_IGNORE_THREAD(flags)) {
index 1ec8372..c6161a3 100644 (file)
@@ -106,7 +106,6 @@ struct _SummaryView
        GdkColor color_important;
        GdkColor color_marked;
        GdkColor color_dim;
-       GdkColor color_normal;
 
        MainWindow   *mainwin;
        FolderView   *folderview;