src/bitmessagemain.py

@@ -240,7 +240,6 @@ class receiveDataThread(threading.Thread):
         self.sock.settimeout(600) #We'll send out a pong every 5 minutes to make sure the connection stays alive if there has been no other traffic to send lately.
         self.streamNumber = streamNumber
         self.payloadLength = 0 #This is the protocol payload length thus it doesn't include the 24 byte message header
-        self.receivedgetbiginv = False #Gets set to true once we receive a getbiginv message from our peer. An abusive peer might request it too much so we use this variable to check whether they have already asked for a big inv message.
         self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = {}
         shared.connectedHostsList[self.HOST] = 0 #The very fact that this receiveData thread exists shows that we are connected to the remote host. Let's add it to this list so that an outgoingSynSender thread doesn't try to connect to it.
         self.connectionIsOrWasFullyEstablished = False #set to true after the remote node and I accept each other's version messages. This is needed to allow the user interface to accurately reflect the current number of connections.
@@ -349,14 +348,10 @@ class receiveDataThread(threading.Thread):
                             self.recinv(self.data[24:self.payloadLength+24])
                         elif remoteCommand == 'getdata\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
                             self.recgetdata(self.data[24:self.payloadLength+24])
-                        elif remoteCommand == 'getbiginv\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                            self.sendBigInv()
                         elif remoteCommand == 'msg\x00\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
                             self.recmsg(self.data[24:self.payloadLength+24])
                         elif remoteCommand == 'broadcast\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
                             self.recbroadcast(self.data[24:self.payloadLength+24])
-                        elif remoteCommand == 'getaddr\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
-                            self.sendaddr()
                         elif remoteCommand == 'ping\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
                             self.sendpong()
                         elif remoteCommand == 'pong\x00\x00\x00\x00\x00\x00\x00\x00' and self.connectionIsOrWasFullyEstablished:
@@ -454,12 +449,7 @@ class receiveDataThread(threading.Thread):
             return
         self.sendBigInv()
 
-    def sendBigInv(self): #I used capitals in for this function name because there is no such Bitmessage command as 'biginv'.
+    def sendBigInv(self):
-        if self.receivedgetbiginv:
-            print 'We have already sent a big inv message to this peer. Ignoring request.'
-            return
-        else:
-            self.receivedgetbiginv = True
         shared.sqlLock.acquire()
         #Select all hashes which are younger than two days old and in this stream.
         t = (int(time.time())-maximumAgeOfObjectsThatIAdvertiseToOthers,int(time.time())-lengthOfTimeToHoldOnToAllPubkeys,self.streamNumber)

src/bitmessageqt/__init__.py

@@ -755,8 +755,8 @@ class MyForm(QtGui.QMainWindow):
             n = Notify.Notification.new(title, subtitle,'notification-message-email')
             n.show()
             return
-        # Show with tray
+        else:
-        self.trayIcon.showMessage(title, subtitle, 1, 2000)
+            self.tray.showMessage(title, subtitle, 1, 2000)
 
     def tableWidgetInboxKeyPressEvent(self,event):
         if event.key() == QtCore.Qt.Key_Delete: