Merge config aliasing bug fix.

[disorder] / python / disorder.py.in

diff --git a/python/disorder.py.in b/python/disorder.py.in
index 867b901c046547387146f047e7b02505a7ae78ec..e873e49c76387ba627cd7d5db5bb92748530996c 100644 (file)
--- a/python/disorder.py.in
+++ b/python/disorder.py.in
@@ -1,20 +1,18 @@
 #
 # Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
 #
 #
 # Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
 #

-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify

 # it under the terms of the GNU General Public License as published by
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or

 # (at your option) any later version.
 #
 # (at your option) any later version.
 #

-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #
 
 """Python support for DisOrder
 #
 
 """Python support for DisOrder


@@ -905,7 +903,11 @@ class client:
 
   def schedule_add(self, when, priority, action, *rest):
     """Add a scheduled event"""
 
   def schedule_add(self, when, priority, action, *rest):
     """Add a scheduled event"""

-    self._simple("schedule-add", when, priorty, action, *rest)
+    self._simple("schedule-add", str(when), priority, action, *rest)
+
+  def adopt(self, id):
+    """Adopt a randomly picked track"""
+    self._simple("adopt", id)

 
   ########################################################################
   # I/O infrastructure
 
   ########################################################################
   # I/O infrastructure