move setting pygtk environment variables to the first file that

imports them - splashscreen.py

fixed what I broke in partitioning.py

3 files changed, 6 insertions, 4 deletions

diff --git a/gui.py b/gui.py
index f2e4447fc..bcaac637a 100755
--- a/gui.py
+++ b/gui.py
@@ -14,8 +14,6 @@
 #
 
 import os
-os.environ["PYGTK_FATAL_EXCEPTIONS"] = "1"
-os.environ["GNOME_DISABLE_CRASH_DIALOG"] = "1"
 # msw says this is a good idea
 os.environ["LC_ALL"] = "C"
 
diff --git a/partitioning.py b/partitioning.py
index 0cc154f7d..f06e470ae 100644
--- a/partitioning.py
+++ b/partitioning.py
@@ -477,8 +477,8 @@ class PartitionRequests:
         self.deletes = []
         # identifier used for raid partitions
         self.nextUniqueID = 1
-#        if diskset:
-#            self.setFromDisk(diskset)
+        if diskset:
+            self.setFromDisk(diskset)
 
 
     def setFromDisk(self, diskset):
diff --git a/splashscreen.py b/splashscreen.py
index f1deebbc0..30eccdd55 100644
--- a/splashscreen.py
+++ b/splashscreen.py
@@ -13,6 +13,10 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
+import os
+os.environ["PYGTK_FATAL_EXCEPTIONS"] = "1"
+os.environ["GNOME_DISABLE_CRASH_DIALOG"] = "1"
+
 from gtk import *
 from gtk import _root_window
 import GDK