From 53256867a1a48576e6f3b7113c55a25ce124a898 Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Wed, 11 Feb 2009 15:33:19 +0000
Subject: [PATCH] setup.py install is fixed

---
 ChangeLog |  2 ++
 gfceux    | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57d727ba..1962a3ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 ================= version 2.0.4 ( yet to be released) ============
+* Is now installable 
+* Disabled gamepad GUI until joystick support can be completed
 * Initial joystick config support: supports buttons, but hot hats and axes
 * Documented and cleaned fceux config parser
 * Udated about box UI
diff --git a/gfceux b/gfceux
index 3772ba21..9f08229f 100755
--- a/gfceux
+++ b/gfceux
@@ -29,7 +29,7 @@ import os
 import pickle
 import shutil
 from optparse import OptionParser
-from config_parse import FceuxConfigParser
+#from config_parse import FceuxConfigParser
 import get_key
 #from subprocess import Popen
 
@@ -563,8 +563,10 @@ class GfceuxApp:
             'gp3_button' : "2",
             'gp4_button' : "3"}
         self.gamepad_config_no = d[widget.name]
-    
 
+	"""
+#Disabled for now
+#TODO: Full joystick support
     def button_clicked(self, widget, data=None):
         prefix = "SDL.Input.GamePad." + self.gamepad_config_no
         d = {'right_button' : prefix + "Right",
@@ -592,8 +594,8 @@ class GfceuxApp:
             if key_tuple[0] == "Joystick":
                 print key_tuple
                 cp.writeKey(prefix + "DeviceNum", key_tuple[2])
-                cp.writeKey(d[widget.name], key_tuple[1])
-  
+                cp.writeKey(d[widget.name], key_tuple[1])	
+	"""  
     def gamepad_clicked(self, widget, data=None):
         command = '--inputcfg gamepad' + self.gamepad_config_no
         self.launch(command, True)