[Pkg-xfce-commits] r3102 - in goodies/trunk/xfce4-mailwatch-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2009-04-09 19:52:20 +0000 (Thu, 09 Apr 2009)
New Revision: 3102

Added:
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/
   goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_fix-cpu-usage.diff
Modified:
   goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
Log:
* debian/patches:
  - 01_fix-cpu-usage added, fix high cpu usage (Xfce #4494)   closes: #523312

Modified: goodies/trunk/xfce4-mailwatch-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	2009-04-08 20:12:22 UTC (rev 3101)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/changelog	2009-04-09 19:52:20 UTC (rev 3102)
@@ -1,3 +1,10 @@
+xfce4-mailwatch-plugin (1.1.0-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-cpu-usage added, fix high cpu usage (Xfce #4494)   closes: #523312
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 09 Apr 2009 21:46:54 +0200
+
 xfce4-mailwatch-plugin (1.1.0-1) unstable; urgency=low
 
   [ Simon Huggins ]

Added: goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_fix-cpu-usage.diff
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_fix-cpu-usage.diff	                        (rev 0)
+++ goodies/trunk/xfce4-mailwatch-plugin/debian/patches/01_fix-cpu-usage.diff	2009-04-09 19:52:20 UTC (rev 3102)
@@ -0,0 +1,24 @@
+diff --git a/libmailwatch-core/mailwatch-net-conn.c b/libmailwatch-core/mailwatch-net-conn.c
+index 9264376..0f88678 100644
+--- a/libmailwatch-core/mailwatch-net-conn.c
++++ b/libmailwatch-core/mailwatch-net-conn.c
+@@ -767,10 +767,16 @@ xfce_mailwatch_net_conn_recv_internal(XfceMailwatchNetConn *net_conn,
+             return -1;
+         } else if(!block)
+             return 0;
+-    } while(ret < 0 && EINTR == errno && !TIMER_EXPIRED(RECV_TIMEOUT)
+-            && SHOULD_CONTINUE(net_conn));
++    } while((ret == 0 || (ret < 0 && EINTR == errno))
++            && !TIMER_EXPIRED(RECV_TIMEOUT) && SHOULD_CONTINUE(net_conn));
+ 
+-    if(!SHOULD_CONTINUE(net_conn)) {
++    if(ret < 0 && EINTR != errno) {
++        if(error) {
++            g_set_error(error, XFCE_MAILWATCH_ERROR,
++                        XFCE_MAILWATCH_ERROR_FAILED, strerror(errno));
++        }
++        return -1;
++    } else if(!SHOULD_CONTINUE(net_conn)) {
+         if(error) {
+             g_set_error(error, XFCE_MAILWATCH_ERROR,
+                         XFCE_MAILWATCH_ERROR_ABORTED, _("Operation aborted"));