[gnome-control-center: 20/21] Merge branch 'wip/datetime-panel'



commit 0cbbf01710e3a4bd7f644622e859ba848b773ffd
Merge: 4916f35 8c6eba7
Author: Thomas Wood <thomas wood intel com>
Date:   Tue Jun 29 14:41:48 2010 +0100

    Merge branch 'wip/datetime-panel'

 configure.ac                                       |    2 +
 panels/Makefile.am                                 |    3 +-
 panels/datetime/Makefile.am                        |   81 +++
 panels/datetime/cc-datetime-panel.c                |  334 ++++++++++++
 panels/datetime/cc-datetime-panel.h                |   74 +++
 panels/datetime/cc-timezone-map.c                  |  558 ++++++++++++++++++++
 panels/datetime/cc-timezone-map.h                  |   77 +++
 panels/datetime/data/bg.png                        |  Bin 0 -> 177324 bytes
 panels/datetime/data/cc.png                        |  Bin 0 -> 53948 bytes
 panels/datetime/data/timezone_-1.png               |  Bin 0 -> 8012 bytes
 panels/datetime/data/timezone_-10.png              |  Bin 0 -> 7783 bytes
 panels/datetime/data/timezone_-11.png              |  Bin 0 -> 7406 bytes
 panels/datetime/data/timezone_-2.png               |  Bin 0 -> 4333 bytes
 panels/datetime/data/timezone_-3.5.png             |  Bin 0 -> 740 bytes
 panels/datetime/data/timezone_-3.png               |  Bin 0 -> 13615 bytes
 panels/datetime/data/timezone_-4.5.png             |  Bin 0 -> 1900 bytes
 panels/datetime/data/timezone_-4.png               |  Bin 0 -> 15084 bytes
 panels/datetime/data/timezone_-5.5.png             |  Bin 0 -> 437 bytes
 panels/datetime/data/timezone_-5.png               |  Bin 0 -> 19166 bytes
 panels/datetime/data/timezone_-6.png               |  Bin 0 -> 13764 bytes
 panels/datetime/data/timezone_-7.png               |  Bin 0 -> 11977 bytes
 panels/datetime/data/timezone_-8.png               |  Bin 0 -> 6801 bytes
 panels/datetime/data/timezone_-9.5.png             |  Bin 0 -> 437 bytes
 panels/datetime/data/timezone_-9.png               |  Bin 0 -> 7908 bytes
 panels/datetime/data/timezone_0.png                |  Bin 0 -> 11074 bytes
 panels/datetime/data/timezone_1.png                |  Bin 0 -> 15458 bytes
 panels/datetime/data/timezone_10.5.png             |  Bin 0 -> 421 bytes
 panels/datetime/data/timezone_10.png               |  Bin 0 -> 12829 bytes
 panels/datetime/data/timezone_11.5.png             |  Bin 0 -> 446 bytes
 panels/datetime/data/timezone_11.png               |  Bin 0 -> 12113 bytes
 panels/datetime/data/timezone_12.75.png            |  Bin 0 -> 409 bytes
 panels/datetime/data/timezone_12.png               |  Bin 0 -> 7130 bytes
 panels/datetime/data/timezone_13.png               |  Bin 0 -> 621 bytes
 panels/datetime/data/timezone_2.png                |  Bin 0 -> 12854 bytes
 panels/datetime/data/timezone_3.5.png              |  Bin 0 -> 2142 bytes
 panels/datetime/data/timezone_3.png                |  Bin 0 -> 17475 bytes
 panels/datetime/data/timezone_4.5.png              |  Bin 0 -> 1773 bytes
 panels/datetime/data/timezone_4.png                |  Bin 0 -> 4954 bytes
 panels/datetime/data/timezone_5.5.png              |  Bin 0 -> 6099 bytes
 panels/datetime/data/timezone_5.75.png             |  Bin 0 -> 2885 bytes
 panels/datetime/data/timezone_5.png                |  Bin 0 -> 14539 bytes
 panels/datetime/data/timezone_6.5.png              |  Bin 0 -> 1609 bytes
 panels/datetime/data/timezone_6.png                |  Bin 0 -> 8441 bytes
 panels/datetime/data/timezone_7.png                |  Bin 0 -> 14412 bytes
 panels/datetime/data/timezone_8.png                |  Bin 0 -> 16725 bytes
 panels/datetime/data/timezone_9.5.png              |  Bin 0 -> 1959 bytes
 panels/datetime/data/timezone_9.png                |  Bin 0 -> 12608 bytes
 panels/datetime/datetime-module.c                  |   41 ++
 panels/datetime/datetime.ui                        |  242 +++++++++
 panels/datetime/gnome-datetime-panel.desktop.in.in |   11 +
 panels/datetime/set-timezone.c                     |  386 ++++++++++++++
 panels/datetime/set-timezone.h                     |   57 ++
 panels/datetime/tz.c                               |  336 ++++++++++++
 panels/datetime/tz.h                               |   84 +++
 po/POTFILES.in                                     |    2 +
 po/POTFILES.skip                                   |    1 +
 56 files changed, 2288 insertions(+), 1 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]