sync with sylpheed 0.4.99cvs4
authorPaul Mangan <paul@claws-mail.org>
Sun, 3 Jun 2001 10:34:31 +0000 (10:34 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sun, 3 Jun 2001 10:34:31 +0000 (10:34 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/folderview.c
src/mimeview.c
src/summaryview.c

index 4186a0c..616b709 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-02
+
+       * src/folderview.c: folderview_selected()
+         src/mimeview.c: mimeview_selected(): ungrab the mouse event.
+       * src/summaryview.c: summary_show(): process the left marks if any.
+
 2001-05-27
 
        * src/passphrase.c: enclosed with #if USE_GPGME.
index 9d206a0..f2297d8 100644 (file)
@@ -1,3 +1,7 @@
+2001-06-03 [paul]
+
+        * sync with sylpheed 0.4.99cvs4
+
 2001-06-03 [alfons]
 
        * src/headerwindow.c:
index acf7056..0e40745 100644 (file)
@@ -1,3 +1,11 @@
+2001-06-02
+
+       * src/folderview.c: folderview_selected()
+         src/mimeview.c: mimeview_selected(): ¥Þ¥¦¥¹¥¤¥Ù¥ó¥È¤ÎÊ᪤ò²ò½ü
+         ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/summaryview.c: summary_show(): ¥Þ¡¼¥¯¤¬»Ä¤Ã¤Æ¤¤¤ì¤Ð½èÍý¤¹¤ë
+         ¤è¤¦¤Ë¤·¤¿¡£
+
 2001-05-27
 
        * src/passphrase.c: #if USE_GPGME ¤Ç°Ï¤Ã¤¿¡£
index 4256289..6d7659f 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=4
 MICRO_VERSION=99
 INTERFACE_AGE=99
 BINARY_AGE=99
-EXTRA_VERSION=claws3
+EXTRA_VERSION=claws4
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index ee55891..9f248fd 100644 (file)
@@ -1257,8 +1257,9 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {
        static gboolean can_select = TRUE;      /* exclusive lock */
+       gboolean opened;
        FolderItem *item;
-       gchar * s = NULL;
+       GtkCTreeNode *prev_row;
 
        folderview->selected = row;
 
@@ -1290,9 +1291,23 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
            !GTK_CTREE_ROW(folderview->opened)->children)
                gtk_ctree_collapse(ctree, folderview->opened);
 
+       /* ungrab the mouse event */
+       if (GTK_WIDGET_HAS_GRAB(ctree)) {
+               gtk_grab_remove(GTK_WIDGET(ctree));
+               if (gdk_pointer_is_grabbed())
+                       gdk_pointer_ungrab(GDK_CURRENT_TIME);
+       }
+
+       prev_row = folderview->opened;
        folderview->opened = row;
 
-       summary_show(folderview->summaryview, item, FALSE);
+       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);
+       }
 
        can_select = TRUE;
 }
index cf71cbe..edb9781 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
@@ -150,7 +150,7 @@ MimeView *mimeview_create(void)
        gtk_widget_set_usize(scrolledwin, -1, 80);
 
        ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
-       gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);//SINGLE);
+       gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
        gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_SIZE,
                                           GTK_JUSTIFY_RIGHT);
@@ -477,6 +477,13 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
        partinfo = gtk_ctree_node_get_row_data(ctree, node);
        if (!partinfo) return;
 
+       /* ungrab the mouse event */
+       if (GTK_WIDGET_HAS_GRAB(ctree)) {
+               gtk_grab_remove(GTK_WIDGET(ctree));
+               if (gdk_pointer_is_grabbed())
+                       gdk_pointer_ungrab(GDK_CURRENT_TIME);
+       }
+
        switch (partinfo->mime_type) {
        case MIME_TEXT:
        case MIME_TEXT_HTML:
index 6d62ca4..4ae8874 100644 (file)
@@ -660,9 +660,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        is_refresh = FALSE;
        }
 
-#if 0
        /* process the marks if any */
-       if (summaryview->deleted > 0 || summaryview->moved > 0) {
+       if (summaryview->moved > 0 || summaryview->copied > 0) {
                AlertValue val;
 
                val = alertpanel(_("Process mark"),
@@ -675,9 +674,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                else
                        return FALSE;
        } else
-#endif
-               if (!is_refresh)
-                       summary_write_cache(summaryview);
+               summary_write_cache(summaryview);
 
        gtk_clist_freeze(GTK_CLIST(ctree));