sync with sylpheed 0.4.99cvs5
authorPaul Mangan <paul@claws-mail.org>
Tue, 5 Jun 2001 08:46:13 +0000 (08:46 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 5 Jun 2001 08:46:13 +0000 (08:46 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/folderview.c
src/headerwindow.c
src/smtp.c
src/summaryview.c

index 616b709..21c6d9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-06-05
+
+       * src/folderview.c: folderview_selected()
+         src/summaryview.c: summary_show(): fixed a bug that updated wrong
+         folder when remaining marks were processed.
+
+2001-06-04
+
+       * src/headerwindow.c: headerwindow_show_cb(): always try to show
+         msginfo, and use the selected message, not the displayed one.
+       * src/smtp.c: smtp_ok(): fixed sock_gets() error handling.
+
 2001-06-02
 
        * src/folderview.c: folderview_selected()
index db0869f..4dba5fc 100644 (file)
@@ -1,3 +1,7 @@
+2001-06-05 [paul]
+
+        * sync with sylpheed 0.4.99cvs5
+
 2001-06-05 [hoa]
 
        * added src/quote_fmt.y
index 0e40745..c35156e 100644 (file)
@@ -1,3 +1,16 @@
+2001-06-05
+
+       * src/folderview.c: folderview_selected()
+         src/summaryview.c: summary_show(): »Ä¤Ã¤¿¥Þ¡¼¥¯¤ò½èÍý¤·¤¿¾ì¹ç¤Ë
+         ¸í¤Ã¤¿¥Õ¥©¥ë¥À¤ò¹¹¿·¤·¤Æ¤¤¤¿¥Ð¥°¤ò½¤Àµ¡£
+
+2001-06-04
+
+       * src/headerwindow.c: headerwindow_show_cb(): ¾ï¤Ë msginfo ¤òɽ¼¨
+         ¤¹¤ë¤è¤¦¤Ë¤·¡¢É½¼¨¤µ¤ì¤Æ¤¤¤ë¥á¥Ã¥»¡¼¥¸¤Ç¤Ï¤Ê¤¯ÁªÂò¤µ¤ì¤Æ¤¤¤ë¤â¤Î
+         ¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/smtp.c: smtp_ok(): sock_gets() ¤Î¥¨¥é¡¼½èÍý¤ò½¤Àµ¡£
+
 2001-06-02
 
        * src/folderview.c: folderview_selected()
index 6d7659f..dd21f82 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=4
 MICRO_VERSION=99
 INTERFACE_AGE=99
 BINARY_AGE=99
-EXTRA_VERSION=claws4
+EXTRA_VERSION=claws5
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index 9f248fd..5770db7 100644 (file)
@@ -1259,7 +1259,6 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        static gboolean can_select = TRUE;      /* exclusive lock */
        gboolean opened;
        FolderItem *item;
-       GtkCTreeNode *prev_row;
 
        folderview->selected = row;
 
@@ -1298,16 +1297,13 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
        }
 
-       prev_row = folderview->opened;
-       folderview->opened = row;
-
        opened = summary_show(folderview->summaryview, item, FALSE);
 
        if (!opened) {
-               folderview->opened = prev_row;
-               gtk_ctree_select(ctree, prev_row);
-               gtkut_ctree_set_focus_row(ctree, prev_row);
-       }
+               gtk_ctree_select(ctree, folderview->opened);
+               gtkut_ctree_set_focus_row(ctree, folderview->opened);
+       } else
+               folderview->opened = row;
 
        can_select = TRUE;
 }
index dc42f56..009d71f 100644 (file)
@@ -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
@@ -159,11 +159,11 @@ void header_window_show_cb(gpointer data, guint action, GtkWidget *widget)
        GtkCTreeNode *node = mainwin->summaryview->selected;
        MsgInfo *msginfo;
 
-       g_return_if_fail(node != NULL);
-
-       msginfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mainwin->summaryview->ctree), node);
-       header_window_show(mainwin->headerwin, msginfo);
+       if (node) {
+               msginfo = gtk_ctree_node_get_row_data
+                       (GTK_CTREE(mainwin->summaryview->ctree), node);
+               header_window_show(mainwin->headerwin, msginfo);
+       }
 
        gtk_widget_hide(mainwin->headerwin->window);
        gtk_widget_show(mainwin->headerwin->window);
index f4c171a..b5888b2 100644 (file)
@@ -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
index 4ae8874..422fbaa 100644 (file)
@@ -676,6 +676,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        } else
                summary_write_cache(summaryview);
 
+       summaryview->folderview->opened = summaryview->folderview->selected;
+
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        summary_clear_list(summaryview);
@@ -770,13 +772,13 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                           GTK_SIGNAL_FUNC(summary_open_row), summaryview);
 
        /*connect drag and drop signal*/
-       gtk_signal_connect (GTK_OBJECT (ctree),"start_drag",
-                           GTK_SIGNAL_FUNC (summary_start_drag),
-                           summaryview);
-       gtk_signal_connect (GTK_OBJECT (ctree),"drag_data_get",
-                           GTK_SIGNAL_FUNC (summary_drag_data_get),
-                           summaryview);
-       
+       gtk_signal_connect(GTK_OBJECT (ctree),"start_drag",
+                          GTK_SIGNAL_FUNC (summary_start_drag),
+                          summaryview);
+       gtk_signal_connect(GTK_OBJECT (ctree),"drag_data_get",
+                          GTK_SIGNAL_FUNC (summary_drag_data_get),
+                          summaryview);
+
        gtk_clist_thaw(GTK_CLIST(ctree));
 
        /* sort before */