2007-07-13 [colin] 2.10.0cvs19
authorColin Leroy <colin@colino.net>
Fri, 13 Jul 2007 16:47:36 +0000 (16:47 +0000)
committerColin Leroy <colin@colino.net>
Fri, 13 Jul 2007 16:47:36 +0000 (16:47 +0000)
* src/toolbar.c
* src/toolbar.h
Rework to fit the non-deprecated API
* src/compose.c
* src/folderview.c
* src/mainwindow.c
* src/messageview.c
* src/summaryview.c
Maemo layout changes. Better toolbars,
removal of CTree headers.

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/folderview.c
src/mainwindow.c
src/messageview.c
src/summaryview.c
src/toolbar.c
src/toolbar.h

index fd0627d4028e0c4796cc35c886dc5436249d41ab..deb1a650b6d15cc53c5b2675016a6f11873036e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-13 [colin]     2.10.0cvs19
+
+       * src/toolbar.c
+       * src/toolbar.h
+               Rework to fit the non-deprecated API
+       * src/compose.c
+       * src/folderview.c
+       * src/mainwindow.c
+       * src/messageview.c
+       * src/summaryview.c
+               Maemo layout changes. Better toolbars,
+               removal of CTree headers. 
+
 2007-07-13 [paul]      2.10.0cvs18
 
        * src/gtk/colorlabel.c
index a72e531d224a20d73cc917f0a6999034a1b44562..c5bcc2ed020d5afe5c75a31f970479a6f9ba1ec8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.5.10.6 -r 1.5.10.7 COPYING;  cvs diff -u -r 1.8.2.37 -r 1.8.2.38 README;  cvs diff -u -r 1.4.2.8 -r 1.4.2.9 autogen.sh;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/gpl.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/gpl.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/gpl.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/pl/gpl.xml;  cvs diff -u -r 1.61.2.64 -r 1.61.2.65 src/account.c;  cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/account.h;  cvs diff -u -r 1.12.2.46 -r 1.12.2.47 src/action.c;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/action.h;  cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/adbookbase.h;  cvs diff -u -r 1.27.2.36 -r 1.27.2.37 src/addr_compl.c;  cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/addr_compl.h;  cvs diff -u -r 1.22.2.14 -r 1.22.2.15 src/addrbook.c;  cvs diff -u -r 1.7.2.3 -r 1.7.2.4 src/addrbook.h;  cvs diff -u -r 1.15.2.12 -r 1.15.2.13 src/addrcache.c;  cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/addrcache.h;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/addrcindex.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/addrcindex.h;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/addrclip.c;  cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/addrclip.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/addrdefs.h;  cvs diff -u -r 1.9.2.15 -r 1.9.2.16 src/addressadd.c;  cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/addressadd.h;  cvs diff -u -r 1.60.2.91 -r 1.60.2.92 src/addressbook.c;  cvs diff -u -r 1.18.2.8 -r 1.18.2.9 src/addressbook.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/addressbook_foldersel.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/addressbook_foldersel.h;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/addressitem.h;  cvs diff -u -r 1.5.10.18 -r 1.5.10.19 src/addrgather.c;  cvs diff -u -r 1.3.12.4 -r 1.3.12.5 src/addrgather.h;  cvs diff -u -r 1.6.10.15 -r 1.6.10.16 src/addrharvest.c;  cvs diff -u -r 1.4.12.5 -r 1.4.12.6 src/addrharvest.h;  cvs diff -u -r 1.28.2.27 -r 1.28.2.28 src/addrindex.c;  cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/addrindex.h;  cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/addritem.c;  cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/addritem.h;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/addrquery.c;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/addrquery.h;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/addrselect.c;  cvs diff -u -r 1.1.14.6 -r 1.1.14.7 src/addrselect.h;  cvs diff -u -r 1.17.2.35 -r 1.17.2.36 src/alertpanel.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/alertpanel.h;  cvs diff -u -r 1.2.4.16 -r 1.2.4.17 src/browseldap.c;  cvs diff -u -r 1.2.4.5 -r 1.2.4.6 src/browseldap.h;  cvs diff -u -r 1.65.2.57 -r 1.65.2.58 src/codeconv.c;  cvs diff -u -r 1.15.2.19 -r 1.15.2.20 src/codeconv.h;  cvs diff -u -r 1.382.2.393 -r 1.382.2.394 src/compose.c;  cvs diff -u -r 1.50.2.37 -r 1.50.2.38 src/compose.h;  cvs diff -u -r 1.23.2.24 -r 1.23.2.25 src/crash.c;  cvs diff -u -r 1.1.12.2 -r 1.1.12.3 src/crash.h;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/customheader.c;  cvs diff -u -r 1.2.16.5 -r 1.2.16.6 src/customheader.h;  cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/displayheader.c;  cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/displayheader.h;  cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/editaddress.c;  cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/editaddress.h;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/editaddress_other_attributes_ldap.h;  cvs diff -u -r 1.5.12.10 -r 1.5.12.11 src/editbook.c;  cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/editbook.h;  cvs diff -u -r 1.11.2.16 -r 1.11.2.17 src/editgroup.c;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/editgroup.h;  cvs diff -u -r 1.5.12.13 -r 1.5.12.14 src/editjpilot.c;  cvs diff -u -r 1.3.16.4 -r 1.3.16.5 src/editjpilot.h;  cvs diff -u -r 1.8.2.22 -r 1.8.2.23 src/editldap.c;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/editldap.h;  cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/editldap_basedn.c;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/editldap_basedn.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/edittags.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/edittags.h;  cvs diff -u -r 1.5.12.12 -r 1.5.12.13 src/editvcard.c;  cvs diff -u -r 1.3.16.4 -r 1.3.16.5 src/editvcard.h;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/enriched.c;  cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/enriched.h;  cvs diff -u -r 1.3.2.21 -r 1.3.2.22 src/exphtmldlg.c;  cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/exphtmldlg.h;  cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/expldifdlg.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/expldifdlg.h;  cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/export.c;  cvs diff -u -r 1.1.16.3 -r 1.1.16.4 src/export.h;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/exporthtml.c;  cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/exporthtml.h;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/exportldif.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/exportldif.h;  cvs diff -u -r 1.60.2.33 -r 1.60.2.34 src/filtering.c;  cvs diff -u -r 1.21.2.13 -r 1.21.2.14 src/filtering.h;  cvs diff -u -r 1.213.2.147 -r 1.213.2.148 src/folder.c;  cvs diff -u -r 1.87.2.43 -r 1.87.2.44 src/folder.h;  cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/folder_item_prefs.h;  cvs diff -u -r 1.26.2.32 -r 1.26.2.33 src/foldersel.c;  cvs diff -u -r 1.4.12.4 -r 1.4.12.5 src/foldersel.h;  cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/folderutils.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/folderutils.h;  cvs diff -u -r 1.207.2.166 -r 1.207.2.167 src/folderview.c;  cvs diff -u -r 1.20.2.20 -r 1.20.2.21 src/folderview.h;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gedit-print.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gedit-print.h;  cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/grouplistdialog.c;  cvs diff -u -r 1.3.14.4 -r 1.3.14.5 src/grouplistdialog.h;  cvs diff -u -r 1.8.2.21 -r 1.8.2.22 src/headerview.c;  cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/headerview.h;  cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/html.c;  cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/html.h;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/image_viewer.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/image_viewer.h;  cvs diff -u -r 1.179.2.175 -r 1.179.2.176 src/imap.c;  cvs diff -u -r 1.34.2.16 -r 1.34.2.17 src/imap.h;  cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/imap_gtk.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/imap_gtk.h;  cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/import.c;  cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/import.h;  cvs diff -u -r 1.14.2.15 -r 1.14.2.16 src/importldif.c;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/importldif.h;  cvs diff -u -r 1.4.12.16 -r 1.4.12.17 src/importmutt.c;  cvs diff -u -r 1.2.12.4 -r 1.2.12.5 src/importmutt.h;  cvs diff -u -r 1.1.14.16 -r 1.1.14.17 src/importpine.c;  cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/importpine.h;  cvs diff -u -r 1.149.2.74 -r 1.149.2.75 src/inc.c;  cvs diff -u -r 1.29.2.12 -r 1.29.2.13 src/inc.h;  cvs diff -u -r 1.18.2.24 -r 1.18.2.25 src/jpilot.c;  cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/jpilot.h;  cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/ldapctrl.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/ldapctrl.h;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/ldaplocate.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/ldaplocate.h;  cvs diff -u -r 1.3.2.19 -r 1.3.2.20 src/ldapquery.c;  cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/ldapquery.h;  cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/ldapserver.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/ldapserver.h;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/ldapupdate.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/ldapupdate.h;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/ldaputil.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/ldaputil.h;  cvs diff -u -r 1.12.2.13 -r 1.12.2.14 src/ldif.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/ldif.h;  cvs diff -u -r 1.3.4.5 -r 1.3.4.6 src/localfolder.c;  cvs diff -u -r 1.2.4.3 -r 1.2.4.4 src/localfolder.h;  cvs diff -u -r 1.115.2.157 -r 1.115.2.158 src/main.c;  cvs diff -u -r 1.7.2.11 -r 1.7.2.12 src/main.h;  cvs diff -u -r 1.274.2.194 -r 1.274.2.195 src/mainwindow.c;  cvs diff -u -r 1.39.2.38 -r 1.39.2.39 src/mainwindow.h;  cvs diff -u -r 1.11.2.11 -r 1.11.2.12 src/manual.c;  cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/manual.h;  cvs diff -u -r 1.75.2.42 -r 1.75.2.43 src/matcher.c;  cvs diff -u -r 1.39.2.13 -r 1.39.2.14 src/matcher.h;  cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/matcher_parser.h;  cvs diff -u -r 1.16.2.12 -r 1.16.2.13 src/matcher_parser_lex.l;  cvs diff -u -r 1.25.2.29 -r 1.25.2.30 src/matcher_parser_parse.y;  cvs diff -u -r 1.28.2.36 -r 1.28.2.37 src/mbox.c;  cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/mbox.h;  cvs diff -u -r 1.3.12.29 -r 1.3.12.30 src/message_search.c;  cvs diff -u -r 1.1.16.5 -r 1.1.16.6 src/message_search.h;  cvs diff -u -r 1.94.2.136 -r 1.94.2.137 src/messageview.c;  cvs diff -u -r 1.19.2.15 -r 1.19.2.16 src/messageview.h;  cvs diff -u -r 1.79.2.55 -r 1.79.2.56 src/mh.c;  cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/mh.h;  cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/mh_gtk.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/mh_gtk.h;  cvs diff -u -r 1.83.2.108 -r 1.83.2.109 src/mimeview.c;  cvs diff -u -r 1.20.2.20 -r 1.20.2.21 src/mimeview.h;  cvs diff -u -r 1.16.2.52 -r 1.16.2.53 src/msgcache.c;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/msgcache.h;  cvs diff -u -r 1.6.10.11 -r 1.6.10.12 src/mutt.c;  cvs diff -u -r 1.3.12.4 -r 1.3.12.5 src/mutt.h;  cvs diff -u -r 1.101.2.38 -r 1.101.2.39 src/news.c;  cvs diff -u -r 1.21.2.6 -r 1.21.2.7 src/news.h;  cvs diff -u -r 1.2.2.22 -r 1.2.2.23 src/news_gtk.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/news_gtk.h;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/noticeview.c;  cvs diff -u -r 1.3.8.7 -r 1.3.8.8 src/noticeview.h;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/partial_download.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/partial_download.h;  cvs diff -u -r 1.6.2.10 -r 1.6.2.11 src/pine.c;  cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/pine.h;  cvs diff -u -r 1.56.2.52 -r 1.56.2.53 src/pop.c;  cvs diff -u -r 1.17.2.18 -r 1.17.2.19 src/pop.h;  cvs diff -u -r 1.105.2.102 -r 1.105.2.103 src/prefs_account.c;  cvs diff -u -r 1.49.2.31 -r 1.49.2.32 src/prefs_account.h;  cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/prefs_actions.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_actions.h;  cvs diff -u -r 1.204.2.138 -r 1.204.2.139 src/prefs_common.c;  cvs diff -u -r 1.103.2.85 -r 1.103.2.86 src/prefs_common.h;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_compose_writing.h;  cvs diff -u -r 1.16.2.26 -r 1.16.2.27 src/prefs_customheader.c;  cvs diff -u -r 1.2.16.4 -r 1.2.16.5 src/prefs_customheader.h;  cvs diff -u -r 1.16.2.29 -r 1.16.2.30 src/prefs_display_header.c;  cvs diff -u -r 1.1.16.4 -r 1.1.16.5 src/prefs_display_header.h;  cvs diff -u -r 1.3.2.15 -r 1.3.2.16 src/prefs_ext_prog.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/prefs_ext_prog.h;  cvs diff -u -r 1.59.2.56 -r 1.59.2.57 src/prefs_filtering.c;  cvs diff -u -r 1.6.2.6 -r 1.6.2.7 src/prefs_filtering.h;  cvs diff -u -r 1.1.4.37 -r 1.1.4.38 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/prefs_filtering_action.h;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_folder_column.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_folder_column.h;  cvs diff -u -r 1.52.2.40 -r 1.52.2.41 src/prefs_folder_item.c;  cvs diff -u -r 1.17.2.4 -r 1.17.2.5 src/prefs_folder_item.h;  cvs diff -u -r 1.4.2.19 -r 1.4.2.20 src/prefs_fonts.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/prefs_fonts.h;  cvs diff -u -r 1.10.2.32 -r 1.10.2.33 src/prefs_gtk.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/prefs_gtk.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_image_viewer.h;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_logging.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_logging.h;  cvs diff -u -r 1.43.2.58 -r 1.43.2.59 src/prefs_matcher.c;  cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/prefs_matcher.h;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_message.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_message.h;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_msg_colors.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_msg_colors.h;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_other.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_other.h;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_quote.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_quote.h;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_receive.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_receive.h;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_send.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_send.h;  cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/prefs_spelling.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/prefs_spelling.h;  cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_summaries.h;  cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/prefs_summary_column.c;  cvs diff -u -r 1.1.16.4 -r 1.1.16.5 src/prefs_summary_column.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_summary_open.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_summary_open.h;  cvs diff -u -r 1.12.2.44 -r 1.12.2.45 src/prefs_template.c;  cvs diff -u -r 1.1.16.6 -r 1.1.16.7 src/prefs_template.h;  cvs diff -u -r 1.3.2.49 -r 1.3.2.50 src/prefs_themes.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/prefs_themes.h;  cvs diff -u -r 1.30.2.34 -r 1.30.2.35 src/prefs_toolbar.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/prefs_toolbar.h;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_wrapping.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_wrapping.h;  cvs diff -u -r 1.10.2.14 -r 1.10.2.15 src/privacy.c;  cvs diff -u -r 1.10.2.13 -r 1.10.2.14 src/privacy.h;  cvs diff -u -r 1.47.2.44 -r 1.47.2.45 src/procheader.c;  cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/procheader.h;  cvs diff -u -r 1.49.2.92 -r 1.49.2.93 src/procmime.c;  cvs diff -u -r 1.17.2.17 -r 1.17.2.18 src/procmime.h;  cvs diff -u -r 1.150.2.99 -r 1.150.2.100 src/procmsg.c;  cvs diff -u -r 1.60.2.45 -r 1.60.2.46 src/procmsg.h;  cvs diff -u -r 1.8.2.21 -r 1.8.2.22 src/quote_fmt.c;  cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/quote_fmt_lex.l;  cvs diff -u -r 1.22.2.33 -r 1.22.2.34 src/quote_fmt_parse.y;  cvs diff -u -r 1.17.2.9 -r 1.17.2.10 src/recv.c;  cvs diff -u -r 1.6.12.4 -r 1.6.12.5 src/recv.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/remotefolder.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/remotefolder.h;  cvs diff -u -r 1.17.2.38 -r 1.17.2.39 src/send_message.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/send_message.h;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/setup.c;  cvs diff -u -r 1.1.1.1.16.5 -r 1.1.1.1.16.6 src/setup.h;  cvs diff -u -r 1.1.16.3 -r 1.1.16.4 src/simple-gettext.c;  cvs diff -u -r 1.9.2.20 -r 1.9.2.21 src/sourcewindow.c;  cvs diff -u -r 1.1.1.1.16.5 -r 1.1.1.1.16.6 src/sourcewindow.h;  cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/ssl_manager.c;  cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/ssl_manager.h;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/statusbar.c;  cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/statusbar.h;  cvs diff -u -r 1.25.2.39 -r 1.25.2.40 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.28 -r 1.18.2.29 src/stock_pixmap.h;  cvs diff -u -r 1.15.2.50 -r 1.15.2.51 src/summary_search.c;  cvs diff -u -r 1.3.16.4 -r 1.3.16.5 src/summary_search.h;  cvs diff -u -r 1.395.2.308 -r 1.395.2.309 src/summaryview.c;  cvs diff -u -r 1.68.2.38 -r 1.68.2.39 src/summaryview.h;  cvs diff -u -r 1.96.2.174 -r 1.96.2.175 src/textview.c;  cvs diff -u -r 1.12.2.19 -r 1.12.2.20 src/textview.h;  cvs diff -u -r 1.43.2.66 -r 1.43.2.67 src/toolbar.c;  cvs diff -u -r 1.19.2.17 -r 1.19.2.18 src/toolbar.h;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/undo.c;  cvs diff -u -r 1.5.14.8 -r 1.5.14.9 src/undo.h;  cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/unmime.c;  cvs diff -u -r 1.2.10.5 -r 1.2.10.6 src/unmime.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/uri_opener.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/uri_opener.h;  cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/vcard.c;  cvs diff -u -r 1.5.12.4 -r 1.5.12.5 src/vcard.h;  cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/wizard.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/wizard.h;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/base64.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/base64.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/claws.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/claws.h;  cvs diff -u -r 1.9.2.39 -r 1.9.2.40 src/common/defs.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/fnmatch.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/fnmatch.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/fnmatch_loop.c;  cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/common/hooks.c;  cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/common/hooks.h;  cvs diff -u -r 1.6.2.12 -r 1.6.2.13 src/common/log.c;  cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/common/log.h;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/common/md5.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/md5.h;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/mgutils.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/mgutils.h;  cvs diff -u -r 1.6.2.13 -r 1.6.2.14 src/common/nntp.c;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/common/nntp.h;  cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/common/passcrypt.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/passcrypt.h.in;  cvs diff -u -r 1.13.2.28 -r 1.13.2.29 src/common/plugin.c;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/common/plugin.h;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/common/prefs.c;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/common/prefs.h;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/progressindicator.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/progressindicator.h;  cvs diff -u -r 1.3.2.13 -r 1.3.2.14 src/common/quoted-printable.c;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/common/quoted-printable.h;  cvs diff -u -r 1.23.2.14 -r 1.23.2.15 src/common/session.c;  cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/common/session.h;  cvs diff -u -r 1.11.2.21 -r 1.11.2.22 src/common/smtp.c;  cvs diff -u -r 1.6.2.11 -r 1.6.2.12 src/common/smtp.h;  cvs diff -u -r 1.13.2.33 -r 1.13.2.34 src/common/socket.c;  cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/common/socket.h;  cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/common/ssl.c;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/ssl.h;  cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/ssl_certificate.h;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/string_match.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/string_match.h;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/stringtable.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/stringtable.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/tags.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/tags.h;  cvs diff -u -r 1.2.4.19 -r 1.2.4.20 src/common/template.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/template.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/common/timing.h;  cvs diff -u -r 1.36.2.105 -r 1.36.2.106 src/common/utils.c;  cvs diff -u -r 1.20.2.47 -r 1.20.2.48 src/common/utils.h;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/uuencode.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/uuencode.h;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/common/version.h.in;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_dirent.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_reg.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_signal.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_stat.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_stdlib.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_string.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_time.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_unistd.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/common/w32_wait.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/common/w32lib.h;  cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/common/xml.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/common/xml.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/common/xmlprops.c;  cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/common/xmlprops.h;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-errors.h;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/etpan-thread-manager-types.h;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/etpan/etpan-thread-manager.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/etpan-thread-manager.h;  cvs diff -u -r 1.1.4.79 -r 1.1.4.80 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/etpan/imap-thread.h;  cvs diff -u -r 1.4.2.50 -r 1.4.2.51 src/gtk/about.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/gtk/about.h;  cvs diff -u -r 1.2.2.19 -r 1.2.2.20 src/gtk/colorlabel.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/colorlabel.h;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/colorsel.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/colorsel.h;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/combobox.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/combobox.h;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/gtk/description_window.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/description_window.h;  cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/gtk/filesel.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/filesel.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/foldersort.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/foldersort.h;  cvs diff -u -r 1.9.2.51 -r 1.9.2.52 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/gtkaspell.h;  cvs diff -u -r 1.1.4.39 -r 1.1.4.40 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/gtkshruler.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/gtkshruler.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtksourceprintjob.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtksourceprintjob.h;  cvs diff -u -r 1.5.2.58 -r 1.5.2.59 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.35 -r 1.4.2.36 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/gtk/gtkvscrollbutton.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/icon_legend.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/icon_legend.h;  cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/inputdialog.h;  cvs diff -u -r 1.1.4.30 -r 1.1.4.31 src/gtk/logwindow.c;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/logwindow.h;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/manage_window.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/manage_window.h;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/menu.c;  cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/gtk/menu.h;  cvs diff -u -r 1.5.2.48 -r 1.5.2.49 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/pluginwindow.h;  cvs diff -u -r 1.12.2.36 -r 1.12.2.37 src/gtk/prefswindow.c;  cvs diff -u -r 1.7.2.10 -r 1.7.2.11 src/gtk/prefswindow.h;  cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/gtk/progressdialog.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/progressdialog.h;  cvs diff -u -r 1.1.2.73 -r 1.1.2.74 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/quicksearch.h;  cvs diff -u -r 1.9.2.17 -r 1.9.2.18 src/gtk/sslcertwindow.c;  cvs diff -u -r 1.6.2.7 -r 1.6.2.8 src/gtk/sslcertwindow.h;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/bogofilter/bogofilter.h;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.13.2.33 -r 1.13.2.34 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/plugins/clamav/clamav_plugin.h;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.13.2.15 -r 1.13.2.16 src/plugins/demo/demo.c;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.2.4.6 -r 1.2.4.7 src/plugins/dillo_viewer/dillo_prefs.h;  cvs diff -u -r 1.12.2.21 -r 1.12.2.22 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/passphrase.h;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/pgp_viewer.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/pgp_viewer.h;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/select-keys.h;  cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/sgpgme.h;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpinline/pgpinline.h;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpinline/plugin.c;  cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/pgpmime.h;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpmime/plugin.c;  cvs diff -u -r 1.18.2.54 -r 1.18.2.55 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.4.2.16 -r 1.4.2.17 src/plugins/spamassassin/spamassassin.h;  cvs diff -u -r 1.23.2.39 -r 1.23.2.40 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.54 -r 1.14.2.55 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/trayicon/trayicon_prefs.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/trayicon/trayicon_prefs.h;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/trayicon/libeggtrayicon/eggtrayicon.h;  cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.h;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c;  cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/OOo2claws-mail.pl;  cvs diff -u -r 1.1.14.3 -r 1.1.14.4 tools/README.sylprint;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/acroread2claws-mail.pl;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/claws-mail-compose-insert-files.pl;  cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/convert_mbox.pl;  cvs diff -u -r 1.16.2.5 -r 1.16.2.6 tools/filter_conv.pl;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 tools/filter_conv_new.pl;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/fix_date.sh;  cvs diff -u -r 1.3.2.6 -r 1.3.2.7 tools/freshmeat_search.pl;  cvs diff -u -r 1.3.2.6 -r 1.3.2.7 tools/google_search.pl;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/kmail-mailbox2claws-mail.pl;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/kmail2claws-mail.pl;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/kmail2claws-mail_v2.pl;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/mairix.sh;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 tools/make.themes.project;  cvs diff -u -r 1.3.2.6 -r 1.3.2.7 tools/multiwebsearch.pl;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/nautilus2claws-mail.sh;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 tools/outlook2claws-mail.pl;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 tools/textviewer.sh;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/thunderbird-filters-convertor.pl;  cvs diff -u -r 1.2.14.3 -r 1.2.14.4 tools/update-po;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/uuooffice;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 tools/vcard2xml.py;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 tools/kdeservicemenu/claws-mail-kdeservicemenu.pl;  ) > 2.10.0cvs16.patchset
 ( cvs diff -u -r 1.395.2.309 -r 1.395.2.310 src/summaryview.c;  ) > 2.10.0cvs17.patchset
 ( cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/gtk/colorlabel.c;  ) > 2.10.0cvs18.patchset
+( cvs diff -u -r 1.382.2.394 -r 1.382.2.395 src/compose.c;  cvs diff -u -r 1.207.2.167 -r 1.207.2.168 src/folderview.c;  cvs diff -u -r 1.274.2.195 -r 1.274.2.196 src/mainwindow.c;  cvs diff -u -r 1.94.2.137 -r 1.94.2.138 src/messageview.c;  cvs diff -u -r 1.395.2.310 -r 1.395.2.311 src/summaryview.c;  cvs diff -u -r 1.43.2.67 -r 1.43.2.68 src/toolbar.c;  cvs diff -u -r 1.19.2.18 -r 1.19.2.19 src/toolbar.h;  ) > 2.10.0cvs19.patchset
index 35b628b05fe1ebef711c6638ecce1f95e92c8405..efcead86dee8c105bb338270070e44f6a5cd6dcc 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 792f8baf311e06704ead73f9d79cb9b19e9cba15..e84cc11b97c3d8dd17f6b1ae616c12e29bb0db00 100644 (file)
@@ -6405,8 +6405,13 @@ static Compose *compose_create(PrefsAccount *account,
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
 
        gtk_widget_realize(handlebox);
+#ifdef MAEMO
+       compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, window,
+                                         (gpointer)compose);
+#else
        compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, handlebox,
                                          (gpointer)compose);
+#endif
 
        vbox2 = gtk_vbox_new(FALSE, 2);
        gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
index 0a80d4676e99b3443e8bd1489a1798a1a7cd086e..6eeed53edc0dd84494a4b03f0a34232a9b53b3d2 100644 (file)
@@ -475,6 +475,10 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
        ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
                                           titles);
 
+#ifdef MAEMO
+       gtk_clist_column_titles_hide(GTK_CLIST(ctree));
+#endif
+
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[F_COL_NEW],
                                           GTK_JUSTIFY_RIGHT);
index 931dc248a9d640ff79ef457b587306e9df246254..1c2e834ad598ecfcf4f0e4bcd450111aac2b97ad 100644 (file)
@@ -1351,7 +1351,11 @@ MainWindow *main_window_create()
        menubar = menubar_create(window, mainwin_entries, 
                                 n_menu_entries, "<Main>", mainwin);
        gtk_widget_show(menubar);
+
+#ifndef MAEMO
        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+#endif
+
        ifactory = gtk_item_factory_from_widget(menubar);
 
 /*     gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List"));
@@ -1375,10 +1379,15 @@ MainWindow *main_window_create()
        /* link window to mainwin->window to avoid gdk warnings */
        mainwin->window       = window;
        
-       /* create toolbar */
+#ifdef MAEMO
+       mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, 
+                                         window, 
+                                         (gpointer)mainwin);
+#else
        mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, 
                                          handlebox, 
                                          (gpointer)mainwin);
+#endif
        toolbar_set_learn_button
                (mainwin->toolbar,
                 LEARN_SPAM);
@@ -1636,7 +1645,9 @@ MainWindow *main_window_create()
           menu items in different menus             */
        menu_connect_identical_items();
 
+#ifndef MAEMO
        gtk_window_iconify(GTK_WINDOW(mainwin->window));
+#endif
 
        g_signal_connect(G_OBJECT(window), "window_state_event",
                         G_CALLBACK(mainwindow_state_event_cb), mainwin);
@@ -1957,24 +1968,18 @@ static void main_window_set_account_receive_menu(MainWindow *mainwin,
 static void main_window_set_toolbar_combo_receive_menu(MainWindow *mainwin,
                                                       GList *account_list)
 {
-       GList *cur_ac, *cur_item;
+       GList *cur_ac;
        GtkWidget *menuitem;
        PrefsAccount *ac_prefs;
        GtkWidget *menu = NULL;
 
-       if (mainwin->toolbar->getall_btn == NULL
-       ||  mainwin->toolbar->getall_combo == NULL) /* button doesn't exist */
+       if (mainwin->toolbar->getall_btn == NULL) /* button doesn't exist */
                return;
 
-       menu = mainwin->toolbar->getall_combo->menu;
-
-       /* destroy all previous menu item */
-       cur_item = GTK_MENU_SHELL(menu)->children;
-       while (cur_item != NULL) {
-               GList *next = cur_item->next;
-               gtk_widget_destroy(GTK_WIDGET(cur_item->data));
-               cur_item = next;
-       }
+       menu = gtk_menu_tool_button_get_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->getall_btn));
+       if (menu)
+               gtk_widget_destroy(menu);
+       menu = gtk_menu_new();
 
        for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
                ac_prefs = (PrefsAccount *)cur_ac->data;
@@ -1988,29 +1993,43 @@ static void main_window_set_toolbar_combo_receive_menu(MainWindow *mainwin,
                                 G_CALLBACK(account_receive_menu_cb),
                                 ac_prefs);
        }
+       gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->getall_btn), menu);
 }
 
 static void main_window_set_toolbar_combo_compose_menu(MainWindow *mainwin,
                                                       GList *account_list)
 {
-       GList *cur_ac, *cur_item;
+#ifndef MAEMO
+       GList *cur_ac;
        GtkWidget *menuitem;
        PrefsAccount *ac_prefs;
        GtkWidget *menu = NULL;
 
-       if (mainwin->toolbar->compose_mail_btn == NULL
-       ||  mainwin->toolbar->compose_combo == NULL) /* button doesn't exist */
+       if (mainwin->toolbar->compose_mail_btn == NULL) /* button doesn't exist */
                return;
 
-       menu = mainwin->toolbar->compose_combo->menu;
+       menu = gtk_menu_tool_button_get_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->compose_mail_btn));
+       if (menu)
+               gtk_widget_destroy(menu);
+       menu = gtk_menu_new();
 
-       /* destroy all previous menu item */
-       cur_item = GTK_MENU_SHELL(menu)->children;
-       while (cur_item != NULL) {
-               GList *next = cur_item->next;
-               gtk_widget_destroy(GTK_WIDGET(cur_item->data));
-               cur_item = next;
+       for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+               ac_prefs = (PrefsAccount *)cur_ac->data;
+
+               menuitem = gtk_menu_item_new_with_label
+                       (ac_prefs->account_name
+                        ? ac_prefs->account_name : _("Untitled"));
+               gtk_widget_show(menuitem);
+               gtk_menu_append(GTK_MENU(menu), menuitem);
+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(account_compose_menu_cb),
+                                ac_prefs);
        }
+       gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->compose_mail_btn), menu);
+       menu = gtk_menu_tool_button_get_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->compose_news_btn));
+       if (menu)
+               gtk_widget_destroy(menu);
+       menu = gtk_menu_new();
 
        for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
                ac_prefs = (PrefsAccount *)cur_ac->data;
@@ -2024,6 +2043,8 @@ static void main_window_set_toolbar_combo_compose_menu(MainWindow *mainwin,
                                 G_CALLBACK(account_compose_menu_cb),
                                 ac_prefs);
        }
+       gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(mainwin->toolbar->compose_news_btn), menu);
+#endif
 }
 
 void main_window_set_account_menu(GList *account_list)
index d09d3fbc837e53ee0b29ffec45b9b8fe805a785b..58c1896369a4ebeaa16641c048454af4b753c5e3 100644 (file)
@@ -424,8 +424,13 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        }
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
        gtk_widget_realize(handlebox);
+#ifdef MAEMO
+       msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, window,
+                                         (gpointer)msgview);
+#else
        msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
                                          (gpointer)msgview);
+#endif
 
        statusbar = gtk_statusbar_new();
        gtk_widget_show(statusbar);
index c12a52ad8f6dec04bcdf3edd3e596c55b5911472..b2472b9532215c09270980679ede2f9507c2c560 100644 (file)
@@ -813,10 +813,13 @@ void summary_relayout(SummaryView *summaryview)
                gtk_box_pack_start(GTK_BOX(summaryview->stat_box2), summaryview->statlabel_msgs, FALSE, FALSE, 4);
                gtk_widget_show_all(summaryview->stat_box);
                gtk_widget_show_all(summaryview->stat_box2);
-               if (prefs_common.layout_mode == SMALL_LAYOUT)
+               if (prefs_common.layout_mode == SMALL_LAYOUT) {
                        gtk_widget_hide(summaryview->toggle_eventbox);
-               else
+                       gtk_widget_hide(summaryview->statlabel_msgs);
+               } else {
                        gtk_widget_show(summaryview->toggle_eventbox);
+                       gtk_widget_show(summaryview->statlabel_msgs);
+               }
                        
                break;
        }
@@ -2409,22 +2412,47 @@ static void summary_status_show(SummaryView *summaryview)
                itstr = g_strdup("");
        }
                
-       str = g_strconcat(n_selected ? itos(n_selected) : "",
-                                       itstr, sel, spc, del, mv, cp, NULL);
-       gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), str);
-       g_free(str);
-       g_free(sel);
-       g_free(del);
-       g_free(mv);
-       g_free(cp);
-       g_free(itstr);
-
-       str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
-
-                                     n_new, n_unread, n_total,
-                                     to_human_readable(n_size));
-       gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
-       g_free(str);
+       if (prefs_common.layout_mode != SMALL_LAYOUT) {
+               str = g_strconcat(n_selected ? itos(n_selected) : "",
+                                               itstr, sel, spc, del, mv, cp, NULL);
+               g_free(sel);
+               g_free(del);
+               g_free(mv);
+               g_free(cp);
+               g_free(itstr);
+               
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), str);
+               g_free(str);
+
+               str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
+
+                                             n_new, n_unread, n_total,
+                                             to_human_readable(n_size));
+
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
+               g_free(str);
+       } else {
+               gchar *ssize, *tsize;
+               if (n_selected) {
+                       ssize = g_strdup(to_human_readable(sel_size));
+                       tsize = g_strdup(to_human_readable(n_size));
+                       str = g_strdup_printf(_("%d/%d selected (%s/%s), %d unread"),
+                               n_selected, n_total, ssize, tsize, n_unread);
+                       g_free(ssize);
+                       g_free(tsize);
+               } else
+                       str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
+                               n_new, n_unread, n_total, to_human_readable(n_size));
+               g_free(sel);
+               g_free(del);
+               g_free(mv);
+               g_free(cp);
+               g_free(itstr);
+               
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), str);
+               g_free(str);
+       }
+
        toolbar_main_set_sensitive(summaryview->mainwin);
 }
 
@@ -5529,6 +5557,10 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        ctree = gtk_sctree_new_with_titles
                (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
 
+#ifdef MAEMO
+       gtk_clist_column_titles_hide(GTK_CLIST(ctree));
+#endif
+
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
                                           GTK_JUSTIFY_CENTER);
index e4f18ca520f3481119d3e52c37395632eb6c11e8..3f01b77284cfbdde73a4e69257fbbc05130e6eae 100644 (file)
@@ -427,8 +427,10 @@ static void toolbar_set_default_main(void)
                { A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
+#ifndef MAEMO
 #if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
                { A_LEARN_SPAM,    STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
+#endif
 #endif
                { A_SEPARATOR,     0,                                 ("")         },
                { A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
@@ -525,8 +527,10 @@ static void toolbar_set_default_msgview(void)
                { A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
+#ifndef MAEMO
 #if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
                { A_LEARN_SPAM,    STOCK_PIXMAP_SPAM_BTN,             _("Spam")    },
+#endif
 #endif
                { A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
 #ifdef MAEMO
@@ -1557,6 +1561,40 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        }
 }
 
+#ifndef MAEMO
+#define HOMOGENEOUS TRUE
+#else
+#define HOMOGENEOUS FALSE
+#endif
+#define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
+       item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
+       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), HOMOGENEOUS);                                \
+       gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
+       g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
+       gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
+       gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), GTK_TOOLTIPS(toolbar_tips),                      \
+                       tooltip, NULL);                                                                 \
+}
+
+#define TOOLBAR_MENUITEM(item,icon,text,tooltip,menutip) {                                             \
+       item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text));                                        \
+       gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), HOMOGENEOUS);                                \
+       gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
+       g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
+       gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);                              \
+       gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), GTK_TOOLTIPS(toolbar_tips),                      \
+                       tooltip, NULL);                                                                 \
+       gtk_menu_tool_button_set_arrow_tooltip(GTK_MENU_TOOL_BUTTON(item),                              \
+                               GTK_TOOLTIPS(toolbar_tips), menutip, NULL);                             \
+}
+
+#define MAKE_MENU(entries,path,btn) {                                                                  \
+       n_menu_entries = sizeof(entries) /                                                              \
+               sizeof(entries[0]);                                                                     \
+       menu = menu_create_items(entries, n_menu_entries, path, &factory, toolbar_item);                \
+       gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(btn), menu);                                 \
+}
+
 /**
  * Create a new toolbar with specified type
  * if a callback list is passed it will be used before the 
@@ -1573,18 +1611,9 @@ Toolbar *toolbar_create(ToolbarType       type,
        GtkWidget *icon_news;
        GtkWidget *icon_ham;
        GtkWidget *item;
-       GtkWidget *item_news;
-       GtkWidget *item_ham;
+       GtkWidget *menu;
        guint n_menu_entries;
-       ComboButton *getall_combo;
-       ComboButton *reply_combo;
-       ComboButton *replyall_combo;
-       ComboButton *replylist_combo;
-       ComboButton *replysender_combo;
-       ComboButton *fwd_combo;
-       ComboButton *compose_combo;
-       ComboButton *ham_combo;
-
+       GtkItemFactory *factory;
        GtkTooltips *toolbar_tips;
        ToolbarSylpheedActions *action_item;
        GSList *cur;
@@ -1600,15 +1629,15 @@ Toolbar *toolbar_create(ToolbarType      type,
        toolbar_data = g_new0(Toolbar, 1); 
 
        toolbar = gtk_toolbar_new();
-       gtk_container_add(GTK_CONTAINER(container), toolbar);
-       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
+
        gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
+       gtk_toolbar_set_show_arrow(GTK_TOOLBAR(toolbar), TRUE);
        
        for (cur = toolbar_list; cur != NULL; cur = cur->next) {
 
                if (g_ascii_strcasecmp(((ToolbarItem*)cur->data)->file, TOOLBAR_TAG_SEPARATOR) == 0) {
-                       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+                       gtk_toolbar_insert(GTK_TOOLBAR(toolbar), gtk_separator_tool_item_new(), -1);
                        continue;
                }
                
@@ -1624,301 +1653,214 @@ Toolbar *toolbar_create(ToolbarType    type,
                        g_slist_append(toolbar_data->item_list, 
                                       toolbar_item);
                icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
-               item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                               toolbar_item->text,
-                                               (""),
-                                               (""),
-                                               icon_wid, G_CALLBACK(toolbar_buttons_cb), 
-                                               toolbar_item);
-               
+                       
                switch (toolbar_item->index) {
 
                case A_GO_FOLDERS:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Go to folder list"));
                        toolbar_data->folders_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->folders_btn,
-                                          _("Go to folder list"), NULL);
                        break;
                case A_RECEIVE_ALL:
+                       TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+                               _("Receive Mail on all Accounts"),
+                               _("Receive Mail on selected Account"));
                        toolbar_data->getall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->getall_btn, 
-                                          _("Receive Mail on all Accounts"), NULL);
-                       getall_combo = gtkut_combo_button_create(toolbar_data->getall_btn, NULL, 0,
-                                       "<GetAll>", (gpointer)toolbar_item);
-                       gtk_button_set_relief(GTK_BUTTON(getall_combo->arrow),
-                                             GTK_RELIEF_NONE);
-                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
-                                                 GTK_WIDGET_PTR(getall_combo),
-                                                 _("Receive Mail on selected Account"), "Reply");
-                       toolbar_data->getall_combo = getall_combo;
                        break;
                case A_RECEIVE_CUR:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text, _("Receive Mail on current Account"));
                        toolbar_data->get_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->get_btn,
-                                          _("Receive Mail on current Account"), NULL);
                        break;
                case A_SEND_QUEUED:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Send Queued Messages"));
                        toolbar_data->send_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->send_btn,
-                                          _("Send Queued Messages"), NULL);
                        break;
                case A_CLOSE:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Close window"));
                        toolbar_data->close_window_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->close_window_btn,
-                                          _("Close window"), NULL);
                        break;
                case A_OPEN_MAIL:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Open email"));
                        toolbar_data->open_mail_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->open_mail_btn,
-                                          _("Open email"), NULL);
                        break;
                case A_COMPOSE_EMAIL:
+#ifndef MAEMO
+                       TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+                               _("Compose Email"),
+                               _("Compose with selected Account"));
+                       toolbar_data->compose_mail_btn = item; 
+
                        icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
-                       item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                           _("Compose"),
-                                                           (""),
-                                                           (""),
-                                                           icon_news, G_CALLBACK(toolbar_buttons_cb), 
-                                                           toolbar_item);
+                       TOOLBAR_MENUITEM(item,icon_news,_("Compose"),
+                               _("Compose News"),
+                               _("Compose with selected Account"));
+                       toolbar_data->compose_news_btn = item; 
+#else
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+                               _("Compose Email"));
                        toolbar_data->compose_mail_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->compose_mail_btn,
-                                          _("Compose Email"), NULL);
-                       toolbar_data->compose_news_btn = item_news;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->compose_news_btn,
-                                          _("Compose News"), NULL);
-                       compose_combo = gtkut_combo_button_create(toolbar_data->compose_mail_btn, NULL, 0,
-                                       "<Compose>", (gpointer)toolbar_item);
-                       gtk_button_set_relief(GTK_BUTTON(compose_combo->arrow),
-                                             GTK_RELIEF_NONE);
-                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
-                                                 GTK_WIDGET_PTR(compose_combo),
-                                                 _("Compose with selected Account"), "Compose");
-                       toolbar_data->compose_combo = compose_combo;
+
+                       icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+                       TOOLBAR_ITEM(item,icon_news,_("Compose"),
+                               _("Compose News"));
+                       toolbar_data->compose_news_btn = item; 
+#endif
                        break;
                case A_LEARN_SPAM:
-                       icon_ham = stock_pixmap_widget(container, STOCK_PIXMAP_HAM_BTN);
-                       item_ham = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                           _("Ham"),
-                                                           (""),
-                                                           (""),
-                                                           icon_ham, G_CALLBACK(toolbar_buttons_cb), 
-                                                           toolbar_item);
+                       TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+                               _("Learn Spam"),
+                               _("Learn as..."));
                        toolbar_data->learn_spam_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->learn_spam_btn,
-                                          _("Learn Spam"), NULL);
-                       toolbar_data->learn_ham_btn = item_ham;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->learn_ham_btn,
-                                          _("Learn Ham"), NULL);                       
-                       n_menu_entries = sizeof(learn_entries) / 
-                               sizeof(learn_entries[0]);
-                       ham_combo = gtkut_combo_button_create(toolbar_data->learn_spam_btn,
-                                             learn_entries, n_menu_entries,
-                                             "<LearnSpam>", (gpointer)toolbar_item);
-                       gtk_button_set_relief(GTK_BUTTON(ham_combo->arrow),
-                                             GTK_RELIEF_NONE);
-                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
-                                                 GTK_WIDGET_PTR(ham_combo),
-                                                 _("Learn as..."), _("Learn"));
-                       toolbar_data->ham_combo = ham_combo;
+
+                       icon_ham = stock_pixmap_widget(container, STOCK_PIXMAP_HAM_BTN);
+                       TOOLBAR_MENUITEM(item,icon_ham,_("Ham"),
+                               _("Learn Ham"),
+                               _("Learn as..."));
+                       toolbar_data->learn_ham_btn = item; 
+
+                       MAKE_MENU(learn_entries,"<LearnSpam>",toolbar_data->learn_spam_btn);
+                       MAKE_MENU(learn_entries,"<LearnHam>",toolbar_data->learn_ham_btn);
                        break;
                case A_REPLY_MESSAGE:
+#ifndef MAEMO
+                       TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+                               _("Reply to Message"),
+                               _("Reply to Message options"));
                        toolbar_data->reply_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->reply_btn,
-                                          _("Reply to Message"), NULL);
-                       n_menu_entries = sizeof(reply_entries) / 
-                               sizeof(reply_entries[0]);
-                       reply_combo = gtkut_combo_button_create(toolbar_data->reply_btn,
-                                             reply_entries, n_menu_entries,
-                                             "<Reply>", (gpointer)toolbar_item);
-                       gtk_button_set_relief(GTK_BUTTON(reply_combo->arrow),
-                                             GTK_RELIEF_NONE);
-                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
-                                                 GTK_WIDGET_PTR(reply_combo),
-                                                 _("Reply to Message"), "Reply");
-                       toolbar_data->reply_combo = reply_combo;
+
+                       MAKE_MENU(reply_entries,"<Reply>",toolbar_data->reply_btn);
+#else
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+                               _("Reply to Message"));
+                       toolbar_data->reply_btn = item;
+#endif
                        break;
                case A_REPLY_SENDER:
+#ifndef MAEMO
+                       TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+                               _("Reply to Sender"),
+                               _("Reply to Sender options"));
                        toolbar_data->replysender_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->replysender_btn,
-                                          _("Reply to Sender"), NULL);
-                       n_menu_entries = sizeof(replysender_entries) / 
-                               sizeof(replysender_entries[0]);
-                       replysender_combo = gtkut_combo_button_create(toolbar_data->replysender_btn,
-                                             replysender_entries, n_menu_entries,
-                                             "<ReplySender>", (gpointer)toolbar_item);
-                       gtk_button_set_relief(GTK_BUTTON(replysender_combo->arrow),
-                                             GTK_RELIEF_NONE);
-                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
-                                                 GTK_WIDGET_PTR(replysender_combo),
-                                                 _("Reply to Sender"), "ReplySender");
-                       toolbar_data->replysender_combo = replysender_combo;
+
+                       MAKE_MENU(replysender_entries,"<ReplySender>",toolbar_data->replysender_btn);
+#else
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+                               _("Reply to Sender"));
+                       toolbar_data->replysender_btn = item;
+#endif
                        break;
                case A_REPLY_ALL:
+#ifndef MAEMO
+                       TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+                               _("Reply to All"),
+                               _("Reply to All options"));
                        toolbar_data->replyall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->replyall_btn,
-                                          _("Reply to All"), NULL);
-                       n_menu_entries = sizeof(replyall_entries) / 
-                               sizeof(replyall_entries[0]);
-                       replyall_combo = gtkut_combo_button_create(toolbar_data->replyall_btn,
-                                             replyall_entries, n_menu_entries,
-                                             "<ReplyAll>", (gpointer)toolbar_item);
-                       gtk_button_set_relief(GTK_BUTTON(replyall_combo->arrow),
-                                             GTK_RELIEF_NONE);
-                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
-                                                 GTK_WIDGET_PTR(replyall_combo),
-                                                 _("Reply to All"), "ReplyAll");
-                       toolbar_data->replyall_combo = replyall_combo;
+
+                       MAKE_MENU(replyall_entries,"<ReplyAll>",toolbar_data->replyall_btn);
+#else
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+                               _("Reply to All"));
+                       toolbar_data->replyall_btn = item;
+#endif
                        break;
                case A_REPLY_ML:
+#ifndef MAEMO
+                       TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+                               _("Reply to Mailing-list"),
+                               _("Reply to Mailing-list options"));
                        toolbar_data->replylist_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->replylist_btn,
-                                          _("Reply to Mailing-list"), NULL);
-                       n_menu_entries = sizeof(replylist_entries) / 
-                               sizeof(replylist_entries[0]);
-                       replylist_combo = gtkut_combo_button_create(toolbar_data->replylist_btn,
-                                             replylist_entries, n_menu_entries,
-                                             "<ReplyList>", (gpointer)toolbar_item);
-                       gtk_button_set_relief(GTK_BUTTON(replylist_combo->arrow),
-                                             GTK_RELIEF_NONE);
-                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
-                                                 GTK_WIDGET_PTR(replylist_combo),
-                                                 _("Reply to Mailing-list"), "ReplyList");
-                       toolbar_data->replylist_combo = replylist_combo;
+
+                       MAKE_MENU(replylist_entries,"<ReplyList>",toolbar_data->replylist_btn);
+#else
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+                               _("Reply to Mailing-list"));
+                       toolbar_data->replylist_btn = item;
+#endif
                        break;
                case A_FORWARD:
+#ifndef MAEMO
+                       TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
+                               _("Forward Message"),
+                               _("Forward Message options"));
                        toolbar_data->fwd_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->fwd_btn,
-                                            _("Forward Message"), NULL);
-                       n_menu_entries = sizeof(forward_entries) / 
-                               sizeof(forward_entries[0]);
-                       fwd_combo = gtkut_combo_button_create(toolbar_data->fwd_btn,
-                                             forward_entries, n_menu_entries,
-                                             "<Forward>", (gpointer)toolbar_item);
-                       gtk_button_set_relief(GTK_BUTTON(fwd_combo->arrow),
-                                             GTK_RELIEF_NONE);
-                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
-                                                 GTK_WIDGET_PTR(fwd_combo),
-                                                 _("Forward Message"), "Fwd");
-                       toolbar_data->fwd_combo = fwd_combo;
+
+                       MAKE_MENU(forward_entries,"<Forward>",toolbar_data->fwd_btn);
+#else
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+                               _("Forward Message"));
+                       toolbar_data->fwd_btn = item;
+#endif
                        break;
                case A_TRASH:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Trash Message"));
                        toolbar_data->trash_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->trash_btn,
-                                            _("Trash Message"), NULL);
                        break;
                case A_DELETE_REAL:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Delete Message"));
                        toolbar_data->delete_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->delete_btn,
-                                            _("Delete Message"), NULL);
                        break;
                case A_EXECUTE:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Execute"));
                        toolbar_data->exec_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->exec_btn,
-                                          _("Execute"), NULL);
                        break;
                case A_GOTO_PREV:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Go to Previous Unread Message"));
                        toolbar_data->prev_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->prev_btn,
-                                            _("Go to Previous Unread Message"),
-                                            NULL);
                        break;
                case A_GOTO_NEXT:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Go to Next Unread Message"));
                        toolbar_data->next_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->next_btn,
-                                            _("Go to Next Unread Message"),
-                                            NULL);
                        break;
                
                /* Compose Toolbar */
                case A_SEND:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Send Message"));
                        toolbar_data->send_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->send_btn, 
-                                            _("Send Message"), NULL);
                        break;
                case A_SENDL:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Put into queue folder and send later"));
                        toolbar_data->sendl_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->sendl_btn,
-                                            _("Put into queue folder and send later"), NULL);
                        break;
                case A_DRAFT:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Save to draft folder"));
                        toolbar_data->draft_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->draft_btn,
-                                            _("Save to draft folder"), NULL);
                        break;
                case A_INSERT:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Insert file"));
                        toolbar_data->insert_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->insert_btn,
-                                            _("Insert file"), NULL);
                        break;
                case A_ATTACH:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Attach file"));
                        toolbar_data->attach_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->attach_btn,
-                                            _("Attach file"), NULL);
                        break;
                case A_SIG:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Insert signature"));
                        toolbar_data->sig_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->sig_btn,
-                                            _("Insert signature"), NULL);
                        break;
                case A_EXTEDITOR:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Edit with external editor"));
                        toolbar_data->exteditor_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->exteditor_btn,
-                                            _("Edit with external editor"), NULL);
                        break;
                case A_LINEWRAP_CURRENT:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Wrap long lines of current paragraph"));
                        toolbar_data->linewrap_current_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->linewrap_current_btn,
-                                            _("Wrap long lines of current paragraph"), NULL);
                        break;
                case A_LINEWRAP_ALL:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Wrap all long lines"));
                        toolbar_data->linewrap_all_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->linewrap_all_btn,
-                                            _("Wrap all long lines"), NULL);
                        break;
                case A_ADDRBOOK:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Address book"));
                        toolbar_data->addrbook_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->addrbook_btn,
-                                            _("Address book"), NULL);
                        break;
 #ifdef USE_ASPELL
                case A_CHECK_SPELLING:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Check spelling"));
                        toolbar_data->spellcheck_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->spellcheck_btn,
-                                            _("Check spelling"), NULL);
                        break;
 #endif
 
                case A_SYL_ACTIONS:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,toolbar_item->text);
                        action_item = g_new0(ToolbarSylpheedActions, 1);
                        action_item->widget = item;
                        action_item->name   = g_strdup(toolbar_item->text);
@@ -1926,31 +1868,22 @@ Toolbar *toolbar_create(ToolbarType      type,
                        toolbar_data->action_list = 
                                g_slist_append(toolbar_data->action_list,
                                               action_item);
-
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            item,
-                                            action_item->name, NULL);
-
-                       gtk_widget_show(item);
                        break;
                case A_CANCEL_INC:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,_("Cancel receiving"));
                        toolbar_data->cancel_inc_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            toolbar_data->cancel_inc_btn,
-                                            _("Cancel receiving"), NULL);
                        break;
                default:
+                       TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
+                               toolbar_ret_descr_from_val(toolbar_item->index));
                        /* find and set the tool tip text */
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
-                                            item,
-                                            toolbar_ret_descr_from_val
-                                               (toolbar_item->index),
-                                            NULL);
                        break;
                }
 
        }
        toolbar_data->toolbar = toolbar;
+       gtk_widget_show_all(toolbar);
+
        if (type == TOOLBAR_MAIN)
                activate_compose_button(toolbar_data, 
                                        prefs_common.toolbar_style, 
@@ -1959,8 +1892,18 @@ Toolbar *toolbar_create(ToolbarType       type,
                activate_learn_button(toolbar_data, prefs_common.toolbar_style,
                                LEARN_SPAM);
        
-       gtk_widget_show_all(toolbar);
-       
+#ifndef MAEMO
+       gtk_container_add(GTK_CONTAINER(container), toolbar);
+       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
+#else
+       if ( GTK_IS_WINDOW(container) ) {
+               hildon_window_add_toolbar (HILDON_WINDOW(container), GTK_TOOLBAR(toolbar));
+               gtk_widget_show_all (container);
+       } else {
+               gtk_container_add(GTK_CONTAINER(container), toolbar);
+               gtk_container_set_border_width(GTK_CONTAINER(container), 2);
+       }
+#endif
        return toolbar_data; 
 }
 
@@ -2064,16 +2007,12 @@ void toolbar_main_set_sensitive(gpointer data)
        if (toolbar->getall_btn) {
                SET_WIDGET_COND(toolbar->getall_btn, 
                        M_HAVE_ACCOUNT|M_UNLOCKED);
-               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->getall_combo),
-                       M_HAVE_ACCOUNT|M_UNLOCKED);
        }
        if (toolbar->send_btn) {
                SET_WIDGET_COND(toolbar->send_btn,
                        M_HAVE_QUEUED_MAILS);
        }
        if (toolbar->compose_mail_btn) {
-               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->compose_combo),
-                       M_HAVE_ACCOUNT);
                SET_WIDGET_COND(toolbar->compose_news_btn, 
                        M_HAVE_ACCOUNT);
        }
@@ -2088,37 +2027,22 @@ void toolbar_main_set_sensitive(gpointer data)
        if (toolbar->reply_btn) {
                SET_WIDGET_COND(toolbar->reply_btn,
                        M_HAVE_ACCOUNT|M_TARGET_EXIST);
-               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->reply_combo),
-                       M_HAVE_ACCOUNT|M_TARGET_EXIST);
        }
        if (toolbar->replyall_btn) {
                SET_WIDGET_COND(toolbar->replyall_btn,
                        M_HAVE_ACCOUNT|M_TARGET_EXIST);
-               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replyall_combo),
-                       M_HAVE_ACCOUNT|M_TARGET_EXIST);
        }
        if (toolbar->replylist_btn) {
                SET_WIDGET_COND(toolbar->replylist_btn,
                        M_HAVE_ACCOUNT|M_TARGET_EXIST);
-               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replylist_combo),
-                       M_HAVE_ACCOUNT|M_TARGET_EXIST);
        }
        if (toolbar->replysender_btn) {
                SET_WIDGET_COND(toolbar->replysender_btn,
                        M_HAVE_ACCOUNT|M_TARGET_EXIST);
-               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replysender_combo),
-                       M_HAVE_ACCOUNT|M_TARGET_EXIST);
        }
        if (toolbar->fwd_btn) {
                SET_WIDGET_COND(toolbar->fwd_btn, 
                        M_HAVE_ACCOUNT|M_TARGET_EXIST);
-               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->fwd_combo),
-                       M_HAVE_ACCOUNT|M_TARGET_EXIST); 
-       }
-       if (toolbar->fwd_combo) {
-               GtkWidget *submenu = gtk_item_factory_get_widget(toolbar->fwd_combo->factory, "/Redirect");
-               SET_WIDGET_COND(submenu, 
-                       M_HAVE_ACCOUNT|M_TARGET_EXIST); 
        }
 
        if (prefs_common.next_unread_msg_dialog == NEXTUNREADMSGDIALOG_ASSUME_NO) {
@@ -2147,10 +2071,6 @@ void toolbar_main_set_sensitive(gpointer data)
                SET_WIDGET_COND(toolbar->learn_spam_btn, 
                        M_TARGET_EXIST|M_CAN_LEARN_SPAM);
 
-       if (toolbar->ham_combo)
-               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->ham_combo),
-                       M_TARGET_EXIST|M_CAN_LEARN_SPAM);
-
        if (toolbar->cancel_inc_btn)
                SET_WIDGET_COND(toolbar->cancel_inc_btn,
                                M_INC_ACTIVE);
@@ -2233,11 +2153,9 @@ void toolbar_init(Toolbar * toolbar) {
        toolbar->folders_btn            = NULL;
        toolbar->get_btn                = NULL;
        toolbar->getall_btn             = NULL;
-       toolbar->getall_combo           = NULL;
        toolbar->send_btn               = NULL;
        toolbar->compose_mail_btn       = NULL;
        toolbar->compose_news_btn       = NULL;
-       toolbar->compose_combo          = NULL;
        toolbar->reply_btn              = NULL;
        toolbar->replysender_btn        = NULL;
        toolbar->replyall_btn           = NULL;
index daaed122494edf5f3687d49e8574ad16a0834d34..227e550bea6129c7a22909c5f783c2930e754dcb 100644 (file)
@@ -52,24 +52,17 @@ struct _Toolbar {
        GtkWidget *folders_btn;
        GtkWidget *get_btn;
        GtkWidget *getall_btn;
-       ComboButton *getall_combo;
        GtkWidget *send_btn;
 
        GtkWidget *compose_mail_btn;
        GtkWidget *compose_news_btn;
-       ComboButton *compose_combo;
 
        GtkWidget *reply_btn;
-       ComboButton *reply_combo;
        GtkWidget *replysender_btn;
-       ComboButton *replysender_combo;
        GtkWidget *replyall_btn;
-       ComboButton *replyall_combo;
        GtkWidget *replylist_btn;
-       ComboButton *replylist_combo;
 
        GtkWidget *fwd_btn;
-       ComboButton *fwd_combo;
        
        GtkWidget *trash_btn;
        GtkWidget *delete_btn;
@@ -80,7 +73,6 @@ struct _Toolbar {
        GtkWidget *separator;
        GtkWidget *learn_spam_btn;
        GtkWidget *learn_ham_btn;
-       ComboButton *ham_combo;
        
        GtkWidget *cancel_inc_btn;