From d7d87a690202650b5fb2bf416d52801e792da2ab Mon Sep 17 00:00:00 2001
From: Sean Davis <smd.seandavis@gmail.com>
Date: Sun, 14 Jul 2013 12:05:21 -0400
Subject: [PATCH] Use old username to always work.

---
 mugshot/MugshotWindow.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mugshot/MugshotWindow.py b/mugshot/MugshotWindow.py
index b930065..acd17b6 100644
--- a/mugshot/MugshotWindow.py
+++ b/mugshot/MugshotWindow.py
@@ -32,7 +32,9 @@ logger = logging.getLogger('mugshot')
 
 from mugshot_lib import Window
 
-username = os.getlogin()
+username = os.getenv('USER')
+if not username:
+    username = os.getenv('USERNAME')
 home = os.path.expanduser('~')
 libreoffice_prefs = os.path.join(home, '.config', 'libreoffice', '4', 'user',
                                  'registrymodifications.xcu')