r7576 - in packages/trunk/pokerth/debian: . patches

[Evgeni Golov]

Author: sargentd-guest
Date: 2008-06-29 21:24:57 +0000 (Sun, 29 Jun 2008)
New Revision: 7576

Added:
   packages/trunk/pokerth/debian/patches/04_fix_no_logging.dpatch
Modified:
   packages/trunk/pokerth/debian/changelog
   packages/trunk/pokerth/debian/patches/00list
   packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
Log:
Added a patch for #488197
Removed unneeded svn:executable flags from debian/patches/*


Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog	2008-06-29 18:49:29 UTC (rev 7575)
+++ packages/trunk/pokerth/debian/changelog	2008-06-29 21:24:57 UTC (rev 7576)
@@ -7,8 +7,12 @@
     + Added (converted from pokerth.png)
   * debian/pokerth.install:
     + Install debian/pokerth.xpm to /usr/share/pixmaps
+  * debian/patches/04_fix_no_logging.dpatch:
+    + Added new patch by upstream.
+    + Checks if logging is enabled, before writing the log.
+      (Closes: #488197)
 
- -- Evgeni Golov <sargentd at die-welt.net>  Thu, 26 Jun 2008 14:58:57 +0200
+ -- Evgeni Golov <sargentd at die-welt.net>  So, 29 Jun 2008 23:20:42 +0200
 
 pokerth (0.6.2-1) unstable; urgency=low
 

Modified: packages/trunk/pokerth/debian/patches/00list
===================================================================
--- packages/trunk/pokerth/debian/patches/00list	2008-06-29 18:49:29 UTC (rev 7575)
+++ packages/trunk/pokerth/debian/patches/00list	2008-06-29 21:24:57 UTC (rev 7576)
@@ -1,3 +1,4 @@
 01_clean_libpokerth
 02_use_dejavu_fonts
 03_use_--as-needed
+04_fix_no_logging


Property changes on: packages/trunk/pokerth/debian/patches/03_use_--as-needed.dpatch
___________________________________________________________________
Name: svn:executable
   - *

Added: packages/trunk/pokerth/debian/patches/04_fix_no_logging.dpatch
===================================================================
--- packages/trunk/pokerth/debian/patches/04_fix_no_logging.dpatch	                        (rev 0)
+++ packages/trunk/pokerth/debian/patches/04_fix_no_logging.dpatch	2008-06-29 21:24:57 UTC (rev 7576)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_no_logging.dpatch by Felix Hammer <f.hammer at web.de>
+##
+## DP: Upstream's patch for #488197
+## DP: Check if logging is enabled, before writing to the log.
+
+ at DPATCH@
+
+Index: pokerth/src/gui/qt/gametable/log/log.cpp
+===================================================================
+--- pokerth/src/gui/qt/gametable/log/log.cpp	(Revision 1522)
++++ pokerth/src/gui/qt/gametable/log/log.cpp	(Arbeitskopie)
+@@ -1651,18 +1651,23 @@
+ 
+ void Log::flushLogAtHand() { 	
+ 
+-	if(myConfig->readConfigInt("LogInterval") < 2) {
+-// 	write for log after every action and after every hand
+-		writeLogFileStream(logFileStreamString);
+-		logFileStreamString = "";
++	if(myConfig->readConfigInt("LogOnOff")) {
++		if(myConfig->readConfigInt("LogInterval") < 2) {
++	// 	write for log after every action and after every hand
++			writeLogFileStream(logFileStreamString);
++			logFileStreamString = "";
++		}
+ 	}
+ }
+ 
+-void Log::flushLogAtGame(int gameID) { 	
+-//	write for log after every game
+-	if(gameID > lastGameID) {
+-		writeLogFileStream(logFileStreamString);
+-		logFileStreamString = "";
+-		lastGameID = gameID;
++void Log::flushLogAtGame(int gameID) {
++
++	if(myConfig->readConfigInt("LogOnOff")) { 	
++	//	write for log after every game
++		if(gameID > lastGameID) {
++			writeLogFileStream(logFileStreamString);
++			logFileStreamString = "";
++			lastGameID = gameID;
++		}
+ 	}
+ }