claws.git
17 years agomatcher grammar: in condition, "execute" is changed to "test" (solve a bug)
Hoà Viêt Dinh [Wed, 17 Sep 2003 08:59:33 +0000 (08:59 +0000)]
matcher grammar: in condition, "execute" is changed to "test" (solve a bug)

17 years agosync with 0.9.6 release
Paul Mangan [Wed, 17 Sep 2003 08:37:50 +0000 (08:37 +0000)]
sync with 0.9.6 release

17 years agosync with 0.9.5cvs8
Paul Mangan [Wed, 17 Sep 2003 07:52:30 +0000 (07:52 +0000)]
sync with 0.9.5cvs8

17 years agosync with 0.9.5cvs6
Paul Mangan [Tue, 16 Sep 2003 07:27:46 +0000 (07:27 +0000)]
sync with 0.9.5cvs6

17 years agosync with 0.9.5cvs5
Paul Mangan [Mon, 15 Sep 2003 06:32:34 +0000 (06:32 +0000)]
sync with 0.9.5cvs5

17 years ago* src/inc.c
Alfons Hoogervorst [Sun, 14 Sep 2003 18:51:28 +0000 (18:51 +0000)]
* src/inc.c
make "Go to inbox after receiving new mail" again;
regression of a sync, restored to sylpheed main
behaviour. (misses still some bits)

17 years ago* src/prefs_filtering_action.c
Alfons Hoogervorst [Sun, 14 Sep 2003 15:29:05 +0000 (15:29 +0000)]
* src/prefs_filtering_action.c
o add proper message if empty execute command line
o don't select first action item after registering a
  new action to prevent (what seems to be a GTK) bug
          #36, "filtering will only accept one action change
  per invocation".

17 years ago* src/prefs_filtering.c
Alfons Hoogervorst [Sun, 14 Sep 2003 12:50:57 +0000 (12:50 +0000)]
* src/prefs_filtering.c
* src/prefs_filtering_action.c
* src/prefs_matcher.c
fix function signature for key_pressed_event signal handlers

17 years ago* src/mainwindow.c
Alfons Hoogervorst [Sun, 14 Sep 2003 11:07:37 +0000 (11:07 +0000)]
* src/mainwindow.c
fix regression caused by fix for invalid bug #7
(should fix #246, "Multiple selections are deselected when
moving from search window to main window")

17 years ago* src/actions.[ch]
Alfons Hoogervorst [Sun, 14 Sep 2003 10:28:01 +0000 (10:28 +0000)]
* src/actions.[ch]
* src/filtering.[ch]
* src/prefs_actions.c
allow `filtering actions` in actions; only for advanced users
right now: try for example, "%as{mark color 2}"

17 years agoupdate Polish translation, add Simplified Chinese translation
Paul Mangan [Sat, 13 Sep 2003 05:50:24 +0000 (05:50 +0000)]
update Polish translation, add Simplified Chinese translation

17 years ago* src/summaryview.c
Alfons Hoogervorst [Fri, 12 Sep 2003 18:46:15 +0000 (18:46 +0000)]
* src/summaryview.c
don't open separate message views when View | Separate message view
is active
(please look carefully for any navigation regressions)

17 years ago* src/mainwindow.c
Alfons Hoogervorst [Thu, 11 Sep 2003 20:57:08 +0000 (20:57 +0000)]
* src/mainwindow.c
make default message view, opened by View | Separate message
view, look like a claws message view (which includes a menu
bar and a toolbar)
(fixes bug #298, "message view loses tool bar")

17 years ago0.9.5claws6
Christoph Hohmann [Thu, 11 Sep 2003 13:26:30 +0000 (13:26 +0000)]
0.9.5claws6

* src/folderview.c
        fix double deleting of newsgroup folders

(closes Bug 305 crash after deleting of a newsgroup)

17 years agofinish the sync with 0.9.5cvs2
Paul Mangan [Thu, 11 Sep 2003 11:15:23 +0000 (11:15 +0000)]
finish the sync with 0.9.5cvs2

17 years ago0.9.5claws4
Christoph Hohmann [Thu, 11 Sep 2003 10:50:21 +0000 (10:50 +0000)]
0.9.5claws4

* src/compose.c
* src/rfc2015.c
* src/common/utils.h
        fix last sync

17 years agosync with 0.9.5cvs4
Paul Mangan [Thu, 11 Sep 2003 08:09:42 +0000 (08:09 +0000)]
sync with 0.9.5cvs4

17 years agoadd an extra note
Paul Mangan [Thu, 11 Sep 2003 07:51:36 +0000 (07:51 +0000)]
add an extra note

17 years agosync with 0.9.5cvs2
Paul Mangan [Thu, 11 Sep 2003 07:48:09 +0000 (07:48 +0000)]
sync with 0.9.5cvs2

17 years agosync with 0.9.5cvs3
Paul Mangan [Thu, 11 Sep 2003 06:25:05 +0000 (06:25 +0000)]
sync with 0.9.5cvs3

17 years ago0.9.5claws released gtk2_000 rel_0_9_5
Paul Mangan [Wed, 10 Sep 2003 16:38:28 +0000 (16:38 +0000)]
0.9.5claws released

17 years agoadd missing files to src/Makefile.am
Paul Mangan [Wed, 10 Sep 2003 16:15:52 +0000 (16:15 +0000)]
add missing files to src/Makefile.am

17 years agoupdated French translations
Melvin Hadasht [Wed, 10 Sep 2003 10:51:50 +0000 (10:51 +0000)]
updated French translations

17 years agoupdate Spanish, Slovak, and Serbian translations
Paul Mangan [Wed, 10 Sep 2003 06:31:46 +0000 (06:31 +0000)]
update Spanish, Slovak, and Serbian translations

17 years agoupdated German translation
Jens Oberender [Tue, 9 Sep 2003 22:15:14 +0000 (22:15 +0000)]
updated German translation

17 years ago0.9.4claws75
Christoph Hohmann [Tue, 9 Sep 2003 19:56:37 +0000 (19:56 +0000)]
0.9.4claws75

* src/folder.c
        free item->prefs in folder_item_destroy

17 years ago* src/folderview.c
Alfons Hoogervorst [Tue, 9 Sep 2003 19:49:02 +0000 (19:49 +0000)]
* src/folderview.c
o proper check for root node sorting
o remove unnecessary gtk_ctree_remove_node

(should fix bug #300, "crash while moving folder")

17 years ago0.9.4claws73
Christoph Hohmann [Mon, 8 Sep 2003 12:41:29 +0000 (12:41 +0000)]
0.9.4claws73

* src/folderview.c
        o fix double adding of IMAP FolderItems to GtkCTree
        o fix crash then mbox folder is removed

17 years ago0.9.4claws72
Christoph Hohmann [Mon, 8 Sep 2003 11:41:03 +0000 (11:41 +0000)]
0.9.4claws72

* src/folder.c
* src/folderview.c
* src/mainwindow.c
        fix new folder notification

* src/mbox_folder.c
        fix cache path

17 years ago0.9.4claws71
Christoph Hohmann [Mon, 8 Sep 2003 10:33:11 +0000 (10:33 +0000)]
0.9.4claws71

* src/compose.c
        replace '\n' and '\r' before removing trailing spaces

* src/folder.[ch]
* src/folderview.c
        add information about new or removed items in folder tree change
        notification and use this in folderview to add and remove only
        the appected items and not refresh the whole tree

17 years agoLDAP static search
Match Grun [Sun, 7 Sep 2003 19:31:26 +0000 (19:31 +0000)]
LDAP static search

17 years agoLDAP static search.
Match Grun [Sun, 7 Sep 2003 19:28:56 +0000 (19:28 +0000)]
LDAP static search.

17 years agoNew icons for LDAP static search
Match Grun [Sun, 7 Sep 2003 19:25:35 +0000 (19:25 +0000)]
New icons for LDAP static search

17 years ago* src/summaryview.c
Alfons Hoogervorst [Sun, 7 Sep 2003 09:24:47 +0000 (09:24 +0000)]
* src/summaryview.c
abandon setting usize for messageview because it gives layout problems
with the quick search bar and the headerview; fixes assorted UI glitches:

o bug #148, "Toggling of quick-search bar reduces index view area"
o bug #280, "Window resiizes for line length but does not revert"

17 years ago0.9.4claws68
Christoph Hohmann [Sun, 7 Sep 2003 00:19:16 +0000 (00:19 +0000)]
0.9.4claws68

* src/compose.c
        o make sure we don't have any newlines in header values
        o check custom headers for spaces and newlines and ignore
          malformed header names

17 years ago0.9.4claws67
Christoph Hohmann [Sat, 6 Sep 2003 23:18:53 +0000 (23:18 +0000)]
0.9.4claws67

* src/folder.c
* src/folderview.c
        invoke notification hook for folder tree changes after append
        and remove folder

(closes Bug 294 Crash while moving folder with many subdirectories)

17 years ago0.9.4claws66
Christoph Hohmann [Sat, 6 Sep 2003 18:52:29 +0000 (18:52 +0000)]
0.9.4claws66

* src/folder.c
        destroy folder's MsgCache if FolderItem is removed to make sure
        it is not saved when the FolderItem is destroyed

17 years ago0.9.4claws65
Christoph Hohmann [Sat, 6 Sep 2003 18:26:09 +0000 (18:26 +0000)]
0.9.4claws65

* src/plugins/clamav/clamav_plugin.c
        fix copy & paste bug

17 years agoforgot to add check if the message that is opened in the messageview is
Christoph Hohmann [Fri, 5 Sep 2003 21:24:01 +0000 (21:24 +0000)]
forgot to add check if the message that is opened in the messageview is
really meant in the notification

17 years ago0.9.4claws64
Christoph Hohmann [Fri, 5 Sep 2003 21:07:17 +0000 (21:07 +0000)]
0.9.4claws64

* src/folder.c
* src/messageview.[ch]
* src/procmsg.[ch]
* src/summaryview.c
        extend MSGINFO_UPDATE_HOOK to send delete notifications. Used
        by MessageView to clear it when the message is deleted. Should
        work even if messages are deleted in MainWindow or by
        processing.

17 years agofix version number
Paul Mangan [Fri, 5 Sep 2003 15:41:24 +0000 (15:41 +0000)]
fix version number

17 years ago* src/messageview.c
Alfons Hoogervorst [Fri, 5 Sep 2003 14:32:50 +0000 (14:32 +0000)]
* src/messageview.c
deleting a message in a message view frees its msginfo, make
messageview_update_all() aware of that (should fix bug #293,
"deleting message caused crash

17 years agoImprove synchronous action exit code (fixes long delay after action exit on RH9
Melvin Hadasht [Fri, 5 Sep 2003 08:49:13 +0000 (08:49 +0000)]
Improve synchronous action exit code (fixes long delay after action exit on RH9

17 years ago0.9.4claws61
Christoph Hohmann [Thu, 4 Sep 2003 20:35:23 +0000 (20:35 +0000)]
0.9.4claws61

* src/compose.c
* src/rfc2015.c
* src/common/utils.[ch]
        add util function to create mime boundary and use it
        in compose and gpg code

17 years ago* src/folder.c
Alfons Hoogervorst [Thu, 4 Sep 2003 18:51:58 +0000 (18:51 +0000)]
* src/folder.c
source folder item's GNode should already have been freed in
a previous call to src->folder->klass->remove_folder()
(should fix bug #287, "crash when moving folders")

17 years agofix compile error
Thorsten Maerz [Wed, 3 Sep 2003 16:48:16 +0000 (16:48 +0000)]
fix compile error

17 years ago0.9.4claws58
Christoph Hohmann [Wed, 3 Sep 2003 11:14:14 +0000 (11:14 +0000)]
0.9.4claws58

* src/plugins/spamassassin/spamassassin.[ch]
* src/plugins/spamassassin/spamassassin_gtk.c
        add timeout config option

17 years agoadd Slovak translation
Paul Mangan [Wed, 3 Sep 2003 10:11:29 +0000 (10:11 +0000)]
add Slovak translation

17 years agoClamAV plugin gui tweaks
Paul Mangan [Wed, 3 Sep 2003 09:23:20 +0000 (09:23 +0000)]
ClamAV plugin gui tweaks

17 years ago* src/gtk/filesel.c
Alfons Hoogervorst [Tue, 2 Sep 2003 19:12:07 +0000 (19:12 +0000)]
* src/gtk/filesel.c
remember last used dir when attaching multiple files (should fix
bug #290, "Attach File does not remember directory")

17 years agoupdate Spanish translation
Paul Mangan [Mon, 1 Sep 2003 19:22:32 +0000 (19:22 +0000)]
update Spanish translation

17 years ago* src/gtk/gtkaspell.[ch]
Alfons Hoogervorst [Mon, 1 Sep 2003 18:44:17 +0000 (18:44 +0000)]
* src/gtk/gtkaspell.[ch]
be pedantic and strict and use const gchar * instead of guchar *

17 years ago* src/mainwindow.c
Alfons Hoogervorst [Mon, 1 Sep 2003 18:36:27 +0000 (18:36 +0000)]
* src/mainwindow.c
* src/summaryviewc.
re-enable Save As when multiple messages are selected

17 years agog_free(trimmed_uri);
Paul Mangan [Mon, 1 Sep 2003 10:51:48 +0000 (10:51 +0000)]
g_free(trimmed_uri);

17 years agosync with 0.9.4cvs13
Paul Mangan [Mon, 1 Sep 2003 10:36:33 +0000 (10:36 +0000)]
sync with 0.9.4cvs13

17 years agotrim uri before sending to the statusbar
Paul Mangan [Mon, 1 Sep 2003 07:31:32 +0000 (07:31 +0000)]
trim uri before sending to the statusbar

17 years agosync with 0.9.4cvs12
Paul Mangan [Mon, 1 Sep 2003 07:04:41 +0000 (07:04 +0000)]
sync with 0.9.4cvs12

17 years ago0.9.4claws47
Christoph Hohmann [Sat, 30 Aug 2003 19:35:12 +0000 (19:35 +0000)]
0.9.4claws47

* src/compose.c
* src/folder_item_prefs.[ch]
* src/prefs_folder_item.c
* src/gtk/gtkaspell.[ch]
        commit per folder dictionary patch by
        Paul Evans <nerd@freeuk.com>

17 years ago0.9.4claws46
Christoph Hohmann [Sat, 30 Aug 2003 16:22:57 +0000 (16:22 +0000)]
0.9.4claws46

* src/plugins/spamassassin/spamassassin_gtk.c
* src/plugins/spamassassin/spamassassin_gtk.glade
        reduce GUI clutter by placing hints into tooltips

17 years agoadd 'Content-Disposition: inline' to a text/plain part when using PGP/MIME signing
Paul Mangan [Sat, 30 Aug 2003 08:19:05 +0000 (08:19 +0000)]
add 'Content-Disposition: inline' to a text/plain part when using PGP/MIME signing

17 years agoreduce GUI clutter by placing hints into tooltips
Paul Mangan [Sat, 30 Aug 2003 04:52:49 +0000 (04:52 +0000)]
reduce GUI clutter by placing hints into tooltips

17 years agoadd forgotten version change
Paul Mangan [Fri, 29 Aug 2003 16:18:07 +0000 (16:18 +0000)]
add forgotten version change

17 years ago0.9.4claws43
Christoph Hohmann [Fri, 29 Aug 2003 13:48:48 +0000 (13:48 +0000)]
0.9.4claws43

* configure.ac
        fix bug found by Ivan Rayner <ivanr@sgi.com>

* src/stock_pixmap.c
        change unecessary warning into a debug message

* src/plugins/clamav/Makefile.am
        Fix error "-I$(CLAMAV_LIBS)"

17 years ago0.9.4claws42
Christoph Hohmann [Fri, 29 Aug 2003 13:16:14 +0000 (13:16 +0000)]
0.9.4claws42

* intl/Makefile.in
* src/Makefile.am
* src/matcher.h
* src/common/Makefile.am
* src/common/passcrypt.c
        commit fixes and patches for some of the IRIX problems found by
        Ivan Rayner <ivanr@sgi.com>

17 years ago0.9.4claws42
Christoph Hohmann [Fri, 29 Aug 2003 12:56:55 +0000 (12:56 +0000)]
0.9.4claws42

* intl/Makefile.in
* src/Makefile.am
* src/matcher.h
* src/common/Makefile.am
* src/common/passcrypt.c
        commit fixes and patches for some of the IRIX problems found by
        Ivan Rayner <ivanr@sgi.com>

17 years agosync with 0.9.4cvs11
Paul Mangan [Fri, 29 Aug 2003 07:55:58 +0000 (07:55 +0000)]
sync with 0.9.4cvs11

17 years ago0.9.4claws40
Christoph Hohmann [Thu, 28 Aug 2003 19:17:51 +0000 (19:17 +0000)]
0.9.4claws40

* src/folderview.c
        fix bug that the current summary settings were copied to the
        wrong folder item, when the folder item prefs are opened.
        Copying is not required because summary settings and
        folder_item_prefs do not contain the same settings

17 years agofix compile error
Thorsten Maerz [Wed, 27 Aug 2003 17:23:25 +0000 (17:23 +0000)]
fix compile error

17 years agosync with 0.9.4cvs9
Paul Mangan [Tue, 26 Aug 2003 07:13:40 +0000 (07:13 +0000)]
sync with 0.9.4cvs9

17 years agosync with 0.9.4cvs8
Paul Mangan [Mon, 25 Aug 2003 14:14:47 +0000 (14:14 +0000)]
sync with 0.9.4cvs8

17 years ago0.9.4claws36
Christoph Hohmann [Sun, 24 Aug 2003 16:33:02 +0000 (16:33 +0000)]
0.9.4claws36

* src/prefs_filtering.c
        shouldn't remove items from a GSList while iterating over the
        list (makes cur invalid and cur->next not accessable)

(closes Bug 272 i deleted an folder and some seconds later sylpheed
 crashed)

17 years agoreadd BUILT_SOURCES
Christoph Hohmann [Sun, 24 Aug 2003 11:55:45 +0000 (11:55 +0000)]
readd BUILT_SOURCES

17 years agoclean up src/Makefile.am
Christoph Hohmann [Sun, 24 Aug 2003 10:23:51 +0000 (10:23 +0000)]
clean up src/Makefile.am

17 years ago0.9.4claws35
Christoph Hohmann [Fri, 22 Aug 2003 22:49:07 +0000 (22:49 +0000)]
0.9.4claws35

* src/news.c
        news folders should be scanned when opened

17 years ago0.9.4claws34
Christoph Hohmann [Fri, 22 Aug 2003 15:06:56 +0000 (15:06 +0000)]
0.9.4claws34

* src/prefs_folder_item.c
        use macro to assign strings that always frees the old string

* src/gtk/gtkaspell.[ch]
        add gtkaspell_set_dictionary_menu_active_item() to set active
        item in dictionary option menu

* src/prefs_spelling.c
        use gtkaspell_set_dictionary_menu_active_item() to select
        dictionary

17 years ago0.9.4claws33
Christoph Hohmann [Thu, 21 Aug 2003 20:08:27 +0000 (20:08 +0000)]
0.9.4claws33

* src/folder.[ch]
* src/imap.c
* src/mbox_folder.c
* src/mh.c
* src/news.c
        optimize folder system

* src/gtk/gtkstext.c
        fix division by zero when font has 0 width for ' '

17 years agosync with 0.9.4cvs7
Paul Mangan [Thu, 21 Aug 2003 08:45:43 +0000 (08:45 +0000)]
sync with 0.9.4cvs7

17 years agofixes Bug #281 'in src/manual.c URL for manuals and FAQ wrong'
Paul Mangan [Tue, 19 Aug 2003 07:56:18 +0000 (07:56 +0000)]
fixes Bug #281 'in src/manual.c URL for manuals and FAQ wrong'

17 years agoupdate Bulgarian translation
Paul Mangan [Tue, 19 Aug 2003 06:45:35 +0000 (06:45 +0000)]
update Bulgarian translation

17 years ago* src/mimeview.[ch]
Luke Plant [Mon, 18 Aug 2003 17:08:48 +0000 (17:08 +0000)]
* src/mimeview.[ch]
* src/gtk/gtkvscrollbutton.[ch]
o removed gtk_vscrollbutton_reset() (reasons: reduce
  dependencies; do it the GTK way; reduce code -14/+2 lines)
o removed horizontal separator between icons

17 years ago0.9.4claws28
Christoph Hohmann [Sun, 17 Aug 2003 12:56:36 +0000 (12:56 +0000)]
0.9.4claws28

* src/procmsg.c
        no subject threading when the subject has no reply prefix

17 years ago0.9.4claws27
Christoph Hohmann [Sat, 16 Aug 2003 16:28:01 +0000 (16:28 +0000)]
0.9.4claws27

* src/mainwindow.c
        remember and restore window sizes and position when the main
        window is hidden or shown

(closes Bug 274 Window size in 0.9.4claws18 not remembered when
 minimised/reopened using trayicon)

17 years agoadd #include "defs.h"
Paul Mangan [Sat, 16 Aug 2003 16:17:06 +0000 (16:17 +0000)]
add #include "defs.h"

17 years agocosmetic changes
Paul Mangan [Sat, 16 Aug 2003 07:17:31 +0000 (07:17 +0000)]
cosmetic changes

17 years ago0.9.4claws24
Christoph Hohmann [Fri, 15 Aug 2003 16:42:11 +0000 (16:42 +0000)]
0.9.4claws24

* src/news.c
        complete last change (forgot some changes)

17 years ago0.9.4claws23
Christoph Hohmann [Fri, 15 Aug 2003 14:51:30 +0000 (14:51 +0000)]
0.9.4claws23

* src/news.c
        o check number of messages and don't return a 0 message
          when no messages are available
        o don't parse xref header anymore

(closes Bug 203 I'm not getting any news)

17 years agoupdate and define claws bugzilla location
Paul Mangan [Fri, 15 Aug 2003 08:23:13 +0000 (08:23 +0000)]
update and define claws bugzilla location

17 years agoupdate Russian translation
Paul Mangan [Fri, 15 Aug 2003 07:45:26 +0000 (07:45 +0000)]
update Russian translation

17 years agoadd prefs_spelling.c to POTFILES.in
Christoph Hohmann [Thu, 14 Aug 2003 20:33:25 +0000 (20:33 +0000)]
add prefs_spelling.c to POTFILES.in

17 years agoupdate subject threading description
Christoph Hohmann [Thu, 14 Aug 2003 19:56:04 +0000 (19:56 +0000)]
update subject threading description

17 years ago0.9.4claws20
Christoph Hohmann [Thu, 14 Aug 2003 19:41:35 +0000 (19:41 +0000)]
0.9.4claws20

* src/procmsg.c
        fix search for oldest node in subject threading

17 years ago0.9.4claws19
Christoph Hohmann [Thu, 14 Aug 2003 19:16:22 +0000 (19:16 +0000)]
0.9.4claws19

* src/procmsg.c
* src/common/utils.h
        add possibility to check all nodes with the same subject for
        subject threading, not only the oldest node. Should not break
        threads anymore if the oldest node is thread_by_subject_max_age
        days older then parent, because it can now find a child of
        oldest node as new parent.

17 years ago0.9.4claws18
Christoph Hohmann [Mon, 11 Aug 2003 21:47:44 +0000 (21:47 +0000)]
0.9.4claws18

* src/plugins/spamassassin/spamassassin.c
        run spam check in background process

17 years ago* src/summaryview.c
Alfons Hoogervorst [Sun, 10 Aug 2003 21:06:11 +0000 (21:06 +0000)]
* src/summaryview.c
make `Select All' sensitive too

17 years ago0.9.4claws16
Christoph Hohmann [Sun, 10 Aug 2003 20:28:17 +0000 (20:28 +0000)]
0.9.4claws16

* src/imap.c
        add more checks in imap_close

17 years agoadded source and hook descriptions
Thorsten Maerz [Sun, 10 Aug 2003 12:23:59 +0000 (12:23 +0000)]
added source and hook descriptions

17 years ago* src/prefs_spelling.c
Alfons Hoogervorst [Sat, 9 Aug 2003 19:29:33 +0000 (19:29 +0000)]
* src/prefs_spelling.c
compile spelling ui only if requested

17 years ago* src/gtk/prefswindow.c
Alfons Hoogervorst [Sat, 9 Aug 2003 19:22:32 +0000 (19:22 +0000)]
* src/gtk/prefswindow.c
make it compile

17 years ago0.9.4claws13
Christoph Hohmann [Sat, 9 Aug 2003 18:38:38 +0000 (18:38 +0000)]
0.9.4claws13

* src/prefs_spelling.c
* src/gtk/prefswindow.[ch]
* src/plugins/clamav/clamav_plugin_gtk.c
* src/plugins/spamassassin/spamassassin_gtk.c
        sort prefs pages by heighest weight in tree

17 years agosync with 0.9.4cvs6
Paul Mangan [Sat, 9 Aug 2003 06:26:27 +0000 (06:26 +0000)]
sync with 0.9.4cvs6