Fix copyingmessage() in Machine UI

I changed the API to pass in a folder rather than a list of folders, but
used getnicename() on the wrong object. It is not used on the folder but
on the ui object. Fix this and give the variable somewhat better names.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>

offlineimap/ui/Machine.py

@@ -108,10 +108,10 @@ class MachineUI(UIBase):
                 (s.getnicename(sr), sf.getname(), s.getnicename(dr),
                  df.getname()))
 
-    def copyingmessage(s, uid, src, destfolder):
-        s._printData('copyingmessage', "%d\n%s\n%s\n%s[%s]"  % \
-                (uid, s.getnicename(src), src.getname(),
-                 destfolder.getnicename(), destfolder))
+    def copyingmessage(self, uid, srcfolder, destfolder):
+        self._printData('copyingmessage', "%d\n%s\n%s\n%s[%s]" % \
+                (uid, self.getnicename(srcfolder), srcfolder.getname(),
+                 self.getnicename(destfolder), destfolder))
         
     def folderlist(s, list):
         return ("\f".join(["%s\t%s" % (s.getnicename(x), x.getname()) for x in list]))