2007-06-24 [colin] 2.9.2cvs73

	* src/news_gtk.c
		Fix bug 1249, 'Error handling for
		news errors needs modification'
		Only popup error if the according
		pref in Prefs/Receive is set.

diff --git a/ChangeLog b/ChangeLog
index a3794d512bd194b474c9158bec03a746700d58c4..851e9e867dbb2365fa586c43e26abc9e8d423127 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-24 [colin]     2.9.2cvs73
+
+       * src/news_gtk.c
+               Fix bug 1249, 'Error handling for 
+               news errors needs modification'
+               Only popup error if the according
+               pref in Prefs/Receive is set.
+

 2007-06-21 [colin]     2.9.2cvs72
 
        * src/common/plugin.c
 2007-06-21 [colin]     2.9.2cvs72
 
        * src/common/plugin.c

diff --git a/PATCHSETS b/PATCHSETS
index 1e15112267d885ea68ad2aa11404a47452d1745e..8b781e84024b1deec84ee5b5ae36f11acc268f3d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2648,3 +2648,4 @@
 ( cvs diff -u -r 1.14.2.14 -r 1.14.2.15 src/importldif.c;  ) > 2.9.2cvs70.patchset
 ( cvs diff -u -r 1.382.2.390 -r 1.382.2.391 src/compose.c;  cvs diff -u -r 1.94.2.135 -r 1.94.2.136 src/messageview.c;  ) > 2.9.2cvs71.patchset
 ( cvs diff -u -r 1.13.2.27 -r 1.13.2.28 src/common/plugin.c;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/common/plugin.h;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.13.2.32 -r 1.13.2.33 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/plugins/demo/demo.c;  cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpinline/plugin.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpmime/plugin.c;  cvs diff -u -r 1.18.2.53 -r 1.18.2.54 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.14.2.53 -r 1.14.2.54 src/plugins/trayicon/trayicon.c;  ) > 2.9.2cvs72.patchset
 ( cvs diff -u -r 1.14.2.14 -r 1.14.2.15 src/importldif.c;  ) > 2.9.2cvs70.patchset
 ( cvs diff -u -r 1.382.2.390 -r 1.382.2.391 src/compose.c;  cvs diff -u -r 1.94.2.135 -r 1.94.2.136 src/messageview.c;  ) > 2.9.2cvs71.patchset
 ( cvs diff -u -r 1.13.2.27 -r 1.13.2.28 src/common/plugin.c;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/common/plugin.h;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.13.2.32 -r 1.13.2.33 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/plugins/demo/demo.c;  cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpinline/plugin.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpmime/plugin.c;  cvs diff -u -r 1.18.2.53 -r 1.18.2.54 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.14.2.53 -r 1.14.2.54 src/plugins/trayicon/trayicon.c;  ) > 2.9.2cvs72.patchset

+( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/news_gtk.c;  ) > 2.9.2cvs73.patchset

diff --git a/configure.ac b/configure.ac
index 90d0af0628197436c2ab00da165de8d3c09a4eeb..37e68294010750aec544155fe245f7decda3658e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=72
+EXTRA_VERSION=73

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/news_gtk.c b/src/news_gtk.c
index c62d55095c34ecec1e138662c5acb73e71671f4b..00f0951e633c6461b7ed85a2c3160e52e1f38340 100644 (file)
--- a/src/news_gtk.c
+++ b/src/news_gtk.c
@@ -299,7 +299,10 @@ void news_gtk_synchronise(FolderItem *item)
                gchar *name;
 
                name = trim_string(item->name, 32);
                gchar *name;
 
                name = trim_string(item->name, 32);

-               alertpanel_error(_("Error occurred while downloading messages in '%s'."), name);
+               if (prefs_common.no_recv_err_panel)
+                       log_error(LOG_PROTOCOL, _("Error occurred while downloading messages in '%s'."), name);
+               else
+                       alertpanel_error(_("Error occurred while downloading messages in '%s'."), name);

                g_free(name);
        }
        folder_set_ui_func(item->folder, NULL, NULL);
                g_free(name);
        }
        folder_set_ui_func(item->folder, NULL, NULL);