From 127ad53685dbf7ffe5393e8fcf8a90133b0ffe7f Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Fri, 7 Jun 2013 20:44:30 -0400 Subject: [PATCH 1/2] broadcastpending message status is obsolete, use broadcastqueued instead --- src/bitmessagemain.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index e618b4bd..f9f0950c 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -1143,7 +1143,7 @@ class receiveDataThread(threading.Thread): toAddress = '[Broadcast subscribers]' ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2) + t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() @@ -2821,7 +2821,7 @@ class singleWorker(threading.Thread): def sendBroadcast(self): shared.sqlLock.acquire() - t = ('broadcastpending',) + t = ('broadcastqueued',) shared.sqlSubmitQueue.put('''SELECT fromaddress, subject, message, ackdata FROM sent WHERE status=? and folder='sent' ''') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() @@ -2882,7 +2882,7 @@ class singleWorker(threading.Thread): #Update the status of the message in the 'sent' table to have a 'broadcastsent' status shared.sqlLock.acquire() - t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastpending') + t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastqueued') shared.sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() @@ -2948,7 +2948,7 @@ class singleWorker(threading.Thread): #Update the status of the message in the 'sent' table to have a 'broadcastsent' status shared.sqlLock.acquire() - t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastpending') + t = ('broadcastsent',int(time.time()),fromaddress, subject, body,'broadcastqueued') shared.sqlSubmitQueue.put('UPDATE sent SET status=?, lastactiontime=? WHERE fromaddress=? AND subject=? AND message=? AND status=?') shared.sqlSubmitQueue.put(t) queryreturn = shared.sqlReturnQueue.get() @@ -3813,7 +3813,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler): ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2) + t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get() From e3927acb80636c232da786014285122782b20751 Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Fri, 7 Jun 2013 20:50:39 -0400 Subject: [PATCH 2/2] broadcastpending message status is obsolete, use broadcastqueued instead --- src/bitmessageqt/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index bc971563..6617da3d 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1129,7 +1129,7 @@ class MyForm(QtGui.QMainWindow): toAddress = self.str_broadcast_subscribers ripe = '' shared.sqlLock.acquire() - t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastpending',1,1,'sent',2) + t = ('',toAddress,ripe,fromAddress,subject,message,ackdata,int(time.time()),'broadcastqueued',1,1,'sent',2) shared.sqlSubmitQueue.put('''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''') shared.sqlSubmitQueue.put(t) shared.sqlReturnQueue.get()