Skip to content
This repository
Browse code

Merge branch 'master' of git://github.com/cream/melange

  • Loading branch information...
commit f6d6b52f081072929c226f1c2921589d5816ede9 2 parents 0a9f556 + 3ab0d30
authored May 08, 2011
2  src/configuration/scheme.xml
@@ -3,7 +3,7 @@
3 3
         <item type="dict">
4 4
             <y type="int">20</y>
5 5
             <x type="int">0</x>
6  
-            <name type="str">Control Area</name>
  6
+            <name type="str">Melange Tips</name>
7 7
         </item>
8 8
     </widgets>
9 9
     <hotkey action="toggle-overlay" type="hotkey" label="Hotkey toggling the overlay mode">F12</hotkey>
3  src/melange.py
@@ -578,6 +578,9 @@ def fade_in(t, state):
578 578
     def quit(self):
579 579
         """ Quit the module. """
580 580
 
  581
+        for widget in self.widgets.values():
  582
+            widget.config.save()
  583
+
581 584
         self.config.widgets = self.widgets.values()
582 585
         cream.Module.quit(self)
583 586
 
6  src/melange/hotkeys.py
@@ -48,8 +48,10 @@ def __init__(self, hotkeys):
48 48
 
49 49
 
50 50
     def _ooxcb_callback(self, source, condition):
51  
-
52  
-        reply = self.cookie.reply()
  51
+        try:
  52
+            reply = self.cookie.reply()
  53
+        except ctypes.ArgumentError:
  54
+            return True
53 55
         if reply is not None and reply.category == record.Category.FromServer:
54 56
             opcode = reply.data[0]
55 57
             event_type = self.connection.events[opcode]

0 notes on commit f6d6b52

Please sign in to comment.
Something went wrong with that request. Please try again.