From 1b631294491d64caab1ba5b695bd7d659256737a Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Tue, 13 Jan 2009 09:02:27 +0000
Subject: [PATCH] restored old config behavior because the gui doesn't support
 joysticks yet

added note to install file that setup.py is broken right now
---
 INSTALL  | 9 +++++++++
 MANIFEST | 2 ++
 TODO     | 1 +
 gfceux   | 7 ++++---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index 7d146e38..7577c89f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,12 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! IMPORTANT NOTE
+! The setup script is broken right now.
+! To workaround, just run gfceux out of the source directory.
+!
+! $ python ./gfceux
+!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 You can install gfceux with setup.py:
 
 $ sudo python setup.py install --prefix=/usr/local
diff --git a/MANIFEST b/MANIFEST
index c4ecd8d3..25967b61 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,6 @@
 gfceux
+get_key.py
+config_parse.py
 setup.py
 COPYING
 ChangeLog
diff --git a/TODO b/TODO
index 3e6e9ded..446927d8 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
 TODO:
+* clean setup.py
 * implement UI for --special (combo box)
 * use combo box for bpp
 * use combo box to select gamepad to configure, simply UI
diff --git a/gfceux b/gfceux
index 79906d89..3772ba21 100755
--- a/gfceux
+++ b/gfceux
@@ -553,8 +553,9 @@ class GfceuxApp:
     # fix this global its ugly
     # specifies which NES gamepad we are configuring
     gamepad_config_no = "0"
-  
-    def gamepad_clicked(self, widget, data=None):
+    
+    # This isn't used yet because it doesn't work with joysticks.
+    def gamepad_clicked_new(self, widget, data=None):
         widgets.get_object("gamepad_config_window").show_all()
 
         d = {'gp1_button' : "0",
@@ -593,7 +594,7 @@ class GfceuxApp:
                 cp.writeKey(prefix + "DeviceNum", key_tuple[2])
                 cp.writeKey(d[widget.name], key_tuple[1])
   
-    def gamepad_clicked_old(self, widget, data=None):
+    def gamepad_clicked(self, widget, data=None):
         command = '--inputcfg gamepad' + self.gamepad_config_no
         self.launch(command, True)