sync with sylpheed 0.4.99cvs1

diff --git a/ChangeLog b/ChangeLog
index 304116452ff1ae2d056e05268b2acb67e11280eb..c8f848a7799165a418476b53ef395449b4c99587 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-05-18
+
+       * src/gtkutils.[ch]: moved folderview_find_collapsed_parent() to
+         gtkut_ctree_find_collapsed_parent().
+       * src/folderview.c: folderview_select_node(): automatically expand
+         the parent folders when selected.
+       * configure.in: made the version number to 0.4.99 (0.5pre)
+       * src/main.c: main(): moved parse_cmd_opt() before gtk_init()
+         so that X is not necessary for --help and --version.
+         parse_cmd_opt(): changed g_get_prgname() to g_basename(argv[0]).
+

 2001-05-17
 
        * src/main.c: lock_socket_input_cb(): changed fd_read() to fd_gets().
 2001-05-17
 
        * src/main.c: lock_socket_input_cb(): changed fd_read() to fd_gets().

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 788bcfd34e476a4e490c4023e1e5922533f62602..4698661952e7a5e8ac3c18d6905681ddd4738788 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-05-18 [paul]
+
+        0.4.99claws1
+
+        *sync with sylpheed 0.4.99cvs1
+

 2001-05-18 [hoa]
 
        * src/compose.[ch]
 2001-05-18 [hoa]
 
        * src/compose.[ch]

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 9c7cae08b6063b4cb9ca26781da9085a3132c617..aabd72007f285253f17ee8802add2cc8f1a819ef 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,14 @@
+2001-05-18
+
+       * src/gtkutils.[ch]: folderview_find_collapsed_parent() ¤ò
+         gtkut_ctree_find_collapsed_parent() ¤Ë°ÜÆ°¡£
+       * src/folderview.c: folderview_select_node(): ÁªÂò¤µ¤ì¤¿¤È¤­¤Ë
+         ¿Æ¥Õ¥©¥ë¥À¤ò¼«Æ°Åª¤ËŸ³«¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * configure.in: ¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò 0.4.99 (0.5pre) ¤Ë¤·¤¿¡£
+       * src/main.c: main(): --help ¤È --version ¤Ë X ¤¬ÉÔÍפˤʤë¤è¤¦¤Ë
+         parse_cmd_opt() ¤ò gtk_init() ¤ÎÁ°¤Ë°ÜÆ°¡£
+         parse_cmd_opt(): g_get_prgname() ¤ò g_basename(argv[0]) ¤ËÊѹ¹¡£
+

 2001-05-17
 
        * src/main.c: lock_socket_input_cb(): fd_read() ¤ò fd_gets() ¤Ë
 2001-05-17
 
        * src/main.c: lock_socket_input_cb(): fd_read() ¤ò fd_gets() ¤Ë

diff --git a/configure.in b/configure.in
index fd3803bfe44a17ea1b50c38b79e9fb3c35df886b..12bf7f05939d9b61179583299aa248e5893e3704 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,10 +5,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=4
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=4

-MICRO_VERSION=67
-INTERFACE_AGE=67
-BINARY_AGE=67
-EXTRA_VERSION=claws4
+MICRO_VERSION=99
+INTERFACE_AGE=99
+BINARY_AGE=99
+EXTRA_VERSION=claws1

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/folderview.c b/src/folderview.c
index 2d1d94b3fd32cede1e4df5eb54ebb2045220ded8..5fa74bbe91a035a7a52fcea8a9d7988f85a99275 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -327,7 +327,7 @@ FolderView *folderview_create(void)
                                 GTK_SIGNAL_FUNC(folderview_tree_collapsed),
                                 folderview);
 
                                 GTK_SIGNAL_FUNC(folderview_tree_collapsed),
                                 folderview);
 

-    gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",
+        gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",

                           GTK_SIGNAL_FUNC(folderview_col_resized),
                           folderview);
 
                           GTK_SIGNAL_FUNC(folderview_col_resized),
                           folderview);
 


@@ -438,6 +438,10 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_widget_grab_focus(folderview->summaryview->ctree);
        else
                gtk_widget_grab_focus(folderview->ctree);
                gtk_widget_grab_focus(folderview->summaryview->ctree);
        else
                gtk_widget_grab_focus(folderview->ctree);

+
+       while ((node = gtkut_ctree_find_collapsed_parent(ctree, node))
+              != NULL)
+               gtk_ctree_expand(ctree, node);

 }
 
 void folderview_unselect(FolderView *folderview)
 }
 
 void folderview_unselect(FolderView *folderview)


@@ -691,18 +695,6 @@ static gboolean folderview_have_unread_children(FolderView *folderview,
        return FALSE;
 }
 
        return FALSE;
 }
 

-static GtkCTreeNode *folderview_find_collapsed_parent(FolderView *folderview,
-                                                     GtkCTreeNode *node)
-{
-       if (!node) return NULL;
-
-       while ((node = GTK_CTREE_ROW(node)->parent) != NULL) {
-               if (!GTK_CTREE_ROW(node)->expanded)
-                       return node;
-       }
-
-       return NULL;
-}

 
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
 
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {


@@ -852,7 +844,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        if (use_bold) {
                GtkCTreeNode *parent;
 
        if (use_bold) {
                GtkCTreeNode *parent;
 

-               parent = folderview_find_collapsed_parent(folderview, node);
+               parent = gtkut_ctree_find_collapsed_parent(ctree, node);

                if (parent)
                        folderview_update_node(folderview, parent);
        }
                if (parent)
                        folderview_update_node(folderview, parent);
        }

diff --git a/src/gtkutils.c b/src/gtkutils.c
index 67e15eafda5f362697ab86efc39aa5f00ec3240e..d4b42b968bbd2300ef6fc728165addbb5f2598e4 100644 (file)
--- a/src/gtkutils.c
+++ b/src/gtkutils.c
@@ -188,6 +188,19 @@ GtkCTreeNode *gtkut_ctree_node_next(GtkCTree *ctree, GtkCTreeNode *node)
        return NULL;
 }
 
        return NULL;
 }
 

+GtkCTreeNode *gtkut_ctree_find_collapsed_parent(GtkCTree *ctree,
+                                               GtkCTreeNode *node)
+{
+       if (!node) return NULL;
+
+       while ((node = GTK_CTREE_ROW(node)->parent) != NULL) {
+               if (!GTK_CTREE_ROW(node)->expanded)
+                       return node;
+       }
+
+       return NULL;
+}
+

 void gtkut_ctree_set_focus_row(GtkCTree *ctree, GtkCTreeNode *node)
 {
        gtkut_clist_set_focus_row(GTK_CLIST(ctree),
 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 27f5a926c21125ce0e3c13b0c80aa282b64e7fb9..9022cf8370700207ce08938fafd91e589923b7ce 100644 (file)
--- a/src/gtkutils.h
+++ b/src/gtkutils.h
@@ -77,6 +77,9 @@ gint gtkut_ctree_get_nth_from_node    (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);
 GtkCTreeNode *gtkut_ctree_node_next    (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);
                                         GtkCTreeNode   *node);
 GtkCTreeNode *gtkut_ctree_node_next    (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);

+GtkCTreeNode *gtkut_ctree_find_collapsed_parent
+                                       (GtkCTree       *ctree,
+                                        GtkCTreeNode   *node);

 void gtkut_ctree_set_focus_row         (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);
 void gtkut_clist_set_focus_row         (GtkCList       *clist,
 void gtkut_ctree_set_focus_row         (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);
 void gtkut_clist_set_focus_row         (GtkCList       *clist,