From: Colin Leroy Date: Fri, 12 Sep 2008 05:47:55 +0000 (+0000) Subject: 2008-09-12 [colin] 3.5.0cvs99 X-Git-Tag: rel_3_6_0~53 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f5196abff7208ca61542b6e0c8e07052b2eeb82e 2008-09-12 [colin] 3.5.0cvs99 * src/inc.c Only go to inbox if there are new mails (and fetch was manual) --- diff --git a/ChangeLog b/ChangeLog index 8de1145dc..97b243556 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-12 [colin] 3.5.0cvs99 + + * src/inc.c + Only go to inbox if there are new mails + (and fetch was manual) + 2008-09-10 [colin] 3.5.0cvs98 * src/inc.c diff --git a/PATCHSETS b/PATCHSETS index d451e4612..dd0ddf934 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3510,3 +3510,4 @@ ( cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/action.h; cvs diff -u -r 1.27.2.42 -r 1.27.2.43 src/addr_compl.c; cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/addressadd.c; cvs diff -u -r 1.18.2.13 -r 1.18.2.14 src/addressbook.h; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/addressbook_foldersel.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/addressitem.h; cvs diff -u -r 1.5.10.25 -r 1.5.10.26 src/addrgather.c; cvs diff -u -r 1.17.2.38 -r 1.17.2.39 src/alertpanel.c; cvs diff -u -r 1.2.4.21 -r 1.2.4.22 src/browseldap.c; cvs diff -u -r 1.14.2.53 -r 1.14.2.54 src/editaddress.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.5.12.12 -r 1.5.12.13 src/editbook.c; cvs diff -u -r 1.5.12.14 -r 1.5.12.15 src/editjpilot.c; cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/editldap.c; cvs diff -u -r 1.10.2.14 -r 1.10.2.15 src/editldap_basedn.c; cvs diff -u -r 1.5.12.13 -r 1.5.12.14 src/editvcard.c; cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/exphtmldlg.c; cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/expldifdlg.c; cvs diff -u -r 1.8.2.26 -r 1.8.2.27 src/export.c; cvs diff -u -r 1.26.2.38 -r 1.26.2.39 src/foldersel.c; cvs diff -u -r 1.4.12.6 -r 1.4.12.7 src/foldersel.h; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gedit-print.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gedit-print.h; cvs diff -u -r 1.14.2.21 -r 1.14.2.22 src/grouplistdialog.c; cvs diff -u -r 1.8.2.27 -r 1.8.2.28 src/headerview.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/headerview.h; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/image_viewer.c; cvs diff -u -r 1.13.2.25 -r 1.13.2.26 src/import.c; cvs diff -u -r 1.14.2.19 -r 1.14.2.20 src/importldif.c; cvs diff -u -r 1.4.12.18 -r 1.4.12.19 src/importmutt.c; cvs diff -u -r 1.1.14.18 -r 1.1.14.19 src/importpine.c; cvs diff -u -r 1.149.2.91 -r 1.149.2.92 src/inc.c; cvs diff -u -r 1.115.2.203 -r 1.115.2.204 src/main.c; cvs diff -u -r 1.7.2.16 -r 1.7.2.17 src/main.h; cvs diff -u -r 1.94.2.184 -r 1.94.2.185 src/messageview.c; cvs diff -u -r 1.19.2.21 -r 1.19.2.22 src/messageview.h; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/noticeview.c; cvs diff -u -r 1.60.2.62 -r 1.60.2.63 src/prefs_actions.c; cvs diff -u -r 1.59.2.73 -r 1.59.2.74 src/prefs_filtering.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_folder_column.c; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/prefs_gtk.h; cvs diff -u -r 1.10.2.22 -r 1.10.2.23 src/prefs_summary_column.c; cvs diff -u -r 1.30.2.52 -r 1.30.2.53 src/prefs_toolbar.c; cvs diff -u -r 1.17.2.48 -r 1.17.2.49 src/send_message.c; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/setup.c; cvs diff -u -r 1.9.2.22 -r 1.9.2.23 src/sourcewindow.c; cvs diff -u -r 1.1.1.1.16.7 -r 1.1.1.1.16.8 src/sourcewindow.h; cvs diff -u -r 1.3.2.30 -r 1.3.2.31 src/ssl_manager.c; cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/statusbar.c; cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/statusbar.h; cvs diff -u -r 1.25.2.60 -r 1.25.2.61 src/stock_pixmap.c; cvs diff -u -r 1.18.2.37 -r 1.18.2.38 src/stock_pixmap.h; cvs diff -u -r 1.395.2.389 -r 1.395.2.390 src/summaryview.c; cvs diff -u -r 1.96.2.205 -r 1.96.2.206 src/textview.c; cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/textview.h; cvs diff -u -r 1.5.14.9 -r 1.5.14.10 src/undo.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/uri_opener.c; cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/wizard.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/wizard.h; cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/common/ssl.h; cvs diff -u -r 1.36.2.144 -r 1.36.2.145 src/common/utils.c; cvs diff -u -r 1.4.2.65 -r 1.4.2.66 src/gtk/about.c; cvs diff -u -r 1.2.2.22 -r 1.2.2.23 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/colorlabel.h; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/combobox.h; cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/gtk/description_window.c; cvs diff -u -r 1.2.2.36 -r 1.2.2.37 src/gtk/filesel.c; cvs diff -u -r 1.9.2.59 -r 1.9.2.60 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/gtkaspell.h; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmclist.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtkcmctree.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmctree.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmoptionmenu.h; cvs diff -u -r 1.1.4.50 -r 1.1.4.51 src/gtk/gtksctree.c; cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/gtk/gtksctree.h; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtkshruler.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/gtkshruler.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtksourceprintjob.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtksourceprintjob.h; cvs diff -u -r 1.5.2.82 -r 1.5.2.83 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.45 -r 1.4.2.46 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/gtk/gtkvscrollbutton.h; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/icon_legend.c; cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.31 -r 1.1.4.32 src/gtk/logwindow.c; cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/gtk/logwindow.h; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/manage_window.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/manage_window.h; cvs diff -u -r 1.5.2.36 -r 1.5.2.37 src/gtk/menu.c; cvs diff -u -r 1.12.2.47 -r 1.12.2.48 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/gtk/progressdialog.c; cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/progressdialog.h; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.23.2.50 -r 1.23.2.51 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.65 -r 1.14.2.66 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/plugins/trayicon/libeggtrayicon/eggtrayicon.h; cvs diff -u -r 1.1 -r 1.2 src/plugins/trayicon/libeggtrayicon/gtk2-funcs.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.h; ) > 3.5.0cvs96.patchset ( cvs diff -u -r 1.382.2.472 -r 1.382.2.473 src/compose.c; ) > 3.5.0cvs97.patchset ( cvs diff -u -r 1.149.2.92 -r 1.149.2.93 src/inc.c; cvs diff -u -r 1.395.2.390 -r 1.395.2.391 src/summaryview.c; cvs diff -u -r 1.23.2.18 -r 1.23.2.19 src/common/session.c; ) > 3.5.0cvs98.patchset +( cvs diff -u -r 1.149.2.93 -r 1.149.2.94 src/inc.c; ) > 3.5.0cvs99.patchset diff --git a/configure.ac b/configure.ac index a7a4dee3a..107c6ac01 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=98 +EXTRA_VERSION=99 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -460,17 +460,24 @@ AC_ARG_ENABLE(deprecated, [ --disable-deprecated disable deprecated GTK functi AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -dnl GNU/Aspell is used for spell checking -AC_ARG_ENABLE(aspell, - [ --disable-aspell disable GNU/aspell support], - [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=yes]) -AC_MSG_CHECKING([whether to use GNU/aspell]) -if test $ac_cv_enable_aspell = yes; then - AC_MSG_RESULT(yes) - AM_PATH_ASPELL(0.50, AC_DEFINE(USE_ASPELL, 1, Define if you use ASPELL to support spell checking), - [use_aspell=no ac_cv_enable_aspell=no]) -else - AC_MSG_RESULT(no) +dnl enchant is used for spell checking +AC_ARG_ENABLE(enchant, + [ --disable-enchant disable enchant support], + [ac_cv_enable_enchant=$enableval], [ac_cv_enable_enchant=yes]) +AC_MSG_CHECKING([whether to use enchant]) +if test $ac_cv_enable_enchant = yes; then + PKG_CHECK_MODULES(ENCHANT, enchant >= 1.0.0, + [ + AC_DEFINE(USE_ENCHANT, 1, enchant) + echo "Building with enchant" + ac_cv_enable_enchant=yes + ], + [ + echo "Building without enchant-notification" + ac_cv_enable_enchant=no + ]) + AC_SUBST(ENCHANT_CFLAGS) + AC_SUBST(ENCHANT_LIBS) fi dnl want crash dialog @@ -1065,7 +1072,7 @@ echo "gnuTLS : $ac_cv_enable_gnutls" echo "iconv : $am_cv_func_iconv" echo "compface : $ac_cv_enable_compface" echo "IPv6 : $ac_cv_enable_ipv6" -echo "GNU/aspell : $ac_cv_enable_aspell" +echo "enchant : $ac_cv_enable_enchant" echo "IMAP4 : $ac_cv_enable_libetpan" echo "NNTP : $ac_cv_enable_libetpan" echo "Crash dialog : $ac_cv_enable_crash_dialog" diff --git a/src/inc.c b/src/inc.c index b4883ee42..a15803c2d 100644 --- a/src/inc.c +++ b/src/inc.c @@ -165,7 +165,7 @@ static void inc_finished(MainWindow *mainwin, gboolean new_messages, gboolean au if (prefs_common.scan_all_after_inc) folderview_check_new(NULL); - if (!autocheck && prefs_common.open_inbox_on_inc) { + if (!autocheck && new_messages && prefs_common.open_inbox_on_inc) { FolderItem *item = NULL; if (cur_account && cur_account->inbox)