gnome-games r7320 - in trunk: glchess/src glchess/src/lib gnome-sudoku/src gnome-sudoku/src/lib

[andreasr svn gnome org]

Author: andreasr
Date: Fri Feb  8 17:17:09 2008
New Revision: 7320
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7320&view=rev

Log:
Resolve Bug #514045 and add some comments to ensure that the files stay
in sync.


Modified:
   trunk/glchess/src/glchess.in.in
   trunk/glchess/src/lib/defaults.py.in
   trunk/gnome-sudoku/src/gnome-sudoku.in.in
   trunk/gnome-sudoku/src/lib/defaults.py.in

Modified: trunk/glchess/src/glchess.in.in
==============================================================================
--- trunk/glchess/src/glchess.in.in	(original)
+++ trunk/glchess/src/glchess.in.in	Fri Feb  8 17:17:09 2008
@@ -1,5 +1,13 @@
 #! /usr/bin/env python
 
+# glChess is a 2D/3D chess game for GNOME. This is the startup
+# script which imports the relevant modules. Please keep the startup
+# script in sync between glChess and gnome-sudoku.
+#
+# Copyright (c) 2008  You may use and distribute this
+# software under the terms of the GNU General Public License, 
+# version 2 or later.
+
 # Setup bugbuddy to report unhandled exceptions.
 try: 
   import bugbuddy

Modified: trunk/glchess/src/lib/defaults.py.in
==============================================================================
--- trunk/glchess/src/lib/defaults.py.in	(original)
+++ trunk/glchess/src/lib/defaults.py.in	Fri Feb  8 17:17:09 2008
@@ -1,10 +1,20 @@
 # -*- coding: utf-8 -*-
+#
+# defaults.py.in sets many important default global variables
+# used throughout the game. Note that this file is processed by
+# automake to set prefix paths etc. Please keep defaults.py.in
+# in sync between glchess and gnome-sudoku. 
 
 import sys, os, os.path
 import errno
 import gettext 
 
-if sys.modules["glchess"].installed_mode:
+if (sys.modules.has_key('glchess') and
+    hasattr(sys.modules["glchess"],'installed_mode') and
+    sys.modules["glchess"].installed_mode):
+    # If the installed_mode attribute is not set, then we are
+    # importing from something other than the glchess script; we
+    # assume anyone importing in this way is doing testing etc.
     APP_DATA_DIR     = os.path.join('@prefix@', 'share') 
     ICON_DIR         = os.path.join(APP_DATA_DIR, 'pixmaps')
     TEXTURE_DIR      = os.path.join(ICON_DIR, 'glchess')

Modified: trunk/gnome-sudoku/src/gnome-sudoku.in.in
==============================================================================
--- trunk/gnome-sudoku/src/gnome-sudoku.in.in	(original)
+++ trunk/gnome-sudoku/src/gnome-sudoku.in.in	Fri Feb  8 17:17:09 2008
@@ -1,7 +1,13 @@
 #! /usr/bin/env python
+
+# GNOME Sudoku is a simple sudoku generator and player. Sudoku is a 
+# japanese logic puzzle. This is the startup script which imports 
+# the relevant modules. Please keep the startup script in sync 
+# between glChess and gnome-sudoku.
+#
 # Copyright (c) 2005 Tom Hinkle You may use and distribute this
 # software under the terms of the GNU General Public License, version
-# 2 or later
+# 2 or later.
 
 # Setup bugbuddy to report unhandled exceptions.
 try: 

Modified: trunk/gnome-sudoku/src/lib/defaults.py.in
==============================================================================
--- trunk/gnome-sudoku/src/lib/defaults.py.in	(original)
+++ trunk/gnome-sudoku/src/lib/defaults.py.in	Fri Feb  8 17:17:09 2008
@@ -1,3 +1,10 @@
+# -*- coding: utf-8 -*-
+#
+# defaults.py.in sets many important default global variables
+# used throughout the game. Note that this file is processed by
+# automake to set prefix paths etc. Please keep defaults.py.in
+# in sync between glchess and gnome-sudoku. 
+
 import sys, os, os.path
 import errno
 import gettext