sync with sylpheed 0.4.67cvs9

diff --git a/ChangeLog b/ChangeLog
index db3a8eec6f971bb37df551f208c66facc85477f2..304116452ff1ae2d056e05268b2acb67e11280eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-05-17
+
+       * src/main.c: lock_socket_input_cb(): changed fd_read() to fd_gets().
+         It caused garbages in --compose option.
+       * src/socket.[ch]: made fd_gets() public.
+
+2001-05-16
+
+       * src/gtkutils.[ch]: gtkut_ctree_node_next(): new.
+       * src/folderview.c: folderview_find_next_unread(): new.
+         folderview_select_next_unread(): modified so that it can find
+         the hidden folder.
+
 2001-05-15
 
        * src/compose.c: compose_write_headers(): excluded also From, To,

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2318f3ecbb0b4bc033ad1ecc15fc64abbd05a616..0eeb5146c9c40244b50abcdaeda48ad682de548b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,5 +1,8 @@
 2001-05-17 [alfons]
 
+       0.4.67claws4    
+
+       * sync with sylpheed 0.4.67cvs9
        * sync with sylpheed 0.4.67cvs7-8
 
 2001-05-17 [hoa]

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 64acea95dfdb7b1cee45d03c6c071e6d712d05de..9c7cae08b6063b4cb9ca26781da9085a3132c617 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,16 @@
+2001-05-17
+
+       * src/main.c: lock_socket_input_cb(): fd_read() ¤ò fd_gets() ¤Ë
+         Êѹ¹¡£ --compose ¥ª¥×¥·¥ç¥ó¤Ç¥´¥ß¤òȯÀ¸¤·¤Æ¤¤¤¿¡£
+       * src/socket.[ch]: fd_gets() ¤ò public ¤Ë¤·¤¿¡£
+
+2001-05-16
+
+       * src/gtkutils.[ch]: gtkut_ctree_node_next(): ¿·µ¬¡£
+       * src/folderview.c: folderview_find_next_unread(): ¿·µ¬¡£
+         folderview_select_next_unread(): ±£¤ì¤¿¥Õ¥©¥ë¥À¤â¸«ÉÕ¤±¤é¤ì¤ë
+         ¤è¤¦¤Ë½¤Àµ¡£
+
 2001-05-15
 
        * src/compose.c: compose_write_headers(): SPAM ¤Ë»ÈÍѤµ¤ì¤ë²ÄǽÀ­

diff --git a/configure.in b/configure.in
index ee6e4d8aae85bb0847f53cfaf4156f08f49bc3eb..fd3803bfe44a17ea1b50c38b79e9fb3c35df886b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=4
 MICRO_VERSION=67
 INTERFACE_AGE=67
 BINARY_AGE=67
-EXTRA_VERSION=claws3
+EXTRA_VERSION=claws4
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/folderview.c b/src/folderview.c
index de272502d966ec6e771732f9682686e36867ff77..2d1d94b3fd32cede1e4df5eb54ebb2045220ded8 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 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
@@ -259,7 +259,6 @@ FolderView *folderview_create(void)
        gtk_widget_set_usize(scrolledwin,
                             prefs_common.folderview_width,
                             prefs_common.folderview_height);
-       //                   COL_FOLDER_WIDTH + COL_NUM_WIDTH - 3, -1);
 
        ctree = gtk_ctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
@@ -282,7 +281,7 @@ FolderView *folderview_create(void)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
-       //gtk_clist_set_reorderable(GTK_CLIST(ctree), TRUE);
+       
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
@@ -450,36 +449,42 @@ void folderview_unselect(FolderView *folderview)
        folderview->selected = folderview->opened = NULL;
 }
 
-void folderview_select_next_unread(FolderView *folderview)
+static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
+                                                GtkCTreeNode *node)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *node;
        FolderItem *item;
 
-       if (folderview->opened)
-               node = GTK_CTREE_NODE_NEXT(folderview->opened);
+       if (node)
+               node = gtkut_ctree_node_next(ctree, node);
        else
-               node = gtk_ctree_node_nth(ctree, 1);
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                item = gtk_ctree_node_get_row_data(ctree, node);
-               if (item && (item->unread > 0 || item->new > 0) &&
-                   item->stype != F_TRASH) {
-                       folderview_select_node(folderview, node);
-                       return;
-               }
+               if (item && item->unread > 0 && item->stype != F_TRASH)
+                       return node;
        }
-       if (!folderview->opened) return;
-       /* search again from the first node */
-       for (node = gtk_ctree_node_nth(ctree, 1); node != NULL;
-            node = GTK_CTREE_NODE_NEXT(node)) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
-               if (item && (item->unread > 0 || item->new > 0) &&
-                   item->stype != F_TRASH) {
-                       folderview_select_node(folderview, node);
-                       return;
-               }
+
+       return NULL;
+}
+
+void folderview_select_next_unread(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCTreeNode *node = NULL;
+
+       if ((node = folderview_find_next_unread(ctree, folderview->opened))
+           != NULL) {
+               folderview_select_node(folderview, node);
+               return;
        }
+
+       if (!folderview->opened ||
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list))
+               return;
+       /* search again from the first node */
+       if ((node = folderview_find_next_unread(ctree, NULL)) != NULL)
+               folderview_select_node(folderview, node);
 }
 
 void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row,
@@ -785,7 +790,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                              add_unread_mark ? "+" : "");
                else
                        str = g_strdup_printf("%s (+)", name);
-               str = g_strdup_printf("%s (%d)", name, item->unread);
                gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
                                        FALSE, GTK_CTREE_ROW(node)->expanded);

diff --git a/src/gtkutils.c b/src/gtkutils.c
index e66f612bd55d0b7499227663290c5c41d446048e..67e15eafda5f362697ab86efc39aa5f00ec3240e 100644 (file)
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -168,6 +168,26 @@ gint gtkut_ctree_get_nth_from_node(GtkCTree *ctree, GtkCTreeNode *node)
        return g_list_position(GTK_CLIST(ctree)->row_list, (GList *)node);
 }
 
+/* get the next node, including the invisible one */
+GtkCTreeNode *gtkut_ctree_node_next(GtkCTree *ctree, GtkCTreeNode *node)
+{
+       GtkCTreeNode *parent;
+
+       if (GTK_CTREE_ROW(node)->children)
+               return GTK_CTREE_ROW(node)->children;
+
+       if (GTK_CTREE_ROW(node)->sibling)
+               return GTK_CTREE_ROW(node)->sibling;
+
+       for (parent = GTK_CTREE_ROW(node)->parent; parent != NULL;
+            parent = GTK_CTREE_ROW(parent)->parent) {
+               if (GTK_CTREE_ROW(parent)->sibling)
+                       return GTK_CTREE_ROW(parent)->sibling;
+       }
+
+       return NULL;
+}
+
 void gtkut_ctree_set_focus_row(GtkCTree *ctree, GtkCTreeNode *node)
 {
        gtkut_clist_set_focus_row(GTK_CLIST(ctree),

diff --git a/src/gtkutils.h b/src/gtkutils.h
index ef37ccd8e9dcdd16f81bbadf198e0e4872045b5b..27f5a926c21125ce0e3c13b0c80aa282b64e7fb9 100644 (file)
--- a/src/gtkutils.h
+++ b/src/gtkutils.h
@@ -75,6 +75,8 @@ void gtkut_ctree_node_move_if_on_the_edge
                                         GtkCTreeNode   *node);
 gint gtkut_ctree_get_nth_from_node     (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);
+GtkCTreeNode *gtkut_ctree_node_next    (GtkCTree       *ctree,
+                                        GtkCTreeNode   *node);
 void gtkut_ctree_set_focus_row         (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);
 void gtkut_clist_set_focus_row         (GtkCList       *clist,

diff --git a/src/main.c b/src/main.c
index f4168faa4ea837ae2aef7ff0b11d167122bc1a97..5335d0d0f5f48868dc222d14b88fe6ce245a79b3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -442,7 +442,7 @@ static void lock_socket_input_cb(gpointer data,
        gchar buf[BUFFSIZE];
 
        sock = fd_accept(source);
-       fd_read(sock, buf, sizeof(buf));
+       fd_gets(sock, buf, sizeof(buf));
        fd_close(sock);
 
        if (!strncmp(buf, "popup", 5)){

diff --git a/src/socket.c b/src/socket.c
index 688c4da0a200e5cf376bd2dd352755d94ffdaa95..af867b61a4b5bd56fac99ae5e4057b415756e2cf 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -428,7 +428,7 @@ gint fd_write(gint fd, const gchar *buf, gint len)
        return wrlen;
 }
 
-static gint fd_gets(gint fd, gchar *buf, gint len)
+gint fd_gets(gint fd, gchar *buf, gint len)
 {
        gchar *newline, *bp = buf;
        gint n;

diff --git a/src/socket.h b/src/socket.h
index c532a81f0b576d7598894b014b994c214f5555a4..d439ee8bfddf25fb450688297de5c3c3adcd6c19 100644 (file)
--- a/src/socket.h
+++ b/src/socket.h
@@ -94,6 +94,7 @@ gint fd_accept                (gint sock);
 
 gint fd_read           (gint sock, gchar *buf, gint len);
 gint fd_write          (gint sock, const gchar *buf, gint len);
+gint fd_gets           (gint sock, gchar *buf, gint len);
 gint fd_close          (gint sock);
 
 #endif /* __SOCKET_H__ */