[gnome-games/applygsoc2009: 70/76] -- Display contact alias when prompting user for tube

[Pablo Castellano <pablog src gnome org>]

commit b0318e18146c5798fbeb2002272926f77fdc4a90
Author: Pablo Castellano <pablog src gnome org>
Date:   Wed Sep 1 05:24:26 2010 +0200

    -- Display contact alias when prompting user for tube
    
    And some other trivial fix

 gnome-sudoku/src/lib/main.py |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index 1ad033d..0801282 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -79,14 +79,12 @@ class SudokuGame (gconf_wrapper.GConfWrapper):
         # generate puzzles while our use is working...
         self._run_background_generator()
 
-    def _auto_open_game(self, check_saved=True):
-        game, game_type = None, None
-        if check_saved:
-            game = self._auto_load_saved()
-            game_type = game_selector.NewOrSavedGameSelector.SAVED_GAME
+    def _auto_open_game(self):
+        game = self._auto_load_saved()
+        game_type = game_selector.NewOrSavedGameSelector.SAVED_GAME
             
         if not game:
-			game = self._auto_load_new()
+			game = self._generate_new_puzzle()
 			game_type = game_selector.NewOrSavedGameSelector.NEW_GAME
 			
         if game:
@@ -107,15 +105,6 @@ class SudokuGame (gconf_wrapper.GConfWrapper):
             logger.debug("no saved game found")
             return None
 
-    def _auto_load_new(self):
-        """Automatically open a new game"""
-        new_puzzle = self._generate_new_puzzle()
-        if new_puzzle:
-            return new_puzzle
-        else:
-            logger.error("failed to genereate new puzzle")
-            return None
-
     def _generate_new_puzzle(self):
         # TODO should use preconfigured or user-selected level
         level = self.gconf['game-level']