# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: anshul@baboonlogic.com-20091111175426-d7lgbud7fcxo6v7j # target_branch: http://bazaar.launchpad.net/~screenlets-\ # dev/screenlets/trunk/ # testament_sha1: aa85a21d089afee361ed2d60a5c46a164c1b778a # timestamp: 2009-11-11 23:26:03 +0530 # base_revision_id: ryx@black-20090709201115-i3lf7skgqcv3144o # # Begin patch === modified file 'src/share/screenlets/Clock/ClockScreenlet.py' --- src/share/screenlets/Clock/ClockScreenlet.py 2008-06-01 16:24:49 +0000 +++ src/share/screenlets/Clock/ClockScreenlet.py 2009-11-11 17:54:26 +0000 @@ -362,8 +362,8 @@ ctx_w = self.scale ctx_h = self.scale # init time-vars - hours = self.__time.hour + self.time_offset - minutes = self.__time.minute + hours = self.__time.hour + int(self.time_offset) + minutes = self.__time.minute + (self.time_offset-int(self.time_offset))*60.0 seconds = self.__time.second # TODO: use better shadow-placing shadow_offset_x = 1 # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ6ssSEAAY5fgCAwWXv//3sI CAC////wUAO2ae7TbhobdahJSGhMEp+VP0GJgp4kmmmYppkNNH6oJKFHqbJqYEnk0EAGgaGg0ABJ CEmU2TECanqeUeKA0ZAaN6oxBzAATAAEwAAAAAEkkamajDRCaaaaNNGT0m1AADQUicOKo2t1Fnp4 kMMaaMUWXxvdiAg5uOfRLbunv27+A7rmGbv/BlKuGe5jk7ZFt1dufz/bnfg5LBw/XyHDVwu7NOLW cHjje3xzifZjALn4MegZupuRBfFVxk6zC4+NzC0VCoUXH3oH6jBLeQJ1UFtDeHRHllAKSRyqELUI liFCcnFrUPrBkDKspMc6QKLEdrk1UHOgKQoTOn5Vn33aKNGR8FJVUJxUY76NaVmBYX6YhYJOCKlr GpwinUQkUWDasBpX0Uk6asgONJUUlJVcuV2WlVkVsLBYLGr9OHeyGcYqJ5LQRW7OUvFmndftIK67 Cgm+3XTM0p7b3HKbtvBciRo3C3ZpJMZi3ITtGKbwFNUZiLpKsYKjWJopLVa+MJazM4KTFYVkoTn4 mFp3QhFSKypwmMWQuyjSWUoLHZCi2piCePqHhg2GTuLWF3sRN+omKNkl2MlkcDavM3WxJypnjol5 qyLpgx4Q99/d2GcwrdgGtftlobxIC0aXHE15kLyVW9QVkpvDPxnIntvpYVJkm2YXZULovDAyIDEj 84TxP0IfrYk/N2FjkHFKIlPA1rbGzq4mKTgzNKT/XrHVUdBO0TJi2i6idzJxMHIZ2WF5vpya/gOb TmPP9DRy2XYbLSmORjw8DU2808u2MwtjSxHVAH+KZGiUsi6bMEl+gsT1SGEDVMn0vRnBllOIsxwm JCpeuEpYxQLv3PYqUVwokvNe99xxDWT6s5r6fzdABSuU6qt0SZu7CfLDlWDqVnAJObsvxiXvtnA0 Abq7hSLLvVyTVSGSdMnHkxL0U8ukRyGsKqweQ1TCjik1YQJaT7KlzSuUxGMXWtw7u6uGDMfdA9JK AaHOu0IS/00pkgZkMe1MumUt/QWoNMz1KRLjAgBfUlBKc2MDBQr3J50jZchnz5lKPCbhe8Zdx6Vs Xwt6mfoROFpXcGd4qNltTE6L4qDSsKHj2GXpkM0pog5hmuNZ8VG9Q5UxWbQOcB1yxLOqI2VEGDBv 5TJ8zXiz2PeVWai44qZtsDqW1tDE7K1xHdpFrbGnAcWKJzYkMrxM5UgVwWMPBSxqE6v2Zk7tiyri op/xdyRThQkA6ssSEA==