From 4388366a68c2e60b5600ee8290bf7ccec664fb0b Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sun, 8 Jul 2012 04:54:32 +0000 Subject: [PATCH] 2012-07-08 [paul] 3.8.1cvs10 * src/gtk/icon_legend.c fix (reveal) hidden icon in gui and build warning --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/icon_legend.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d65deb2a..eccfbd867 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-07-08 [paul] 3.8.1cvs10 + + * src/gtk/icon_legend.c + fix (reveal) hidden icon in gui and build warning + 2012-07-07 [paul] 3.8.1cvs9 * src/plugins/pgpcore/prefs_gpg.c diff --git a/PATCHSETS b/PATCHSETS index 1df567f01..d948eacab 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4384,3 +4384,4 @@ ( diff -u /dev/null claws-features.h.in; cvs diff -u -r 1.654.2.4459 -r 1.654.2.4460 configure.ac; cvs diff -u -r 1.24.2.30 -r 1.24.2.31 Makefile.am; cvs diff -u -r 1.61.2.105 -r 1.61.2.106 src/account.c; cvs diff -u -r 1.12.2.71 -r 1.12.2.72 src/action.c; cvs diff -u -r 1.27.2.62 -r 1.27.2.63 src/addr_compl.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/addrcustomattr.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/addrduplicates.c; cvs diff -u -r 1.9.2.36 -r 1.9.2.37 src/addressadd.c; cvs diff -u -r 1.60.2.148 -r 1.60.2.149 src/addressbook.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/addressbook_foldersel.c; cvs diff -u -r 1.5.10.38 -r 1.5.10.39 src/addrgather.c; cvs diff -u -r 1.28.2.48 -r 1.28.2.49 src/addrindex.c; cvs diff -u -r 1.17.2.47 -r 1.17.2.48 src/alertpanel.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/autofaces.c; cvs diff -u -r 1.2.4.28 -r 1.2.4.29 src/browseldap.c; cvs diff -u -r 1.65.2.75 -r 1.65.2.76 src/codeconv.c; cvs diff -u -r 1.15.2.27 -r 1.15.2.28 src/codeconv.h; cvs diff -u -r 1.382.2.603 -r 1.382.2.604 src/compose.c; cvs diff -u -r 1.23.2.37 -r 1.23.2.38 src/crash.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/customheader.c; cvs diff -u -r 1.2.16.8 -r 1.2.16.9 src/displayheader.c; cvs diff -u -r 1.14.2.62 -r 1.14.2.63 src/editaddress.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.5.12.18 -r 1.5.12.19 src/editbook.c; cvs diff -u -r 1.11.2.29 -r 1.11.2.30 src/editgroup.c; cvs diff -u -r 1.5.12.20 -r 1.5.12.21 src/editjpilot.c; cvs diff -u -r 1.8.2.45 -r 1.8.2.46 src/editldap.c; cvs diff -u -r 1.10.2.20 -r 1.10.2.21 src/editldap_basedn.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/edittags.c; cvs diff -u -r 1.5.12.19 -r 1.5.12.20 src/editvcard.c; cvs diff -u -r 1.3.2.30 -r 1.3.2.31 src/exphtmldlg.c; cvs diff -u -r 1.1.4.36 -r 1.1.4.37 src/expldifdlg.c; cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/export.c; cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/exporthtml.c; cvs diff -u -r 1.1.4.25 -r 1.1.4.26 src/exportldif.c; cvs diff -u -r 1.213.2.208 -r 1.213.2.209 src/folder.c; cvs diff -u -r 1.2.2.39 -r 1.2.2.40 src/folder_item_prefs.c; cvs diff -u -r 1.14.2.33 -r 1.14.2.34 src/grouplistdialog.c; cvs diff -u -r 1.8.2.36 -r 1.8.2.37 src/headerview.c; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/image_viewer.c; cvs diff -u -r 1.179.2.257 -r 1.179.2.258 src/imap.c; cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/imap_gtk.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/imap_gtk.h; cvs diff -u -r 1.13.2.32 -r 1.13.2.33 src/import.c; cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/importldif.c; cvs diff -u -r 1.4.12.24 -r 1.4.12.25 src/importmutt.c; cvs diff -u -r 1.1.14.24 -r 1.1.14.25 src/importpine.c; cvs diff -u -r 1.149.2.107 -r 1.149.2.108 src/inc.c; cvs diff -u -r 1.29.2.17 -r 1.29.2.18 src/inc.h; cvs diff -u -r 1.18.2.35 -r 1.18.2.36 src/jpilot.c; cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/jpilot.h; cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/ldapctrl.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldaplocate.c; cvs diff -u -r 1.3.2.39 -r 1.3.2.40 src/ldapquery.c; cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/ldapserver.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/ldapupdate.c; cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/ldaputil.c; cvs diff -u -r 1.115.2.251 -r 1.115.2.252 src/main.c; cvs diff -u -r 1.11.2.17 -r 1.11.2.18 src/manual.c; cvs diff -u -r 1.75.2.71 -r 1.75.2.72 src/matcher.c; cvs diff -u -r 1.28.2.51 -r 1.28.2.52 src/mbox.c; cvs diff -u -r 1.3.12.42 -r 1.3.12.43 src/message_search.c; cvs diff -u -r 1.19.2.30 -r 1.19.2.31 src/messageview.h; cvs diff -u -r 1.79.2.73 -r 1.79.2.74 src/mh.c; cvs diff -u -r 1.2.2.42 -r 1.2.2.43 src/mh_gtk.c; cvs diff -u -r 1.83.2.190 -r 1.83.2.191 src/mimeview.c; cvs diff -u -r 1.16.2.71 -r 1.16.2.72 src/msgcache.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/msgcache.h; cvs diff -u -r 1.101.2.69 -r 1.101.2.70 src/news.c; cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/news_gtk.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/news_gtk.h; cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/noticeview.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/partial_download.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/partial_download.h; cvs diff -u -r 1.56.2.69 -r 1.56.2.70 src/pop.c; cvs diff -u -r 1.17.2.25 -r 1.17.2.26 src/pop.h; cvs diff -u -r 1.105.2.173 -r 1.105.2.174 src/prefs_account.c; cvs diff -u -r 1.49.2.47 -r 1.49.2.48 src/prefs_account.h; cvs diff -u -r 1.60.2.81 -r 1.60.2.82 src/prefs_actions.c; cvs diff -u -r 1.204.2.211 -r 1.204.2.212 src/prefs_common.c; cvs diff -u -r 1.103.2.139 -r 1.103.2.140 src/prefs_common.h; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/prefs_compose_writing.c; cvs diff -u -r 1.16.2.43 -r 1.16.2.44 src/prefs_customheader.c; cvs diff -u -r 1.16.2.45 -r 1.16.2.46 src/prefs_display_header.c; cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/prefs_ext_prog.c; cvs diff -u -r 1.59.2.89 -r 1.59.2.90 src/prefs_filtering.c; cvs diff -u -r 1.1.4.76 -r 1.1.4.77 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_folder_column.c; cvs diff -u -r 1.52.2.87 -r 1.52.2.88 src/prefs_folder_item.c; cvs diff -u -r 1.4.2.28 -r 1.4.2.29 src/prefs_fonts.c; cvs diff -u -r 1.10.2.43 -r 1.10.2.44 src/prefs_gtk.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_logging.c; cvs diff -u -r 1.43.2.93 -r 1.43.2.94 src/prefs_matcher.c; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_message.c; cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_other.c; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/prefs_quote.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_receive.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_send.c; cvs diff -u -r 1.5.2.44 -r 1.5.2.45 src/prefs_spelling.c; cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/prefs_summaries.c; cvs diff -u -r 1.10.2.30 -r 1.10.2.31 src/prefs_summary_column.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_summary_open.c; cvs diff -u -r 1.30.2.71 -r 1.30.2.72 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_wrapping.c; cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/printing.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/printing.h; cvs diff -u -r 1.47.2.57 -r 1.47.2.58 src/procheader.c; cvs diff -u -r 1.49.2.145 -r 1.49.2.146 src/procmime.c; cvs diff -u -r 1.17.2.27 -r 1.17.2.28 src/procmime.h; cvs diff -u -r 1.60.2.61 -r 1.60.2.62 src/procmsg.h; cvs diff -u -r 1.8.2.46 -r 1.8.2.47 src/quote_fmt.c; cvs diff -u -r 1.17.2.17 -r 1.17.2.18 src/recv.c; cvs diff -u -r 1.17.2.63 -r 1.17.2.64 src/send_message.c; cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/setup.c; cvs diff -u -r 1.3.2.38 -r 1.3.2.39 src/ssl_manager.c; cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/statusbar.c; cvs diff -u -r 1.15.2.69 -r 1.15.2.70 src/summary_search.c; cvs diff -u -r 1.96.2.242 -r 1.96.2.243 src/textview.c; cvs diff -u -r 1.12.2.32 -r 1.12.2.33 src/textview.h; cvs diff -u -r 1.43.2.128 -r 1.43.2.129 src/toolbar.c; cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/undo.c; cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/unmime.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/uri_opener.c; cvs diff -u -r 1.1.2.87 -r 1.1.2.88 src/wizard.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/common/claws.c; cvs diff -u -r 1.9.2.55 -r 1.9.2.56 src/common/defs.h; cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/common/hooks.c; cvs diff -u -r 1.6.2.23 -r 1.6.2.24 src/common/log.c; cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/common/log.h; cvs diff -u -r 1.13.2.45 -r 1.13.2.46 src/common/plugin.c; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/common/prefs.c; cvs diff -u -r 1.23.2.27 -r 1.23.2.28 src/common/session.c; cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/common/session.h; cvs diff -u -r 1.11.2.31 -r 1.11.2.32 src/common/smtp.c; cvs diff -u -r 1.6.2.19 -r 1.6.2.20 src/common/smtp.h; cvs diff -u -r 1.13.2.48 -r 1.13.2.49 src/common/socket.c; cvs diff -u -r 1.13.2.25 -r 1.13.2.26 src/common/socket.h; cvs diff -u -r 1.9.2.52 -r 1.9.2.53 src/common/ssl.c; cvs diff -u -r 1.2.2.15 -r 1.2.2.16 src/common/ssl.h; cvs diff -u -r 1.4.2.42 -r 1.4.2.43 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/common/ssl_certificate.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/string_match.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/common/tags.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/common/timing.h; cvs diff -u -r 1.36.2.199 -r 1.36.2.200 src/common/utils.c; cvs diff -u -r 1.20.2.78 -r 1.20.2.79 src/common/utils.h; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/etpan/etpan-thread-manager.c; cvs diff -u -r 1.1.4.118 -r 1.1.4.119 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/etpan/nntp-thread.c; cvs diff -u -r 1.4.2.85 -r 1.4.2.86 src/gtk/about.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/gtk/combobox.c; cvs diff -u -r 1.5.2.34 -r 1.5.2.35 src/gtk/description_window.c; cvs diff -u -r 1.2.2.45 -r 1.2.2.46 src/gtk/filesel.c; cvs diff -u -r 1.9.2.77 -r 1.9.2.78 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/gtkaspell.h; cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/gtk/gtkshruler.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkunit.c; cvs diff -u -r 1.5.2.103 -r 1.5.2.104 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.65 -r 1.4.2.66 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/icon_legend.c; cvs diff -u -r 1.2.2.46 -r 1.2.2.47 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.41 -r 1.1.4.42 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.45 -r 1.5.2.46 src/gtk/menu.c; cvs diff -u -r 1.5.2.62 -r 1.5.2.63 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/pluginwindow.h; cvs diff -u -r 1.12.2.59 -r 1.12.2.60 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.32 -r 1.1.4.33 src/gtk/progressdialog.c; cvs diff -u -r 1.1.2.109 -r 1.1.2.110 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/spell_entry.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/spell_entry.h; cvs diff -u -r 1.9.2.34 -r 1.9.2.35 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.13 -r 1.6.2.14 src/gtk/sslcertwindow.h; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.12.2.31 -r 1.12.2.32 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpcore/pgp_viewer.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.69 -r 1.1.2.70 src/plugins/pgpcore/sgpgme.c; cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/smime/plugin.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/smime/smime.c; cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.18.2.66 -r 1.18.2.67 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.59 -r 1.23.2.60 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.81 -r 1.14.2.82 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/trayicon/trayicon_prefs.c; ) > 3.8.1cvs7.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 claws-features.h.in; cvs diff -u -r 1.15.2.28 -r 1.15.2.29 src/codeconv.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/imap_gtk.h; cvs diff -u -r 1.29.2.18 -r 1.29.2.19 src/inc.h; cvs diff -u -r 1.10.2.10 -r 1.10.2.11 src/jpilot.h; cvs diff -u -r 1.19.2.31 -r 1.19.2.32 src/messageview.h; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/msgcache.h; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/news_gtk.h; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/partial_download.h; cvs diff -u -r 1.17.2.26 -r 1.17.2.27 src/pop.h; cvs diff -u -r 1.49.2.48 -r 1.49.2.49 src/prefs_account.h; cvs diff -u -r 1.103.2.140 -r 1.103.2.141 src/prefs_common.h; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/printing.h; cvs diff -u -r 1.17.2.28 -r 1.17.2.29 src/procmime.h; cvs diff -u -r 1.60.2.62 -r 1.60.2.63 src/procmsg.h; cvs diff -u -r 1.25.2.74 -r 1.25.2.75 src/stock_pixmap.c; cvs diff -u -r 1.12.2.33 -r 1.12.2.34 src/textview.h; cvs diff -u -r 1.9.2.56 -r 1.9.2.57 src/common/defs.h; cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/common/log.h; cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/common/session.h; cvs diff -u -r 1.6.2.20 -r 1.6.2.21 src/common/smtp.h; cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/socket.h; cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/common/ssl.h; cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/common/ssl_certificate.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/common/timing.h; cvs diff -u -r 1.20.2.79 -r 1.20.2.80 src/common/utils.h; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/gtkaspell.h; cvs diff -u -r 1.4.2.66 -r 1.4.2.67 src/gtk/gtkutils.h; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/pluginwindow.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/spell_entry.h; cvs diff -u -r 1.6.2.14 -r 1.6.2.15 src/gtk/sslcertwindow.h; ) > 3.8.1cvs8.patchset ( cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/pgpcore/prefs_gpg.c; ) > 3.8.1cvs9.patchset +( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/gtk/icon_legend.c; ) > 3.8.1cvs10.patchset diff --git a/configure.ac b/configure.ac index c27cd7272..06d0a4f4f 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=9 +EXTRA_VERSION=10 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c index d0d77d178..b0676bcfa 100644 --- a/src/gtk/icon_legend.c +++ b/src/gtk/icon_legend.c @@ -33,7 +33,7 @@ #include "stock_pixmap.h" #include "prefs_gtk.h" -#define ICONS 20 +#define ICONS 21 StockPixmap legend_icons[ICONS] = { STOCK_PIXMAP_NEW, -- 2.25.1