Merge branch 'ss/declutter-tty-output' into next

Conflicts:
	Changelog.draft.rst

Changelog.draft.rst

@@ -29,6 +29,7 @@ Changes
   blowing away LocalStatus will not require you to redownload ALL of
   your mails if you still have the local Maildir. It will simply
   recreate LocalStatus.
+* TTYUI ouput improved.
 
 Bug Fixes
 ---------

offlineimap/accounts.py

@@ -253,8 +253,7 @@ class SyncableAccount(Account):
                     thread = InstanceLimitedThread(\
                         instancename = 'FOLDER_' + self.remoterepos.getname(),
                         target = syncfolder,
-                        name = "Folder sync %s[%s]" % \
-                        (self.name, remotefolder.getvisiblename()),
+                        name = "Folder sync [%s]" % self.name,
                         args = (self.name, remoterepos, remotefolder, localrepos,
                                 statusrepos, quick))
                     thread.setDaemon(1)

offlineimap/ui/TTY.py

@@ -41,7 +41,8 @@ class TTYUI(UIBase):
                 threadname = currentThread().name
             except AttributeError:
                 threadname = currentThread().getName()
-            if (threadname == s._lastThreaddisplay):
+            if (threadname == s._lastThreaddisplay \
+                    or threadname == 'MainThread'):
                 print " %s" % msg
             else:
                 print "%s:\n %s" % (threadname, msg)