Merge branch 'master' of git://git.assembla.com/free_poker_tools.git

Conflicts:
	pyfpdb/fpdb_save_to_db.py

pyfpdb/Configuration.py

@@ -32,6 +32,13 @@ import shutil
 import xml.dom.minidom
 from xml.dom.minidom import Node
 
+def fix_tf(x):
+    if x == "1" or x == 1 or string.lower(x) == "true"  or string.lower(x) == "t":
+        return True
+    if x == "0" or x == 0 or string.lower(x) == "false" or string.lower(x) == "f":
+        return False
+    return False
+
 class Layout:
     def __init__(self, node):
 
@@ -206,11 +213,11 @@ class Import:
         self.callFpdbHud   = node.getAttribute("callFpdbHud")
         self.hhArchiveBase = node.getAttribute("hhArchiveBase")
         if node.hasAttribute("saveActions"):
-            self.saveActions = node.getAttribute("saveActions")
+            self.saveActions = fix_tf(node.getAttribute("saveActions"))
         else:
             self.saveActions = True
         if node.hasAttribute("fastStoreHudCache"):
-            self.fastStoreHudCache = node.getAttribute("fastStoreHudCache")
+            self.fastStoreHudCache = fix_tf(node.getAttribute("fastStoreHudCache"))
         else:
             self.fastStoreHudCache = False
 

pyfpdb/Mucked.py

@@ -373,6 +373,7 @@ class Flop_Mucked(Aux_Window):
                     x = x + int(self.params['card_wd'])
                 self.seen_cards[i].set_from_pixbuf(scratch)
 #                self.m_windows[i].show_all()
+                self.m_windows[i].resize(1,1)
                 self.m_windows[i].present()
                 self.m_windows[i].move(self.positions[i][0], self.positions[i][1])   # here is where I move back
                 self.displayed_cards = True