version 7 - no journal, ack bugfix

4 files changed, 5 insertions, 6 deletions

diff --git a/MANIFEST b/MANIFEST
index dd3de42..6f54436 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3,12 +3,9 @@ TODO
 setup.py
 COPYING
 README
-locale
-locale/en
 locale/en/LC_MESSAGES
 locale/en/LC_MESSAGES/org.laptop.APRSXO.mo
 locale/en/activity.linfo
-activity
 activity/activity-aprs-xo.svg
 activity/activity.info
 aprs.py
diff --git a/NEWS b/NEWS
index 21c5b6f..35fb91d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,3 +4,5 @@ September 22 2008 - version 2 - no journal, can not send messages, gui update
 September 25 2008 - version 3 - no journal, can not send messages, gui update
 September 28 2008 - version 4 - no journal, no message queue, gui update
 October 5 2008 - version 5 - no journal, can not cancel messages
+October 7 2008 - version 6 - no journal, can cancel message queue, show acks
+October 18 2008 - version 7 - no journal, ack bugfix
diff --git a/activity/activity.info b/activity/activity.info
index 636e501..a92c463 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = APRS-XO
-activity_version= 6
+activity_version= 7
 service_name = org.laptop.APRSXO
 icon = activity-aprs-xo
 exec = sugar-activity aprs.APRSActivity
diff --git a/aprs.py b/aprs.py
index ee433f6..96ffc48 100755
--- a/aprs.py
+++ b/aprs.py
@@ -697,7 +697,7 @@ class APRSActivity(activity.Activity):
         if (tocall in self.sent_acks):
             currentack = self.sent_acks[tocall]
             if (currentack == sequence):
-                ackmessage = ":%s:ack%s" % (tocall, sequence)
+                ackmessage = ":%s:ack%s" % (tocall.ljust(9), sequence)
                 self.send_data(ackmessage)
         return False
 
@@ -959,7 +959,7 @@ class APRSActivity(activity.Activity):
                                         self.send_msg_queue(fromcall)
                                     self.recv_acks[ackid] = 1
                         message = data[firstcheck+12:thirdcheck]
-                        ackmessage = ":%s:ack%s" % (fromcall, data[thirdcheck + 1:])
+                        ackmessage = ":%s:ack%s" % (fromcall.ljust(9), data[thirdcheck + 1:])
                         self.send_data(ackmessage)
                         id = "%s-%s" % (fromcall, sequence)
                         if (id in self.sent_acks):