[gnome-games/sudoku-tube] Fix mistake of resolving merge conflict

[Zhang Sen <zhangsen src gnome org>]

commit 13be846c77bbe9c5cac201cdfdc86621b843ce90
Author: Zhang Sen <zh jesse gmail com>
Date:   Thu Aug 13 16:31:23 2009 +0800

    Fix mistake of resolving merge conflict

 gnome-sudoku/images/Makefile.am     |    2 +-
 gnome-sudoku/src/gnome-sudoku.in.in |   12 ++++++------
 gnome-sudoku/src/lib/defaults.py.in |    2 +-
 gnome-sudoku/src/lib/main.py        |   14 ++------------
 4 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/gnome-sudoku/images/Makefile.am b/gnome-sudoku/images/Makefile.am
index 47e03d2..6d7198a 100644
--- a/gnome-sudoku/images/Makefile.am
+++ b/gnome-sudoku/images/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST = footprints.png
 
-pixmapdir = $(datadir)/pixmaps/gnome-sudoku/
+pixmapdir = $(datadir)/gnome-sudoku/images/
 pixmap_DATA = footprints.png	\
 	      available-16x16.png	\
 	      away-16x16.png	\
diff --git a/gnome-sudoku/src/gnome-sudoku.in.in b/gnome-sudoku/src/gnome-sudoku.in.in
index 456ba4b..49028cb 100644
--- a/gnome-sudoku/src/gnome-sudoku.in.in
+++ b/gnome-sudoku/src/gnome-sudoku.in.in
@@ -27,12 +27,12 @@ import sys
 sys.stdout = SafeStdout()
 
 # Setup bugbuddy to report unhandled exceptions.
-#try:
-#  import bugbuddy
-#  bugbuddy.install('gnome-sudoku')
-#except:
-#  #No bugbuddy support
-#  pass
+try:
+  import bugbuddy
+  bugbuddy.install('gnome-sudoku')
+except:
+  #No bugbuddy support
+  pass
 
 import sys
 
diff --git a/gnome-sudoku/src/lib/defaults.py.in b/gnome-sudoku/src/lib/defaults.py.in
index eb1d80b..6c0e448 100644
--- a/gnome-sudoku/src/lib/defaults.py.in
+++ b/gnome-sudoku/src/lib/defaults.py.in
@@ -21,7 +21,7 @@ if not os.path.exists(os.path.join(root_dir, "Makefile.am")):
 else:
     # Running in uninstalled mode
     sys.path.insert(0, os.path.abspath(root_dir))
-    APP_DATA_DIR = os.path.join(root_dir, '../data') 
+    APP_DATA_DIR = os.path.join(root_dir, '../data')
     IMAGE_DIR    = os.path.join(root_dir, '../images')
     LOCALEDIR    = os.path.join(APP_DATA_DIR, 'locale')
     UI_DIR    = os.path.join(root_dir, '../data')
diff --git a/gnome-sudoku/src/lib/main.py b/gnome-sudoku/src/lib/main.py
index d9de053..3abb0c6 100644
--- a/gnome-sudoku/src/lib/main.py
+++ b/gnome-sudoku/src/lib/main.py
@@ -263,13 +263,8 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
 
     def setup_color (self):
         # setup background colors
-        if self.gconf['bg_custom_color']:
-            bgcol = self.gconf['bg_custom_color']
-        elif self.gconf['bg_black']:
-            bgcol = 'black'
-        else:
-            bgcol = None
-        if bgcol:
+        bgcol = self.gconf['bg_color']
+        if bgcol != '':
             self._main_grid_vew.set_bg_color(bgcol)
 
     def setup_actions (self):
@@ -663,11 +658,6 @@ class SudokuGame(gconf_wrapper.GConfWrapper):
         # otherwise we appear sluggish.
         while gtk.events_pending():
             gtk.main_iteration()
-        if self.won:
-            self.gconf['current_game'] = ''
-        if not self.won:
-            if not self._main_model.grid:
-                self.gconf['current_game'] = ''
         self.stop_worker_thread()
         # allow KeyboardInterrupts, which calls quit_cb outside the main loop
         try: