Merge lp:~jlangeveld/gtimelog/single_activity into lp:~gtimelog-dev/gtimelog/trunk

[Jeroen Langeveld]

from NEWS.txt:

* Reporting no longer fails when only one activity was logged. (LP: #778285)

  Contributed by Jeroen Langeveld (https://launchpad.net/~jlangeveld)

[Barry Warsaw (barry)]

Hah! I fixed this independently in exactly the same way you did. I'm giving you credit in the NEWS file since you obviously found it first. Thanks for the contribution!

[Barry Warsaw (barry)]

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2011-02-10 18:58:45 +0000
+++ NEWS.txt	2011-05-06 05:41:14 +0000
@@ -15,6 +15,10 @@
 
   Contributed by Vladislav Naumov (https://launchpad.net/~vnaum).
 
+* Reporting no longer fails when only one activity was logged. (LP: #778285)
+
+  Contributed by Jeroen Langeveld (https://launchpad.net/~jlangeveld)
+
 
 Changes in version 0.5.0 (released 2011-01-28)
 ==============================================

=== modified file 'src/gtimelog/main.py'
--- src/gtimelog/main.py	2011-03-02 16:43:01 +0000
+++ src/gtimelog/main.py	2011-05-06 05:41:14 +0000
@@ -730,8 +730,8 @@
         print >> output
         work, slack = window.grouped_entries()
         total_work, total_slacking = window.totals()
+        categories = {}
         if work:
-            categories = {}
             for start, entry, duration in work:
                 entry = entry[:1].upper() + entry[1:]
                 print >> output, u"%-62s  %s" % (entry,