wmclock/fix_12_year_display.patch

   1 Description: Fix display when both -12 and -year are given
   2 Author: Vino Fernando Crescini <jcrescin@cit.uws.edu.au>
   3 Bug-Debian: http://bugs.debian.org/228985
   4
   5 Index: wmclock-1.0.14/wmclock.c
   6 ===================================================================
   7 --- wmclock-1.0.14.orig/wmclock.c       2010-12-22 13:12:28.000000000 +0100
   8 +++ wmclock-1.0.14/wmclock.c    2011-06-02 12:11:51.233840631 +0200
   9 @@ -849,7 +849,14 @@
  10  #endif /* !ONLY_SHAPED_WINDOW */
  11     for (i = 0; i < NUM_TIME_POSITIONS; i++)
  12      {
  13 -       xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
  14 +      if (enable12HourClock && (!enableYearDisplay))
  15 +       {
  16 +         xPos[i] += timePos24[i];
  17 +       }
  18 +      else
  19 +       {
  20 +         xPos[i] += timePos12[i];
  21 +       }
  22      }
  23
  24     /* Open the display */