Bug fix: Openning global userlist doesn't screw with memo userlist

CHANGELOG.mkdn

@@ -69,6 +69,7 @@ CHANGELOG
     * Don't overflow random colours into colourless messages - Kiooeht [evacipatedBox]
     * Only open links on left click - Kiooeht [evacipatedBox]
     * Don't delete random chum when blocking someone not on chumroll - Kiooeht [evacipatedBox]
+    * Openning global userlist doesn't reset OP status of memo users - Kiooeht [evacipatedBox]
 
 ### 3.14.1
 * Pesterchum 3.14 - illuminatedwax [ghostDunk]

TODO.mkdn

@@ -24,7 +24,6 @@ Bugs
 * Issues with connecting? Client not closing connection right? People keep getting "nick taken" messages
 * When using mood sort, scroll position jumps to last selected chum
 * When left for a really long time, animations slow down pesterchum
-* Openning userlist resets appearance of OP/voice for anyone that become OP/voice after you joined a memo
 * If pesterchum is open but offline due to a network failure and you open the memos screen, it connects you but doesn't fetch the memo list when it finishes connecting
 * right clicking an offline chum and choosing remove asks you why you're reporting someone, and if you hit cancel the menus stop working
 * Closing a timeclone doesn't actually cease for everyone else

memos.py

@@ -714,8 +714,10 @@ class PesterMemo(PesterConvo):
         self.messageSent.emit(serverText, self.title())
 
         self.textInput.setText("")
-    @QtCore.pyqtSlot()
-    def namesUpdated(self):
+    @QtCore.pyqtSlot(QtCore.QString)
+    def namesUpdated(self, channel):
+        c = unicode(channel)
+        if c != self.channel: return
         # get namesdb
         namesdb = self.mainwindow.namesdb
         # reload names

pesterchum.py

@@ -1875,8 +1875,8 @@ class PesterWindow(MovingWindow):
                      self, QtCore.SIGNAL('sendMessage(QString, QString)'))
         self.connect(memoWindow, QtCore.SIGNAL('windowClosed(QString)'),
                      self, QtCore.SLOT('closeMemo(QString)'))
-        self.connect(self, QtCore.SIGNAL('namesUpdated()'),
-                     memoWindow, QtCore.SLOT('namesUpdated()'))
+        self.connect(self, QtCore.SIGNAL('namesUpdated(QString)'),
+                     memoWindow, QtCore.SLOT('namesUpdated(QString)'))
         self.connect(self, QtCore.SIGNAL('modesUpdated(QString, QString)'),
                      memoWindow, QtCore.SLOT('modesUpdated(QString, QString)'))
         self.connect(self,
@@ -2207,7 +2207,7 @@ class PesterWindow(MovingWindow):
         # update name DB
         self.namesdb[c] = names
         # warn interested party of names
-        self.namesUpdated.emit()
+        self.namesUpdated.emit(c)
     @QtCore.pyqtSlot(QtCore.QString, QtCore.QString, QtCore.QString)
     def userPresentUpdate(self, handle, channel, update):
         c = unicode(channel)
@@ -2925,7 +2925,7 @@ class PesterWindow(MovingWindow):
     moodUpdated = QtCore.pyqtSignal()
     requestChannelList = QtCore.pyqtSignal()
     requestNames = QtCore.pyqtSignal(QtCore.QString)
-    namesUpdated = QtCore.pyqtSignal()
+    namesUpdated = QtCore.pyqtSignal(QtCore.QString)
     modesUpdated = QtCore.pyqtSignal(QtCore.QString, QtCore.QString)
     userPresentSignal = QtCore.pyqtSignal(QtCore.QString,QtCore.QString,QtCore.QString)
     mycolorUpdated = QtCore.pyqtSignal()