sync with 0.7.5cvs9

diff --git a/ChangeLog b/ChangeLog
index ded31eedfea821c243447942b08d348ee7442a79..7f71c988d97140f6e4296ff7cc05e33251c8aa93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-07
+
+       * src/summary_search.c: summary_search_execute(): unlock while
+         selecting summary row (thanks to Martin Schaaf).
+

 2002-05-02
 
        * src/compose.c: compose_write_headers(): quote self address name
 2002-05-02
 
        * src/compose.c: compose_write_headers(): quote self address name


@@ -7,6 +12,7 @@
        * src/compose.c: compose_queue(): check if queue folder exists.
        * src/imap.c: QUOTE_IF_REQUIRED(): quote also other IMAP special
          characters.
        * src/compose.c: compose_queue(): check if queue folder exists.
        * src/imap.c: QUOTE_IF_REQUIRED(): quote also other IMAP special
          characters.

+         imap_open(): removed an unrequired argument.

 
 2002-04-25
 
 
 2002-04-25
 

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f331b4c3518254cd899f566b01c60f74601bf9ad..27a7222f2865861595b5083a6c3323780533c0d0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-05-07 [paul]      0.7.5claws11
+
+       * sync with 0.7.5cvs9
+               see ChangeLog entry 2002-05-07
+

 2002-05-06 [paul]      0.7.5claws10
 
        * src/messageview.c
 2002-05-06 [paul]      0.7.5claws10
 
        * src/messageview.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 950b78661023afd7fa3e12012ff6376acc9fa847..0f8c3459e41aa9f2c2e75f596b76d887336290d5 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2002-05-07
+
+       * src/summary_search.c: summary_search_execute(): ¥µ¥Þ¥ê¤Î¹Ô¤òÁªÂò
+         ¤¹¤ë¤È¤­¤Ë¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤è¤¦¤Ë¤·¤¿(Martin Schaaf ¤µ¤ó thanks)¡£
+

 2002-05-02
 
        * src/compose.c: compose_write_headers(): ɬÍפǤ¢¤ì¤Ð¼«Ê¬¤Î¥¢¥É¥ì¥¹
 2002-05-02
 
        * src/compose.c: compose_write_headers(): ɬÍפǤ¢¤ì¤Ð¼«Ê¬¤Î¥¢¥É¥ì¥¹


@@ -8,6 +13,7 @@
        * src/compose.c: compose_queue(): queue ¥Õ¥©¥ë¥À¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¡£
        * src/imap.c: QUOTE_IF_REQUIRED(): ¤½¤Î¾¤Î IMAP ¥¹¥Ú¥·¥ã¥ë¥­¥ã¥é¥¯¥¿
          ¤â°úÍÑÉä¤Ç°Ï¤à¤è¤¦¤Ë¤·¤¿¡£
        * src/compose.c: compose_queue(): queue ¥Õ¥©¥ë¥À¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¡£
        * src/imap.c: QUOTE_IF_REQUIRED(): ¤½¤Î¾¤Î IMAP ¥¹¥Ú¥·¥ã¥ë¥­¥ã¥é¥¯¥¿
          ¤â°úÍÑÉä¤Ç°Ï¤à¤è¤¦¤Ë¤·¤¿¡£

+         imap_open(): ÉÔÍפʰú¿ô¤òºï½ü¡£

 
 2002-04-25
 
 
 2002-04-25
 

diff --git a/configure.in b/configure.in
index ad4432b6c5131a33119eee105758f3de5b8b872b..b0500b5fd66e471da93985190fddcf0efc8d7b41 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws10
+EXTRA_VERSION=claws11

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

diff --git a/src/summary_search.c b/src/summary_search.c
index 8ae35104ca1ec3b35698c37443595910e1931499..60e517d618dd821f2bd1b9fa9ec2be5d915c0b36 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -355,8 +355,10 @@ static void summary_search_execute(GtkButton *button, gpointer data)
                                gtk_ctree_select(ctree, node);
                        else {
                                if (summaryview->msg_is_toggled_on) {
                                gtk_ctree_select(ctree, node);
                        else {
                                if (summaryview->msg_is_toggled_on) {

+                                       summary_unlock(summaryview);

                                        summary_select_node
                                                (summaryview, node, TRUE, TRUE);
                                        summary_select_node
                                                (summaryview, node, TRUE, TRUE);

+                                       summary_lock(summaryview);

                                        if (body_matched) {
                                                messageview_search_string
                                                        (summaryview->messageview,
                                        if (body_matched) {
                                                messageview_search_string
                                                        (summaryview->messageview,