Add patch missing from the previous commit.

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

3 files changed, 85 insertions, 5 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 6f151375a027..21bbe415be18 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.196 2013/01/11 18:10:36 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.197 2013/01/11 18:14:42 billie Exp $
+
+  11 Jan 2013; Daniel Pielmeier <billie@gentoo.org>
+  +files/conky-1.9.0-update-when-message-count-decreases.patch:
+  Add patch missing from the previous commit.
 
 *conky-1.9.0-r2 (11 Jan 2013)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 0f57878c9478..828fa543e409 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -12,15 +12,16 @@ AUX conky-1.8.1-utf8-scroll.patch 2814 SHA256 ee622cda243c7265915c858b264fc4750a
 AUX conky-1.8.1-xmms2.patch 1190 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6af5e94cd4836cd14c70e2bdc SHA512 ec7f526a3b3fed3a80b1f998bbf2f1d48931caa209605767283da8440551c950a6f8bf7efcca6fde51f085b3eb5abb1a357dee6b2b32c4537edf9fae5fd0d1d5 WHIRLPOOL 904226a6749f7516c46a75e36b83218b27018b328196086d5a9624d726a5b9d31c87dfa8df9b60f013be64487cb6bbf5291014b1d350681d7412932b29bddc42
 AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258729df19098836f7f9ace0130b316 SHA512 555a7234933e6967cdf7ee003e46b089f29819891551205ab7d3008037f8c8771473ced3ed3da1009e2041e9d34beb6edca25fb1017f043a824611d439094e0e WHIRLPOOL 64d88b5b94e435cd0473d18fceaa1358dcea1e1d2c5c2de93588351c0e08f6fe3461e4a1d8b470533f1d8fb80c99ec078825d4b7803f7042be5bee74a540791d
 AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014
+AUX conky-1.9.0-update-when-message-count-decreases.patch 2723 SHA256 d47df08331ff381eacfb9729f76135f7e556b51a4d8e2005df789f604b2fed38 SHA512 f4867a37d3874a3b6248d33c176f2178fa1171a16c61789895c4c10419ce28bc766d712ebba9ca7eade2c352331f43466e440f3c787ab879e66d4a60177b6264 WHIRLPOOL ab4fc736098bd6577e75a3670bfd0d39ad9a453fe3fce41716e4c6ed9d6f56f9b22ab2d0589253d9aad4dfe158c1c465588876e15a820c02d9cfdca9a11e68d9
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
 EBUILD conky-1.9.0-r1.ebuild 3862 SHA256 46404d43acdcd36922d3ec35fa7b05b55461c8d54beffcfcea893bb6143b5a30 SHA512 bf7058de7f0388c542ad1d2da1646391732a8057f15f5704d62663b03cb2739bc93de668129ca58eb09a96c113ba9e0fb4e85575fc4df8de82958f44245f2350 WHIRLPOOL 2cb95aa399886ab56c5118f5a94ed63aca391f7e7d31f8ea248eb166f0186aed4a3789ea4520756218b0fca444cfd52437e954aff7c438bd63b459fd96fcd661
 EBUILD conky-1.9.0-r2.ebuild 3933 SHA256 d725233cf58ebae7107967f646344825a02f65eb96615abbe9ebda1695036f4f SHA512 a81553f9f49b325f3529515003223d7b2ab803e45ddca1c2417dbbba05eadebe97b4e98b86cb44b6cfb8319772f6ba44b3532bd81201bf075b04409d3669cfd5 WHIRLPOOL 0f067a89b13c2d37f4cb0a75001773d6a4da711317746342082bc6a499896432973bf5a2dd3b9c79308f57a9fda4fd6cc70ed192b9a1a2db471c75fc6c103592
-MISC ChangeLog 29961 SHA256 085558471241b3fd4a2590d438ca871992644e4f6823a23f7f6d9f577d74bd94 SHA512 5c67cd4e78e44f0e853dc4d63b86dad1b40c64677478053419fe4eeedb34e02d0cfaa134b1279cb63c6f72539f634ed7c4480bd0255e1b10a640c69aa4914d88 WHIRLPOOL 708eee95e5f085c2c38afeadd328d86dad1100d585393de426e8cf28087c13a76a2251faa7ef42cc9201585f56aab8fa70758bb6c1f9f2617ef2b55d62c843c6
+MISC ChangeLog 30124 SHA256 07d45d75dca9a1e6ec25b03c9607de45f1d0b527d2e9006dc03b0769c99fdd7d SHA512 cd5538b0548b888e19a64c6b5abe89a301e2bc3dab87ffd1b7ec8852edfbb82d623a67b6ba120b42d5fb3fcdc92e1fa8ec6ff9ed5f5b93b7c237ec10744e8ee3 WHIRLPOOL 3ad6f4fbccf62828434a07d85b575880c72f268e969762cb75389ba3da67e9b897181c3964a916c7281034a13c36ec0d3a9e3f7feafcc669b9d3836447976746
 MISC metadata.xml 2035 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302 SHA512 546dafceed03c1148cdd4003021112306b636124f0f4ee13950d4a1b5bb8a7ff56256e6acf131e08e4573195e987810d562b2c202ba9c3022097a52e47c1f325 WHIRLPOOL 3e2eebfc6456a2e3d4658076ba8a02c84ff7a967768330e6df866589886b10dceccdaf8ff4d6863a2a61f676cb09d60ab8d7f5e57e1ae895b890f12de009dc23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDwVaEACgkQlcuUeyFa0U0U/ACeJYz5fzOdQ+E3nnQNRFXq+v3g
-Z0QAn3zrvWGn4fc4oCuW9IChIzsttPdW
-=79m5
+iEYEAREIAAYFAlDwVpMACgkQlcuUeyFa0U1iyACgjc+zGLPHqBjCweshSivN4ngA
+oIAAoO78dle8ysOgv0O5bvzkv1DqsVfD
+=LgKI
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch b/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch
new file mode 100644
index 000000000000..dd422c584e35
--- /dev/null
+++ b/app-admin/conky/files/conky-1.9.0-update-when-message-count-decreases.patch
@@ -0,0 +1,75 @@
+diff --git a/src/mail.c b/src/mail.c
+index 7f60ba3..882b7c8 100644
+--- a/src/mail.c
++++ b/src/mail.c
+@@ -630,8 +630,15 @@ int imap_check_status(char *recvbuf, struct mail_s *mail)
+ 
+ void imap_unseen_command(struct mail_s *mail, unsigned long old_unseen, unsigned long old_messages)
+ {
+-	if (strlen(mail->command) > 1 && (mail->unseen > old_unseen
+-				|| (mail->messages > old_messages && mail->unseen > 0))) {
++	/*
++	 * Georg Hopp (2012-12-23):
++	 * Well, i will read mails from time to time and i want the unseen
++	 * count to be reduced when they are read...so, this seems wrong.
++	 * Try a better one.... :)
++	 */
++	if (strlen(mail->command) > 1
++			&& (mail->unseen != old_unseen
++			 || mail->messages != old_messages)) {
+ 		// new mail goodie
+ 		if (system(mail->command) == -1) {
+ 			perror("system()");
+@@ -813,7 +820,7 @@ static void *imap_thread(void *arg)
+ 					if (strlen(recvbuf) > 2) {
+ 						unsigned long messages, recent = 0;
+ 						char *buf = recvbuf;
+-						char force_check = 0;
++						char force_check = 1;
+ 						buf = strstr(buf, "EXISTS");
+ 						while (buf && strlen(buf) > 1 && strstr(buf + 1, "EXISTS")) {
+ 							buf = strstr(buf + 1, "EXISTS");
+@@ -825,9 +832,7 @@ static void *imap_thread(void *arg)
+ 							}
+ 							if (sscanf(buf, "* %lu EXISTS\r\n", &messages) == 1) {
+ 								timed_thread_lock(mail->p_timed_thread);
+-								if (mail->messages != messages) {
+-									force_check = 1;
+-								}
++								force_check = 1;
+ 								timed_thread_unlock(mail->p_timed_thread);
+ 							}
+ 						}
+@@ -850,7 +855,10 @@ static void *imap_thread(void *arg)
+ 						 * something other than 0, or we had a timeout
+ 						 */
+ 						buf = recvbuf;
+-						if (recent > 0 || (buf && strstr(buf, " FETCH ")) || fetchtimeout.tv_sec == 0 || force_check) {
++						if (recent > 0
++								|| (buf && strstr(buf, " FETCH "))
++								|| (buf && strstr(buf, " EXPUNGE "))
++								|| fetchtimeout.tv_sec == 0 || force_check) {
+ 							// re-check messages and unseen
+ 							if (imap_command(sockfd, "DONE\r\n", recvbuf, "a5 OK")) {
+ 								fail++;
+@@ -868,6 +876,9 @@ static void *imap_thread(void *arg)
+ 								fail++;
+ 								break;
+ 							}
++							imap_unseen_command(mail, old_unseen, old_messages);
++							old_unseen = mail->unseen;
++							old_messages = mail->messages;
+ 							strncpy(sendbuf, "a5 IDLE\r\n", MAXDATASIZE);
+ 							if (imap_command(sockfd, sendbuf, recvbuf, "+ idling")) {
+ 								fail++;
+@@ -886,10 +897,7 @@ static void *imap_thread(void *arg)
+ 						fail++;
+ 						break;
+ 					}
+-					imap_unseen_command(mail, old_unseen, old_messages);
+ 					fail = 0;
+-					old_unseen = mail->unseen;
+-					old_messages = mail->messages;
+ 				}
+ 				if (fail) break;
+ 			} else {