From d676323d31360e065e7d65a039ee9f3f86b33bb7 Mon Sep 17 00:00:00 2001
From: Kiooeht <kiooeht@gmail.com>
Date: Fri, 20 May 2011 06:03:08 -0700
Subject: [PATCH] Memo userlist theme change correction + changelog update

---
 CHANGELOG.mkdn | 2 ++
 memos.py       | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 6ada8ac..bf56a99 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -30,6 +30,7 @@ CHANGELOG
 * Logviewer log search - Kiooeht [evacipatedBox]
 * Set server and port from command line - Kiooeht [evacipatedBox]
 * Invite-only memos, invite chums to memos - Kiooeht [evacipatedBox]
+* Check Pyqt4 and pygame are installed and correct versions - Kiooeht [evacipatedBox]
 * Bug fixes
     * Logviewer updates - Kiooeht [evacipatedBox]
     * Memo scrollbar thing - Kiooeht [evacipatedBox]
@@ -40,6 +41,7 @@ CHANGELOG
     * De-Op in memos correctly - Kiooeht [evacipatedBox]
     * Don't blow up if someone's not using Pesterchum in a memo - Kiooeht [evacipatedBox]
     * Make 'logs' and 'profiles' directories if non-existant - Kiooeht [evacipatedBox]
+    * Don't split messages in bad places - Kiooeht [evacipatedBox]
 
 ### 3.14.1
 * Pesterchum 3.14 - illuminatedwax [ghostDunk]
diff --git a/memos.py b/memos.py
index 36e3949..e03011a 100644
--- a/memos.py
+++ b/memos.py
@@ -496,8 +496,7 @@ class PesterMemo(PesterConvo):
         self.userlist.optionsMenu.setStyleSheet(theme["main/defaultwindow/style"])
         if theme.has_key("main/chums/scrollbar"):
             self.setStyleSheet("QListWidget { %s } QScrollBar { %s } QScrollBar::handle { %s } QScrollBar::add-line { %s } QScrollBar::sub-line { %s } QScrollBar:up-arrow { %s } QScrollBar:down-arrow { %s }" % (theme["memos/userlist/style"], theme["main/chums/scrollbar/style"], theme["main/chums/scrollbar/handle"], theme["main/chums/scrollbar/downarrow"], theme["main/chums/scrollbar/uparrow"], theme["main/chums/scrollbar/uarrowstyle"], theme["main/chums/scrollbar/darrowstyle"] ))
-        else:
-            self.userlist.setStyleSheet(theme["memos/userlist/style"])
+        self.userlist.setStyleSheet(theme["memos/userlist/style"])
         self.userlist.setFixedWidth(theme["memos/userlist/width"])
         self.addchumAction.setText(theme["main/menus/rclickchumlist/addchum"])
         self.banuserAction.setText(theme["main/menus/rclickchumlist/banuser"])