[gnome-games/sudoku-tube: 340/340] Merge branch 'master' into work



commit 6d3126009a2db5d080bc23513a43e1ef91ceca31
Merge: 6b67e2f... 682bff4...
Author: Zhang Sen <zh jesse gmail com>
Date:   Thu Aug 13 13:28:01 2009 +0800

    Merge branch 'master' into work
    
    Conflicts:
    
    	gnome-sudoku/images/Makefile.am
    	gnome-sudoku/src/lib/main.py

 .gitignore                                         |    2 +-
 COPYING.GPL3                                       |  676 ++
 COPYING.README                                     |    4 +
 Makefile.am                                        |    6 +-
 NEWS                                               |  469 ++
 aisleriot/Makefile.am                              |   21 +-
 aisleriot/TODO                                     |   10 +-
 aisleriot/aisleriot.supp                           |   13 +-
 aisleriot/baize.c                                  |   23 +-
 aisleriot/baize.h                                  |   23 +-
 aisleriot/board-noclutter.c                        |  115 +-
 aisleriot/board.c                                  |  111 +-
 aisleriot/board.h                                  |   25 +-
 aisleriot/card.c                                   |   70 +-
 aisleriot/card.h                                   |   23 +-
 aisleriot/conf.c                                   |   25 +-
 aisleriot/conf.h                                   |   23 +-
 aisleriot/game-names.h                             |  623 ++
 aisleriot/game.c                                   |   46 +-
 aisleriot/game.h                                   |   23 +-
 aisleriot/get_titles.pl                            |   32 +-
 aisleriot/guile16-compat.h                         |   10 +-
 aisleriot/help/C/aisleriot.xml                     |    2 +-
 aisleriot/help/C/athena.xml                        |    4 +-
 aisleriot/help/C/aunt_mary.xml                     |    4 +-
 aisleriot/help/C/saratoga.xml                      |    4 +-
 aisleriot/help/ca/ca.po                            |    4 +-
 aisleriot/help/de/de.po                            |    4 +-
 aisleriot/help/el/el.po                            |    4 +-
 aisleriot/help/es/es.po                            |  169 +-
 aisleriot/help/eu/eu.po                            |    4 +-
 aisleriot/help/fr/fr.po                            |    2 +-
 aisleriot/help/oc/oc.po                            |    2 +-
 aisleriot/help/ru/ru.po                            |    4 +-
 aisleriot/help/sv/sv.po                            |    2 +-
 aisleriot/rules/Makefile.am                        |    5 +-
 aisleriot/rules/accordion.scm                      |   10 +-
 aisleriot/rules/agnes.scm                          |   10 +-
 aisleriot/rules/athena.scm                         |   10 +-
 aisleriot/rules/auld_lang_syne.scm                 |   10 +-
 aisleriot/rules/backbone.scm                       |   10 +-
 aisleriot/rules/bakers_dozen.scm                   |   10 +-
 aisleriot/rules/bakers_game.scm                    |   10 +-
 aisleriot/rules/bear_river.scm                     |   10 +-
 aisleriot/rules/beleaguered_castle.scm             |   10 +-
 aisleriot/rules/block_ten.scm                      |   10 +-
 aisleriot/rules/bristol.scm                        |   10 +-
 aisleriot/rules/camelot.scm                        |   10 +-
 aisleriot/rules/canfield.scm                       |   10 +-
 aisleriot/rules/carpet.scm                         |   22 +-
 aisleriot/rules/chessboard.scm                     |   10 +-
 aisleriot/rules/clock.scm                          |   10 +-
 aisleriot/rules/cover.scm                          |   10 +-
 aisleriot/rules/cruel.scm                          |   26 +-
 aisleriot/rules/diamond_mine.scm                   |   10 +-
 aisleriot/rules/doublets.scm                       |   10 +-
 aisleriot/rules/eagle_wing.scm                     |   10 +-
 aisleriot/rules/easthaven.scm                      |   10 +-
 aisleriot/rules/eight_off.scm                      |   10 +-
 aisleriot/rules/elevator.scm                       |   10 +-
 aisleriot/rules/escalator.scm                      |   10 +-
 aisleriot/rules/first_law.scm                      |   10 +-
 aisleriot/rules/fortress.scm                       |   10 +-
 aisleriot/rules/fortunes.scm                       |   10 +-
 aisleriot/rules/forty_thieves.scm                  |   10 +-
 aisleriot/rules/fourteen.scm                       |   10 +-
 aisleriot/rules/freecell.scm                       |   25 +-
 aisleriot/rules/gaps.scm                           |   10 +-
 aisleriot/rules/gay_gordons.scm                    |   10 +-
 aisleriot/rules/giant.scm                          |   10 +-
 aisleriot/rules/glenwood.scm                       |   10 +-
 aisleriot/rules/gold_mine.scm                      |   10 +-
 aisleriot/rules/golf.scm                           |   10 +-
 aisleriot/rules/gypsy.scm                          |   10 +-
 aisleriot/rules/helsinki.scm                       |   10 +-
 aisleriot/rules/hopscotch.scm                      |   10 +-
 aisleriot/rules/isabel.scm                         |   10 +-
 aisleriot/rules/jamestown.scm                      |   10 +-
 aisleriot/rules/jumbo.scm                          |   10 +-
 aisleriot/rules/kansas.scm                         |   10 +-
 aisleriot/rules/king_albert.scm                    |   10 +-
 aisleriot/rules/kings_audience.scm                 |   10 +-
 aisleriot/rules/klondike.scm                       |   38 +-
 aisleriot/rules/labyrinth.scm                      |   10 +-
 aisleriot/rules/lady_jane.scm                      |   10 +-
 aisleriot/rules/maze.scm                           |   10 +-
 aisleriot/rules/monte_carlo.scm                    |   10 +-
 aisleriot/rules/napoleons_tomb.scm                 |   10 +-
 aisleriot/rules/neighbor.scm                       |   10 +-
 aisleriot/rules/odessa.scm                         |   10 +-
 aisleriot/rules/osmosis.scm                        |   10 +-
 aisleriot/rules/peek.scm                           |   10 +-
 aisleriot/rules/pileon.scm                         |   10 +-
 aisleriot/rules/plait.scm                          |   25 +-
 aisleriot/rules/poker.scm                          |   10 +-
 aisleriot/rules/quatorze.scm                       |   10 +-
 aisleriot/rules/royal_east.scm                     |   10 +-
 aisleriot/rules/saratoga.scm                       |   10 +-
 aisleriot/rules/scorpion.scm                       |   10 +-
 aisleriot/rules/scuffle.scm                        |   10 +-
 aisleriot/rules/seahaven.scm                       |   10 +-
 aisleriot/rules/sir_tommy.scm                      |   10 +-
 aisleriot/rules/spider.scm                         |   32 +-
 aisleriot/rules/spider_three_decks.scm             |   10 +-
 aisleriot/rules/spiderette.scm                     |   10 +-
 aisleriot/rules/straight_up.scm                    |   10 +-
 aisleriot/rules/streets_and_alleys.scm             |   10 +-
 aisleriot/rules/template.scm                       |   10 +-
 aisleriot/rules/ten_across.scm                     |   10 +-
 aisleriot/rules/terrace.scm                        |   22 +-
 aisleriot/rules/thieves.scm                        |   10 +-
 aisleriot/rules/thirteen.scm                       |   10 +-
 aisleriot/rules/thumb_and_pouch.scm                |   10 +-
 aisleriot/rules/treize.scm                         |   10 +-
 aisleriot/rules/triple_peaks.scm                   |   10 +-
 aisleriot/rules/union_square.scm                   |   10 +-
 aisleriot/rules/valentine.scm                      |   10 +-
 aisleriot/rules/westhaven.scm                      |   10 +-
 aisleriot/rules/whitehead.scm                      |   10 +-
 aisleriot/rules/will_o_the_wisp.scm                |   10 +-
 aisleriot/rules/yield.scm                          |   10 +-
 aisleriot/rules/yukon.scm                          |   11 +-
 aisleriot/rules/zebra.scm                          |   10 +-
 aisleriot/slot-renderer.c                          |   67 +-
 aisleriot/slot-renderer.h                          |   23 +-
 aisleriot/sol.c                                    |  325 +-
 aisleriot/sol.scm                                  |   10 +-
 aisleriot/stats-dialog.c                           |   25 +-
 aisleriot/stats-dialog.h                           |   23 +-
 aisleriot/translatable_game_names.h                |   88 -
 aisleriot/util.c                                   |   84 +-
 aisleriot/util.h                                   |   31 +-
 aisleriot/window.c                                 |  215 +-
 aisleriot/window.h                                 |   23 +-
 blackjack/Makefile.am                              |    6 +-
 blackjack/data/Makefile.am                         |    5 +-
 blackjack/help/C/blackjack.xml                     |    4 +-
 blackjack/help/Makefile.am                         |    2 +-
 blackjack/help/ca/ca.po                            |    6 +-
 blackjack/help/cs/cs.po                            |  998 +++
 .../help/cs/figures/blackjack_start_window.png     |  Bin 0 -> 64403 bytes
 blackjack/help/da/da.po                            |    8 +-
 blackjack/help/de/de.po                            |  846 ++-
 blackjack/help/el/el.po                            |    8 +-
 blackjack/help/en_GB/en_GB.po                      |    8 +-
 blackjack/help/es/es.po                            |    8 +-
 blackjack/help/eu/eu.po                            |    8 +-
 blackjack/help/fr/fr.po                            |    8 +-
 blackjack/help/oc/oc.po                            |    4 +-
 blackjack/help/sv/sv.po                            |    8 +-
 blackjack/src/Makefile.am                          |    3 +
 .../src/card-selector.cpp                          |   14 +-
 .../src/card-selector.h                            |    6 +-
 blackjack/src/card.cpp                             |    2 +-
 blackjack/src/game.cpp                             |   20 +-
 configure.in                                       |  423 +-
 glchess/data/glchess.ui                            |    9 +-
 glchess/help/C/glchess.xml                         |    4 +-
 glchess/help/Makefile.am                           |    2 +-
 glchess/help/ca/ca.po                              |    8 +-
 glchess/help/cs/cs.po                              | 1121 +++
 glchess/help/cs/figures/game.png                   |  Bin 0 -> 56966 bytes
 glchess/help/cs/figures/new_game.png               |  Bin 0 -> 32967 bytes
 glchess/help/cs/figures/preferences_game.png       |  Bin 0 -> 19189 bytes
 glchess/help/cs/figures/preferences_view.png       |  Bin 0 -> 17629 bytes
 glchess/help/de/de.po                              |    8 +-
 glchess/help/el/el.po                              |    8 +-
 glchess/help/en_GB/en_GB.po                        |    8 +-
 glchess/help/es/es.po                              |    8 +-
 glchess/help/eu/eu.po                              |    8 +-
 glchess/help/fr/fr.po                              |    8 +-
 glchess/help/oc/oc.po                              |    4 +-
 glchess/help/pt_BR/pt_BR.po                        |    8 +-
 glchess/help/ru/ru.po                              |    6 +-
 glchess/help/sv/sv.po                              |    4 +-
 glchess/src/lib/Makefile.am                        |    1 +
 glchess/src/lib/chess/__init__.py                  |  114 +-
 glchess/src/lib/defaults.py.in                     |    8 +-
 glchess/src/lib/gtkui/dialogs.py                   |   21 +-
 glchess/src/lib/gtkui/gtkui.py                     |    1 +
 glchess/src/lib/i18n.py                            |   10 +
 glchess/textures/Makefile.am                       |    2 +-
 glines/Makefile.am                                 |   20 +-
 glines/glines.c                                    |   50 +-
 glines/help/C/glines.xml                           |    4 +-
 glines/help/Makefile.am                            |    2 +-
 glines/help/ca/ca.po                               |    8 +-
 glines/help/cs/cs.po                               |  671 ++
 glines/help/cs/figures/glines-gameover.png         |  Bin 0 -> 62667 bytes
 glines/help/cs/figures/glines-startgame.png        |  Bin 0 -> 19512 bytes
 glines/help/cs/figures/preferences.png             |  Bin 0 -> 21847 bytes
 glines/help/de/de.po                               |  209 +-
 glines/help/el/el.po                               |    6 +-
 glines/help/en_GB/en_GB.po                         |    8 +-
 glines/help/es/es.po                               |    8 +-
 glines/help/eu/eu.po                               |    8 +-
 glines/help/fr/fr.po                               |    8 +-
 glines/help/it/it.po                               |    8 +-
 glines/help/oc/oc.po                               |    4 +-
 glines/help/ru/ru.po                               |    8 +-
 glines/help/sv/sv.po                               |    8 +-
 glines/help/tr/tr.po                               |    6 +-
 gnect/Makefile.am                                  |    6 +-
 gnect/data/Makefile.am                             |    4 +-
 gnect/help/C/gnect.xml                             |    4 +-
 gnect/help/Makefile.am                             |    2 +-
 gnect/help/ca/ca.po                                |    4 +-
 gnect/help/cs/cs.po                                |  876 ++
 gnect/help/cs/figures/mainwindow.png               |  Bin 0 -> 39011 bytes
 gnect/help/de/de.po                                |    8 +-
 gnect/help/el/el.po                                |    6 +-
 gnect/help/en_GB/en_GB.po                          |    4 +-
 gnect/help/es/es.po                                |  185 +-
 gnect/help/eu/eu.po                                |    6 +-
 gnect/help/fr/fr.po                                |    6 +-
 gnect/help/it/it.po                                |    8 +-
 gnect/help/oc/oc.po                                |    2 +-
 gnect/help/sv/sv.po                                |    8 +-
 gnibbles/Makefile.am                               |   19 +-
 gnibbles/help/C/gnibbles.xml                       |    4 +-
 gnibbles/help/Makefile.am                          |    2 +-
 gnibbles/help/ca/ca.po                             |    8 +-
 gnibbles/help/cs/cs.po                             |  913 +++
 gnibbles/help/cs/figures/connect.png               |  Bin 0 -> 39407 bytes
 gnibbles/help/cs/figures/game.png                  |  Bin 0 -> 36161 bytes
 gnibbles/help/cs/figures/intro.png                 |  Bin 0 -> 89911 bytes
 gnibbles/help/cs/figures/playing.png               |  Bin 0 -> 24313 bytes
 gnibbles/help/cs/figures/tables.png                |  Bin 0 -> 65382 bytes
 gnibbles/help/cs/figures/worm_op.png               |  Bin 0 -> 28396 bytes
 gnibbles/help/de/de.po                             |    8 +-
 gnibbles/help/el/el.po                             |    8 +-
 gnibbles/help/en_GB/en_GB.po                       |    8 +-
 gnibbles/help/es/es.po                             |    8 +-
 gnibbles/help/eu/eu.po                             |    8 +-
 gnibbles/help/fr/fr.po                             |    8 +-
 gnibbles/help/it/it.po                             |    8 +-
 gnibbles/help/oc/oc.po                             |    4 +-
 gnibbles/help/sv/sv.po                             |    4 +-
 gnibbles/main.c                                    |    2 +
 gnobots2/Makefile.am                               |   26 +-
 .../games-find-file.c => gnobots2/find-file.c      |    4 +-
 .../games-find-file.h => gnobots2/find-file.h      |    0
 gnobots2/game.c                                    |    2 +-
 gnobots2/gnobots.c                                 |   15 +-
 gnobots2/graphics.c                                |   20 +-
 gnobots2/help/C/gnobots2.xml                       |    4 +-
 gnobots2/help/Makefile.am                          |    2 +-
 gnobots2/help/ca/ca.po                             |    8 +-
 gnobots2/help/cs/cs.po                             |  822 ++
 gnobots2/help/cs/figures/gnobots2-main.png         |  Bin 0 -> 29131 bytes
 gnobots2/help/de/de.po                             |    8 +-
 gnobots2/help/el/el.po                             |    8 +-
 gnobots2/help/en_GB/en_GB.po                       |    8 +-
 gnobots2/help/es/es.po                             |    6 +-
 gnobots2/help/eu/eu.po                             |    8 +-
 gnobots2/help/fr/fr.po                             |    8 +-
 gnobots2/help/it/it.po                             |    8 +-
 gnobots2/help/oc/oc.po                             |    4 +-
 gnobots2/help/sv/sv.po                             |    4 +-
 gnobots2/properties.c                              |   12 +-
 gnome-sudoku/data/Makefile.am                      |   29 +-
 gnome-sudoku/data/gnome-sudoku.schemas.in          |  341 +
 gnome-sudoku/help/C/gnome-sudoku.xml               |    2 +-
 gnome-sudoku/help/Makefile.am                      |    2 +-
 gnome-sudoku/help/ca/ca.po                         |    4 +-
 gnome-sudoku/help/cs/cs.po                         | 1008 +++
 gnome-sudoku/help/cs/figures/Print_Sudokus.png     |  Bin 0 -> 35149 bytes
 gnome-sudoku/help/cs/figures/always_show_hint.png  |  Bin 0 -> 64681 bytes
 gnome-sudoku/help/cs/figures/highlighting.png      |  Bin 0 -> 49426 bytes
 gnome-sudoku/help/cs/figures/resuming.png          |  Bin 0 -> 48630 bytes
 gnome-sudoku/help/cs/figures/starting.png          |  Bin 0 -> 23708 bytes
 gnome-sudoku/help/da/da.po                         |    4 +-
 gnome-sudoku/help/de/de.po                         |    4 +-
 gnome-sudoku/help/el/el.po                         |    4 +-
 gnome-sudoku/help/en_GB/en_GB.po                   |    4 +-
 gnome-sudoku/help/es/es.po                         |    6 +-
 gnome-sudoku/help/eu/eu.po                         |    4 +-
 gnome-sudoku/help/fr/fr.po                         |    4 +-
 gnome-sudoku/help/it/it.po                         |    6 +-
 gnome-sudoku/help/oc/oc.po                         |    2 +-
 gnome-sudoku/help/pt_BR/pt_BR.po                   |    4 +-
 gnome-sudoku/help/ru/ru.po                         |    4 +-
 gnome-sudoku/help/sv/sv.po                         |    2 +-
 gnome-sudoku/src/lib/defaults.py.in                |   10 +-
 gnome-sudoku/src/lib/gtk_goodies/gconf_wrapper.py  |    2 +-
 gnome-sudoku/src/lib/main.py                       |    8 +-
 gnome-sudoku/src/lib/sudoku_generator_gui.py       |   12 +-
 gnometris/Makefile.am                              |   16 +-
 gnometris/blockops.cpp                             |  161 +-
 gnometris/blockops.h                               |    7 +-
 gnometris/help/C/gnometris.xml                     |    6 +-
 gnometris/help/Makefile.am                         |    2 +-
 gnometris/help/cs/cs.po                            |  676 ++
 gnometris/help/de/de.po                            |  403 +-
 gnometris/help/es/es.po                            |  158 +-
 gnometris/help/eu/eu.po                            |    8 +-
 gnometris/help/oc/oc.po                            |    4 +-
 gnometris/main.cpp                                 |    2 +
 gnometris/preview.cpp                              |    2 +-
 gnometris/renderer.cpp                             |   23 +-
 gnometris/renderer.h                               |    5 +-
 gnometris/tetris.cpp                               |   23 +-
 gnometris/tetris.h                                 |    4 +
 gnomine/Makefile.am                                |   17 +-
 gnomine/gnomine.c                                  |   30 +-
 gnomine/help/C/gnomine.xml                         |    2 +-
 gnomine/help/Makefile.am                           |    2 +-
 gnomine/help/ca/ca.po                              |    4 +-
 gnomine/help/cs/cs.po                              |  958 +++
 gnomine/help/cs/figures/highscores.png             |  Bin 0 -> 20396 bytes
 gnomine/help/cs/figures/imnotsureflagscheckbox.png |  Bin 0 -> 3246 bytes
 gnomine/help/cs/figures/main-window.png            |  Bin 0 -> 194653 bytes
 gnomine/help/cs/figures/preferences.png            |  Bin 0 -> 24476 bytes
 gnomine/help/cs/figures/statusbar.png              |  Bin 0 -> 3287 bytes
 gnomine/help/de/de.po                              |    4 +-
 gnomine/help/el/el.po                              |    4 +-
 gnomine/help/en_GB/en_GB.po                        |    4 +-
 gnomine/help/es/es.po                              |    2 +-
 gnomine/help/eu/eu.po                              |    4 +-
 gnomine/help/fr/fr.po                              |    4 +-
 gnomine/help/it/it.po                              |    6 +-
 gnomine/help/oc/oc.po                              |    2 +-
 gnomine/help/sv/sv.po                              |    4 +-
 gnomine/help/zh_CN/zh_CN.po                        |    4 +-
 gnotravex/Makefile.am                              |   17 +-
 gnotravex/gnotravex.c                              |   44 +-
 gnotravex/help/C/gnotravex.xml                     |    4 +-
 gnotravex/help/Makefile.am                         |    2 +-
 gnotravex/help/ca/ca.po                            |    8 +-
 gnotravex/help/cs/cs.po                            |  440 +
 gnotravex/help/cs/figures/gnotravex_game.png       |  Bin 0 -> 26433 bytes
 gnotravex/help/cs/figures/gnotravex_mainwindow.png |  Bin 0 -> 26757 bytes
 gnotravex/help/de/de.po                            |    6 +-
 gnotravex/help/el/el.po                            |    8 +-
 gnotravex/help/en_GB/en_GB.po                      |    8 +-
 gnotravex/help/es/es.po                            |    8 +-
 gnotravex/help/eu/eu.po                            |    6 +-
 gnotravex/help/fr/fr.po                            |    8 +-
 gnotravex/help/it/it.po                            |    8 +-
 gnotravex/help/oc/oc.po                            |    4 +-
 gnotravex/help/ru/ru.po                            |    8 +-
 gnotravex/help/sv/sv.po                            |    8 +-
 gnotski/Makefile.am                                |   14 +-
 gnotski/gnotski.c                                  |   14 +-
 gnotski/help/C/gnotski.xml                         |    6 +-
 gnotski/help/Makefile.am                           |    2 +-
 gnotski/help/ca/ca.po                              |    8 +-
 gnotski/help/cs/cs.po                              |  546 ++
 gnotski/help/cs/figures/gnotski_start_window.png   |  Bin 0 -> 15742 bytes
 gnotski/help/cs/figures/gnotski_win.png            |  Bin 0 -> 16925 bytes
 gnotski/help/de/de.po                              |   12 +-
 gnotski/help/el/el.po                              |   12 +-
 gnotski/help/en_GB/en_GB.po                        |   12 +-
 gnotski/help/es/es.po                              |    8 +-
 gnotski/help/eu/eu.po                              |   12 +-
 gnotski/help/fr/fr.po                              |   12 +-
 gnotski/help/it/it.po                              |   12 +-
 gnotski/help/oc/oc.po                              |    6 +-
 gnotski/help/sv/sv.po                              |   12 +-
 gtali/Makefile.am                                  |   19 +-
 gtali/gyahtzee.c                                   |    2 +
 gtali/help/C/gtali.xml                             |    4 +-
 gtali/help/Makefile.am                             |    2 +-
 gtali/help/ca/ca.po                                |    8 +-
 gtali/help/cs/cs.po                                |  697 ++
 gtali/help/cs/figures/mainwindow.png               |  Bin 0 -> 117061 bytes
 gtali/help/cs/figures/preferences.png              |  Bin 0 -> 26645 bytes
 gtali/help/de/de.po                                |    8 +-
 gtali/help/el/el.po                                |    8 +-
 gtali/help/en_GB/en_GB.po                          |    8 +-
 gtali/help/es/es.po                                |    6 +-
 gtali/help/eu/eu.po                                |    8 +-
 gtali/help/fr/fr.po                                |    8 +-
 gtali/help/it/it.po                                |    8 +-
 gtali/help/oc/oc.po                                |    4 +-
 gtali/help/pt_BR/pt_BR.po                          |    8 +-
 gtali/help/sv/sv.po                                |    6 +-
 gtali/setup.c                                      |    8 +-
 iagno/Makefile.am                                  |   10 +-
 iagno/help/C/iagno.xml                             |    4 +-
 iagno/help/Makefile.am                             |    2 +-
 iagno/help/ca/ca.po                                |    8 +-
 iagno/help/cs/cs.po                                |  961 +++
 iagno/help/cs/figures/ANIMATION.png                |  Bin 0 -> 23931 bytes
 iagno/help/cs/figures/BLOCK.png                    |  Bin 0 -> 24449 bytes
 iagno/help/cs/figures/FIRST.png                    |  Bin 0 -> 21117 bytes
 iagno/help/cs/figures/PLAYER.png                   |  Bin 0 -> 21612 bytes
 iagno/help/cs/figures/START.png                    |  Bin 0 -> 21181 bytes
 iagno/help/de/de.po                                |  206 +-
 iagno/help/el/el.po                                |    8 +-
 iagno/help/en_GB/en_GB.po                          |    8 +-
 iagno/help/es/es.po                                |    8 +-
 iagno/help/eu/eu.po                                |    8 +-
 iagno/help/fr/fr.po                                |    8 +-
 iagno/help/it/it.po                                |    8 +-
 iagno/help/oc/oc.po                                |    4 +-
 iagno/help/pt_BR/pt_BR.po                          |    8 +-
 iagno/help/sv/sv.po                                |    6 +-
 icons/Makefile.am                                  |  460 +-
 icons/hicolor_actions_16x16_cards-deal.png         |  Bin 0 -> 744 bytes
 icons/hicolor_actions_22x22_cards-deal.png         |  Bin 0 -> 1107 bytes
 icons/hicolor_actions_24x24_cards-deal.png         |  Bin 0 -> 1826 bytes
 icons/hicolor_actions_32x32_cards-deal.png         |  Bin 0 -> 1650 bytes
 icons/hicolor_actions_48x48_cards-deal.png         |  Bin 0 -> 2709 bytes
 ....png => hicolor_apps_16x16_gnome-aisleriot.png} |  Bin 699 -> 699 bytes
 ....png => hicolor_apps_16x16_gnome-blackjack.png} |  Bin 855 -> 855 bytes
 ...l.png => hicolor_apps_16x16_gnome-freecell.png} |  Bin 436 -> 436 bytes
 ...ss.png => hicolor_apps_16x16_gnome-glchess.png} |  Bin 568 -> 568 bytes
 ...nes.png => hicolor_apps_16x16_gnome-glines.png} |  Bin 675 -> 675 bytes
 ...nect.png => hicolor_apps_16x16_gnome-gnect.png} |  Bin 562 -> 562 bytes
 ...s.png => hicolor_apps_16x16_gnome-gnibbles.png} |  Bin 749 -> 749 bytes
 ....png => hicolor_apps_16x16_gnome-gnometris.png} |  Bin 649 -> 649 bytes
 ...agno.png => hicolor_apps_16x16_gnome-iagno.png} |  Bin 856 -> 856 bytes
 ...ki.png => hicolor_apps_16x16_gnome-klotski.png} |  Bin 554 -> 554 bytes
 ...g.png => hicolor_apps_16x16_gnome-mahjongg.png} |  Bin 598 -> 598 bytes
 ...ines.png => hicolor_apps_16x16_gnome-mines.png} |  Bin 736 -> 736 bytes
 ...ots.png => hicolor_apps_16x16_gnome-robots.png} |  Bin 864 -> 864 bytes
 ....png => hicolor_apps_16x16_gnome-samegnome.png} |  Bin 876 -> 876 bytes
 ...oku.png => hicolor_apps_16x16_gnome-sudoku.png} |  Bin 490 -> 490 bytes
 ...-tali.png => hicolor_apps_16x16_gnome-tali.png} |  Bin 641 -> 641 bytes
 ...x.png => hicolor_apps_16x16_gnome-tetravex.png} |  Bin 838 -> 838 bytes
 ....png => hicolor_apps_22x22_gnome-aisleriot.png} |  Bin 1153 -> 1153 bytes
 ....png => hicolor_apps_22x22_gnome-blackjack.png} |  Bin 1204 -> 1204 bytes
 ...l.png => hicolor_apps_22x22_gnome-freecell.png} |  Bin 1179 -> 1179 bytes
 ...ss.png => hicolor_apps_22x22_gnome-glchess.png} |  Bin 986 -> 986 bytes
 ...nes.png => hicolor_apps_22x22_gnome-glines.png} |  Bin 1161 -> 1161 bytes
 ...nect.png => hicolor_apps_22x22_gnome-gnect.png} |  Bin 1033 -> 1033 bytes
 ...s.png => hicolor_apps_22x22_gnome-gnibbles.png} |  Bin 1138 -> 1138 bytes
 ....png => hicolor_apps_22x22_gnome-gnometris.png} |  Bin 1110 -> 1110 bytes
 ...agno.png => hicolor_apps_22x22_gnome-iagno.png} |  Bin 985 -> 985 bytes
 ...ki.png => hicolor_apps_22x22_gnome-klotski.png} |  Bin 909 -> 909 bytes
 ...g.png => hicolor_apps_22x22_gnome-mahjongg.png} |  Bin 1037 -> 1037 bytes
 ...ines.png => hicolor_apps_22x22_gnome-mines.png} |  Bin 1281 -> 1281 bytes
 ...ots.png => hicolor_apps_22x22_gnome-robots.png} |  Bin 1330 -> 1330 bytes
 ....png => hicolor_apps_22x22_gnome-samegnome.png} |  Bin 1031 -> 1031 bytes
 ...oku.png => hicolor_apps_22x22_gnome-sudoku.png} |  Bin 1137 -> 1137 bytes
 ...-tali.png => hicolor_apps_22x22_gnome-tali.png} |  Bin 1381 -> 1381 bytes
 ...x.png => hicolor_apps_22x22_gnome-tetravex.png} |  Bin 1523 -> 1523 bytes
 ....png => hicolor_apps_24x24_gnome-aisleriot.png} |  Bin 1193 -> 1193 bytes
 ....png => hicolor_apps_24x24_gnome-blackjack.png} |  Bin 1257 -> 1257 bytes
 ...l.png => hicolor_apps_24x24_gnome-freecell.png} |  Bin 1229 -> 1229 bytes
 ...ss.png => hicolor_apps_24x24_gnome-glchess.png} |  Bin 1027 -> 1027 bytes
 ...nes.png => hicolor_apps_24x24_gnome-glines.png} |  Bin 1228 -> 1228 bytes
 ...nect.png => hicolor_apps_24x24_gnome-gnect.png} |  Bin 1066 -> 1066 bytes
 ...s.png => hicolor_apps_24x24_gnome-gnibbles.png} |  Bin 1181 -> 1181 bytes
 ....png => hicolor_apps_24x24_gnome-gnometris.png} |  Bin 1146 -> 1146 bytes
 ...agno.png => hicolor_apps_24x24_gnome-iagno.png} |  Bin 1044 -> 1044 bytes
 ...ki.png => hicolor_apps_24x24_gnome-klotski.png} |  Bin 885 -> 885 bytes
 ...g.png => hicolor_apps_24x24_gnome-mahjongg.png} |  Bin 1070 -> 1070 bytes
 ...ines.png => hicolor_apps_24x24_gnome-mines.png} |  Bin 1325 -> 1325 bytes
 ...ots.png => hicolor_apps_24x24_gnome-robots.png} |  Bin 1358 -> 1358 bytes
 ....png => hicolor_apps_24x24_gnome-samegnome.png} |  Bin 1071 -> 1071 bytes
 ...oku.png => hicolor_apps_24x24_gnome-sudoku.png} |  Bin 1162 -> 1162 bytes
 ...-tali.png => hicolor_apps_24x24_gnome-tali.png} |  Bin 1452 -> 1452 bytes
 ...x.png => hicolor_apps_24x24_gnome-tetravex.png} |  Bin 1578 -> 1578 bytes
 ....png => hicolor_apps_26x26_gnome-aisleriot.png} |  Bin 1238 -> 1238 bytes
 ....png => hicolor_apps_32x32_gnome-aisleriot.png} |  Bin 1422 -> 1422 bytes
 ....png => hicolor_apps_32x32_gnome-blackjack.png} |  Bin 1774 -> 1774 bytes
 ...l.png => hicolor_apps_32x32_gnome-freecell.png} |  Bin 1772 -> 1772 bytes
 ...ss.png => hicolor_apps_32x32_gnome-glchess.png} |  Bin 1354 -> 1354 bytes
 ...nes.png => hicolor_apps_32x32_gnome-glines.png} |  Bin 1908 -> 1908 bytes
 ...nect.png => hicolor_apps_32x32_gnome-gnect.png} |  Bin 2011 -> 2011 bytes
 ...s.png => hicolor_apps_32x32_gnome-gnibbles.png} |  Bin 2101 -> 2101 bytes
 ....png => hicolor_apps_32x32_gnome-gnometris.png} |  Bin 1429 -> 1429 bytes
 ...agno.png => hicolor_apps_32x32_gnome-iagno.png} |  Bin 2501 -> 2501 bytes
 ...ki.png => hicolor_apps_32x32_gnome-klotski.png} |  Bin 1440 -> 1440 bytes
 ...g.png => hicolor_apps_32x32_gnome-mahjongg.png} |  Bin 1799 -> 1799 bytes
 ...ines.png => hicolor_apps_32x32_gnome-mines.png} |  Bin 2158 -> 2158 bytes
 ...ots.png => hicolor_apps_32x32_gnome-robots.png} |  Bin 2071 -> 2071 bytes
 ....png => hicolor_apps_32x32_gnome-samegnome.png} |  Bin 2218 -> 2218 bytes
 ...oku.png => hicolor_apps_32x32_gnome-sudoku.png} |  Bin 1709 -> 1709 bytes
 ...-tali.png => hicolor_apps_32x32_gnome-tali.png} |  Bin 2431 -> 2431 bytes
 ...x.png => hicolor_apps_32x32_gnome-tetravex.png} |  Bin 2993 -> 2993 bytes
 ....png => hicolor_apps_34x34_gnome-aisleriot.png} |  Bin 1458 -> 1458 bytes
 ....png => hicolor_apps_40x40_gnome-aisleriot.png} |  Bin 2092 -> 2092 bytes
 ....png => hicolor_apps_48x48_gnome-aisleriot.png} |  Bin 2701 -> 2701 bytes
 ....png => hicolor_apps_48x48_gnome-blackjack.png} |  Bin 3556 -> 3556 bytes
 ...l.png => hicolor_apps_48x48_gnome-freecell.png} |  Bin 3108 -> 3108 bytes
 ...ss.png => hicolor_apps_48x48_gnome-glchess.png} |  Bin 2177 -> 2177 bytes
 ...nes.png => hicolor_apps_48x48_gnome-glines.png} |  Bin 3326 -> 3326 bytes
 ...nect.png => hicolor_apps_48x48_gnome-gnect.png} |  Bin 2968 -> 2968 bytes
 ...s.png => hicolor_apps_48x48_gnome-gnibbles.png} |  Bin 3452 -> 3452 bytes
 ....png => hicolor_apps_48x48_gnome-gnometris.png} |  Bin 2094 -> 2094 bytes
 ...agno.png => hicolor_apps_48x48_gnome-iagno.png} |  Bin 3465 -> 3465 bytes
 ...ki.png => hicolor_apps_48x48_gnome-klotski.png} |  Bin 2252 -> 2252 bytes
 ...g.png => hicolor_apps_48x48_gnome-mahjongg.png} |  Bin 2268 -> 2268 bytes
 ...ines.png => hicolor_apps_48x48_gnome-mines.png} |  Bin 3398 -> 3398 bytes
 ...ots.png => hicolor_apps_48x48_gnome-robots.png} |  Bin 3129 -> 3129 bytes
 ....png => hicolor_apps_48x48_gnome-samegnome.png} |  Bin 2774 -> 2774 bytes
 ...oku.png => hicolor_apps_48x48_gnome-sudoku.png} |  Bin 3891 -> 3891 bytes
 ...-tali.png => hicolor_apps_48x48_gnome-tali.png} |  Bin 3406 -> 3406 bytes
 ...x.png => hicolor_apps_48x48_gnome-tetravex.png} |  Bin 4941 -> 4941 bytes
 ....png => hicolor_apps_50x50_gnome-aisleriot.png} |  Bin 2707 -> 2707 bytes
 ...g => hicolor_apps_scalable_gnome-aisleriot.png} |  Bin 3757 -> 3757 bytes
 ...g => hicolor_apps_scalable_gnome-aisleriot.svg} |    0
 ...g => hicolor_apps_scalable_gnome-blackjack.svg} |    0
 ...vg => hicolor_apps_scalable_gnome-freecell.svg} |    0
 ...svg => hicolor_apps_scalable_gnome-glchess.svg} |    0
 ....svg => hicolor_apps_scalable_gnome-glines.svg} |    0
 ...t.svg => hicolor_apps_scalable_gnome-gnect.svg} |    0
 ...vg => hicolor_apps_scalable_gnome-gnibbles.svg} |    0
 ...g => hicolor_apps_scalable_gnome-gnometris.svg} |    0
 ...o.svg => hicolor_apps_scalable_gnome-iagno.svg} |    0
 ...svg => hicolor_apps_scalable_gnome-klotski.svg} |    0
 ...g => hicolor_apps_scalable_gnome-lightsoff.svg} |    0
 ...vg => hicolor_apps_scalable_gnome-mahjongg.svg} |    0
 ...s.svg => hicolor_apps_scalable_gnome-mines.svg} |    0
 ....svg => hicolor_apps_scalable_gnome-robots.svg} |    0
 ...g => hicolor_apps_scalable_gnome-samegnome.svg} |    0
 ....svg => hicolor_apps_scalable_gnome-sudoku.svg} |    0
 ...li.svg => hicolor_apps_scalable_gnome-tali.svg} |    0
 ...vg => hicolor_apps_scalable_gnome-tetravex.svg} |    0
 libgames-support/GGZ-1.0.gir                       |   10 +
 libgames-support/Makefile.am                       |  293 +-
 libgames-support/eggdesktopfile.c                  |   88 +-
 libgames-support/eggdesktopfile.h                  |    5 +-
 libgames-support/eggsmclient-xsmp.c                |   13 +-
 libgames-support/games-card-images.c               |   36 +-
 libgames-support/games-card-images.h               |   20 +-
 libgames-support/games-card-private.h              |   32 +-
 libgames-support/games-card-textures-cache.c       |   33 +-
 libgames-support/games-card-textures-cache.h       |   31 +-
 libgames-support/games-card-theme-fixed.c          |   35 +-
 libgames-support/games-card-theme-kde.c            |    2 +-
 libgames-support/games-card-theme-preimage.c       |   32 +-
 libgames-support/games-card-theme-private.h        |   30 +-
 libgames-support/games-card-theme-pysol.c          |   13 +-
 libgames-support/games-card-theme-sliced.c         |   13 +-
 libgames-support/games-card-theme-svg.c            |   26 +-
 libgames-support/games-card-theme.c                |   32 +-
 libgames-support/games-card-theme.h                |   20 +-
 libgames-support/games-card-themes.c               |   83 +-
 libgames-support/games-card-themes.h               |   20 +-
 libgames-support/games-card.c                      |   24 +-
 libgames-support/games-card.h                      |   28 +-
 libgames-support/games-clock.c                     |  207 +-
 libgames-support/games-clock.h                     |   15 +-
 libgames-support/games-conf.c                      |   24 +-
 libgames-support/games-debug.c                     |   13 +-
 libgames-support/games-gridframe.c                 |    6 +-
 libgames-support/games-help.c                      |  143 +-
 libgames-support/games-help.h                      |    7 +-
 libgames-support/games-pixbuf-utils.c              |   17 +-
 libgames-support/games-pixbuf-utils.h              |   17 +-
 libgames-support/games-preimage.c                  |    2 +
 libgames-support/games-runtime.c                   |  393 +-
 libgames-support/games-runtime.h                   |   17 +-
 libgames-support/games-scores-backend.c            |   18 +-
 libgames-support/games-scores-backend.h            |    5 +-
 libgames-support/games-scores-dialog.c             |    8 +-
 libgames-support/games-scores.c                    |    4 +-
 libgames-support/games-show.c                      |  159 +
 libgames-support/games-show.h                      |   39 +
 libgames-support/games-sound.c                     |    7 +-
 libgames-support/games-stock.c                     |   23 +-
 libgames-support/render-cards.c                    |   16 +-
 libgames-support/theme-install.ini                 |   21 +-
 lightsoff/0.svg                                    |  209 -
 lightsoff/1.svg                                    |  177 -
 lightsoff/2.svg                                    |  187 -
 lightsoff/3.svg                                    |  207 -
 lightsoff/4.svg                                    |  165 -
 lightsoff/5.svg                                    |  187 -
 lightsoff/6.svg                                    |  209 -
 lightsoff/7.svg                                    |  187 -
 lightsoff/8.svg                                    |  227 -
 lightsoff/9.svg                                    |  209 -
 lightsoff/Makefile.am                              |  105 +-
 lightsoff/arrow.js.in                              |   42 -
 lightsoff/board.js.in                              |  230 -
 lightsoff/data/lightsoff.ui                        |  108 +
 lightsoff/data/settings.ui                         |  140 +
 lightsoff/data/themes/Makefile.am                  |    1 +
 lightsoff/data/themes/tango/Makefile.am            |   19 +
 lightsoff/data/themes/tango/arrow.svg              |   66 +
 .../themes/tango/backing.svg}                      |   48 +-
 lightsoff/data/themes/tango/highlight.svg          |   99 +
 .../themes/tango/led-back.svg}                     |   12 +-
 lightsoff/{arrow.svg => data/themes/tango/off.svg} |   85 +-
 lightsoff/{arrow.svg => data/themes/tango/on.svg}  |   85 +-
 lightsoff/data/themes/tango/theme.js               |   15 +
 lightsoff/data/themes/up/Makefile.am               |   19 +
 lightsoff/data/themes/up/arrow.svg                 |   66 +
 .../{lcd-back.svg => data/themes/up/backing.svg}   |   48 +-
 lightsoff/data/themes/up/highlight.svg             |   99 +
 .../{lcd-front.svg => data/themes/up/led-back.svg} |   98 +-
 lightsoff/data/themes/up/off.svg                   |  164 +
 lightsoff/data/themes/up/on.svg                    |  198 +
 lightsoff/data/themes/up/theme.js                  |   15 +
 lightsoff/help/C/legal.xml                         |   76 +
 lightsoff/help/C/lightsoff.xml                     |  222 +
 lightsoff/help/Makefile.am                         |   12 +
 lightsoff/help/lightsoff.omf.in                    |    9 +
 lightsoff/lcd-off.svg                              |  228 -
 lightsoff/light-off.svg                            |  228 -
 lightsoff/light-on.svg                             |  204 -
 lightsoff/light.js.in                              |   93 -
 lightsoff/lightsoff.in                             |    2 -
 lightsoff/lightsoff.schemas.in                     |   30 +
 lightsoff/main.js.in                               |   67 -
 lightsoff/score.js.in                              |  113 -
 lightsoff/src/About.js                             |   29 +
 lightsoff/src/Arrow.js                             |   28 +
 lightsoff/src/Board.js                             |  230 +
 lightsoff/src/Game.js                              |  290 +
 lightsoff/src/LED.js                               |  181 +
 lightsoff/src/Light.js                             |   84 +
 lightsoff/src/Path.js.in                           |    1 +
 lightsoff/src/Settings.js                          |  118 +
 lightsoff/src/ThemeLoader.js                       |   38 +
 lightsoff/src/lightsoff.in                         |    5 +
 lightsoff/src/main.js                              |   62 +
 m4/c99.m4                                          |    3 +-
 m4/introspection.m4                                |   88 +
 mahjongg/Makefile.am                               |   14 +-
 mahjongg/drawing.c                                 |   22 +-
 mahjongg/help/C/mahjongg.xml                       |  154 +-
 mahjongg/help/Makefile.am                          |    2 +-
 mahjongg/help/ca/ca.po                             |    8 +-
 mahjongg/help/cs/cs.po                             |  939 +++
 mahjongg/help/cs/figures/mahjongg.png              |  Bin 0 -> 92897 bytes
 mahjongg/help/cs/figures/no-move.png               |  Bin 0 -> 14634 bytes
 mahjongg/help/cs/figures/preferences.png           |  Bin 0 -> 20018 bytes
 mahjongg/help/cs/figures/toolbar.png               |  Bin 0 -> 8494 bytes
 mahjongg/help/de/de.po                             |  517 +-
 mahjongg/help/el/el.po                             |    8 +-
 mahjongg/help/en_GB/en_GB.po                       |    8 +-
 mahjongg/help/es/es.po                             |  579 +-
 mahjongg/help/eu/eu.po                             |    6 +-
 mahjongg/help/fr/fr.po                             |  409 +-
 mahjongg/help/it/it.po                             |    6 +-
 mahjongg/help/oc/oc.po                             |    4 +-
 mahjongg/help/sv/sv.po                             |    4 +-
 mahjongg/mahjongg.c                                |    8 +-
 po/POTFILES.in                                     |   43 +-
 po/POTFILES.skip                                   |    2 +
 po/cy.po                                           | 8629 ++++++++++++--------
 po/de.po                                           | 3851 ++++++----
 po/es.po                                           | 3441 +++++---
 po/et.po                                           | 4872 +++++-------
 po/fr.po                                           | 3567 +++++----
 po/gl.po                                           | 4170 +++++-----
 po/hi.po                                           | 2558 +++---
 po/nb.po                                           | 4259 ++++++-----
 po/sv.po                                           | 3983 ++++++----
 po/ta.po                                           | 3509 +++++----
 po/uk.po                                           | 6357 +++++++++------
 po/zh_HK.po                                        | 4015 +++++----
 po/zh_TW.po                                        | 4014 +++++----
 same-gnome-clutter/Makefile.am                     |   61 +
 same-gnome-clutter/data/same-gnome.ui              |  165 +
 same-gnome-clutter/data/settings.ui                |  301 +
 same-gnome-clutter/data/themes/Makefile.am         |    1 +
 same-gnome-clutter/data/themes/tango/Makefile.am   |   17 +
 .../data/themes/tango/bkg.svg                      |   78 +-
 .../data/themes/tango/blue.svg                     |   85 +-
 .../data/themes/tango/green.svg                    |   85 +-
 .../data/themes/tango/red.svg                      |   85 +-
 same-gnome-clutter/data/themes/tango/theme.js      |   12 +
 .../data/themes/tango/yellow.svg                   |   85 +-
 same-gnome-clutter/data/themes/test/Makefile.am    |   17 +
 .../data/themes/test/bkg.svg                       |   78 +-
 .../data/themes/test/blue.svg                      |   85 +-
 .../data/themes/test/green.svg                     |   85 +-
 .../data/themes/test/red.svg                       |   85 +-
 same-gnome-clutter/data/themes/test/theme.js       |   12 +
 .../data/themes/test/yellow.svg                    |   85 +-
 .../same-gnome-clutter.desktop.in.in               |   13 +
 same-gnome-clutter/same-gnome-clutter.in           |    5 +
 same-gnome-clutter/same-gnome-clutter.schemas.in   |   54 +
 same-gnome-clutter/src/About.js                    |   32 +
 same-gnome-clutter/src/Board.js                    |  308 +
 same-gnome-clutter/src/Light.js                    |  126 +
 same-gnome-clutter/src/Path.js.in                  |    1 +
 same-gnome-clutter/src/Score.js                    |  150 +
 same-gnome-clutter/src/Settings.js                 |  198 +
 same-gnome-clutter/src/ThemeLoader.js              |   38 +
 same-gnome-clutter/src/main.js                     |  115 +
 same-gnome/Makefile.am                             |   14 +-
 same-gnome/drawing.c                               |   65 +-
 same-gnome/help/Makefile.am                        |    2 +-
 same-gnome/help/ca/ca.po                           |    2 +-
 same-gnome/help/cs/cs.po                           |  570 ++
 same-gnome/help/cs/figures/start-up.png            |  Bin 0 -> 67145 bytes
 same-gnome/help/de/de.po                           |  382 +-
 same-gnome/help/el/el.po                           |    2 +-
 same-gnome/help/it/it.po                           |    4 +-
 same-gnome/help/ru/ru.po                           |    8 +-
 same-gnome/same-gnome.c                            |    2 +
 same-gnome/ui.c                                    |    6 +-
 svn2cl.xsl                                         |  295 -
 tests/Makefile.am                                  |   22 +-
 tests/libgames-support/test-libgames-support.c     |   29 -
 693 files changed, 58296 insertions(+), 34007 deletions(-)
---
diff --cc gnome-sudoku/src/lib/main.py
index bdb36fd,4ed0122..d9de053
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@@ -24,32 -21,130 +24,30 @@@ import save
  import sudoku_generator_gui
  import sudoku_maker
  import timer
 +import tracker_box
  from defaults import (APPNAME, APPNAME_SHORT, AUTHORS, COPYRIGHT, DESCRIPTION,
 -        IMAGE_DIR, LICENSE, MIN_NEW_PUZZLES, UI_DIR, VERSION, WEBSITE, WEBSITE_LABEL)
 -from gtk_goodies import gconf_wrapper, Undo, dialog_extras
 -from simple_debug import simple_debug, options
 +        LICENSE, MIN_NEW_PUZZLES, UI_DIR, VERSION, WEBSITE, WEBSITE_LABEL)
 +from gtk_goodies import gconf_wrapper, dialog_extras
 +import undo
 +
 +import contact_selector
 +import networking
 +import tp_tube
 +import tube_handler
 +
 +logging.basicConfig()
 +logger = logging.getLogger("main")
  
 -ICON_FACTORY = gtk.IconFactory()
 -STOCK_PIXBUFS = {}
 -for filename, stock_id in [('footprints.png', 'tracks'), ]:
 -    try:
 -        pb = gtk.gdk.pixbuf_new_from_file(os.path.join(IMAGE_DIR, filename))
 -    except gobject.GError, e:
 -        print 'Failed to load pixbuf: %s' % e
 -        continue
 -    STOCK_PIXBUFS[stock_id] = pb
 -    iconset = gtk.IconSet(pb)
 -    ICON_FACTORY.add(stock_id, iconset)
 -    ICON_FACTORY.add_default()
 -
 -gtk.stock_add([('tracks',
 -                _('Track moves'),
 -                0, 0, ""), ])
 -
 -def inactivate_new_game_etc (fun):
 -    def inactivate_new_game_etc_ (ui, *args, **kwargs):
 -        paths = [
 -            '/MenuBar/Game/New',
 -            '/MenuBar/Game/Print',
 -            # undo/redo is handled elsewhere as it can't simply be turned on/off.
 -            '/MenuBar/Edit/Clear',
 -            '/MenuBar/Edit/ClearNotes',
 -            '/MenuBar/View/ToggleToolbar',
 -            '/MenuBar/Tools/ShowPossible',
 -            '/MenuBar/Tools/AutofillCurrentSquare',
 -            '/MenuBar/Tools/Autofill',
 -            '/MenuBar/Tools/AlwaysShowPossible',
 -            '/MenuBar/Tools/ShowImpossibleImplications',
 -            '/MenuBar/Tools/Tracker',
 -            '/MenuBar/Game/PuzzleInfo',
 -            ]
 -        for p in paths:
 -            action = ui.uimanager.get_action(p)
 -            if not action:
 -                action = ui.uimanager.get_widget(p)
 -            if not action:
 -                print 'No action at path', p
 -            else:
 -                action.set_sensitive(False)
 -        ret = fun(ui, *args, **kwargs)
 -        for p in paths:
 -            action = ui.uimanager.get_action(p)
 -            if not action:
 -                action = ui.uimanager.get_widget(p)
 -            if not action:
 -                print 'No action at path', p
 -            else:
 -                action.set_sensitive(True)
 -        return ret
 -    return inactivate_new_game_etc_
 -
 -class UI (gconf_wrapper.GConfWrapper):
 -    ui = '''<ui>
 -    <menubar name="MenuBar">
 -      <menu name="Game" action="Game">
 -        <menuitem action="New"/>
 -        <separator/>
 -        <menuitem action="PuzzleInfo"/>
 -        <separator/>
 -        <menuitem action="Print"/>
 -        <menuitem action="PrintMany"/>
 -        <separator/>
 -        <menuitem action="Close"/>
 -      </menu>
 -      <menu action="Edit">
 -        <menuitem action="Undo"/>
 -        <menuitem action="Redo"/>
 -        <separator/>
 -        <menuitem action="Clear"/>
 -        <menuitem action="ClearNotes"/>
 -      </menu>
 -      <menu action="View">
 -        <menuitem action="FullScreen"/>
 -        <separator/>
 -        <menuitem action="ToggleToolbar"/>
 -        <menuitem action="ToggleHighlight"/>
 -      </menu>
 -      <menu action="Tools">
 -        <menuitem action="ShowPossible"/>
 -        <menuitem action="AutofillCurrentSquare"/>
 -        <menuitem action="Autofill"/>
 -        <separator/>
 -        <menuitem action="AlwaysShowPossible"/>
 -        <menuitem action="ShowImpossibleImplications"/>
 -        <separator/>
 -        <menuitem action="Generator"/>
 -        <menuitem action="BackgroundGenerator"/>
 -        <separator/>
 -        <menuitem action="Tracker"/>
 -        </menu>
 -      <menu action="Help">
 -        <menuitem action="ShowHelp"/>
 -        <menuitem action="About"/>
 -      </menu>
 -    </menubar>
 -    <toolbar name="Toolbar">
 -      <toolitem action="New"/>
 -      <toolitem action="Print"/>
 -      <separator/>
 -      <toolitem action="Undo"/>
 -      <toolitem action="Redo"/>
 -      <separator/>
 -      <toolitem action="ShowPossible"/>
 -      <toolitem action="AutofillCurrentSquare"/>
 -      <separator/>
 -      <toolitem action="ToggleHighlight"/>
 -      <toolitem action="Tracker"/>
 -    </toolbar>
 -    </ui>'''
 +
 +class SudokuGame(gconf_wrapper.GConfWrapper):
  
      initial_prefs = {'group_size':9,
-                      'always_show_hints':0,
-                      'player':os.environ.get('USERNAME', ''),
+                      'always_show_hints':False,
                       'difficulty':0.0,
 +                     'game-level': 'easy',
                       'minimum_number_of_new_puzzles':MIN_NEW_PUZZLES,
-                      'highlight':0,
-                      'bg_black':1,
-                      'bg_custom_color':'',
+                      'highlight':False,
+                      'bg_color':'black',
                       'show_tracker':False,
                       'width': 700,
                       'height': 675,



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