[Pkg-wmaker-commits] [wmclock] 04/66: wmclock: Fix display when both -12 and -year are given.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmclock.

commit 8e4586fb6000ba28f4071cc620c1985d716ebba4
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Thu Dec 11 09:18:06 2014 -0600

    wmclock: Fix display when both -12 and -year are given.
    
    Patch by Vino Fernando Crescini <jcrescin at cit.uws.edu.au>:
    http://sources.debian.net/src/wmclock/1.0.14-6/debian/patches/fix_12_year_display.patch/
    
    For more information, see:
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=228985
---
 wmclock.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/wmclock.c b/wmclock.c
index 9dfd287..d65e7e6 100644
--- a/wmclock.c
+++ b/wmclock.c
@@ -849,7 +849,14 @@ int main(int argc, char **argv)
 #endif /* !ONLY_SHAPED_WINDOW */
    for (i = 0; i < NUM_TIME_POSITIONS; i++)
     {
-       xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
+      if (enable12HourClock && (!enableYearDisplay))
+       {
+         xPos[i] += timePos24[i];
+       }
+      else
+       {
+         xPos[i] += timePos12[i];
+       }
     }
    
    /* Open the display */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmclock.git