git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@39695 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 22 insertions, 41 deletions

diff --git a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2 b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
index d65938dc..e2ef18a5 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
+++ b/plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2
@@ -697,22 +697,8 @@
             <property name="spacing">12</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="btn_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="btn_ok">
-                <property name="label">gtk-ok</property>
+              <widget class="GtkButton" id="btn_close">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -722,7 +708,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </widget>
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index 9cc0b7c7..83d00327 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-void SaveConfig (GtkWidget *widget, gpointer user_datal);
+void SaveConfig(GtkWidget *widget, gpointer user_datal);
 
 #define READBINARY "rb"
 #define WRITEBINARY "wb"
@@ -49,24 +49,18 @@ int set_limit (char *p, int len, int lower, int upper)
     return val;
 }
 
-void on_about_clicked (GtkWidget *widget, gpointer user_data)
+void on_about_clicked(GtkWidget *widget, gpointer user_data)
 {
 	gtk_widget_destroy (widget);
 	exit (0);
 }
 
-void on_config_clicked (GtkWidget *widget, gpointer user_data)
-{
-	gtk_widget_destroy (widget);
-	exit (0);
-}
-
-void set_widget_sensitive (GtkWidget *widget, gpointer user_data)
+void set_widget_sensitive(GtkWidget *widget, gpointer user_data)
 {
 	gtk_widget_set_sensitive (widget, (int)user_data);
 }
 
-void on_use_fixes_toggled (GtkWidget *widget, gpointer user_data)
+void on_use_fixes_toggled(GtkWidget *widget, gpointer user_data)
 {
 	GtkWidget *check, *table_fixes;
 	GladeXML *xml;
@@ -80,6 +74,14 @@ void on_use_fixes_toggled (GtkWidget *widget, gpointer user_data)
 		(void *)gtk_toggle_button_get_active (check));
 }
 
+void OnConfigClose(GtkWidget *widget, gpointer user_data)
+{
+	GladeXML *xml = (GladeXML *)user_data;
+
+	gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd"));
+	gtk_exit(0);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -118,7 +120,7 @@ main (int argc, char *argv[])
 		gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSX Video Plugin");
 		gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.17");
 		gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
-		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://home.t-online.de/home/PeteBernert/");
+		gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
 
 	g_signal_connect_data(GTK_OBJECT(widget), "response",
 			GTK_SIGNAL_FUNC(on_about_clicked), NULL, NULL, G_CONNECT_AFTER);
@@ -282,16 +284,12 @@ main (int argc, char *argv[])
   if(pB) free(pB);
 
 	widget = glade_xml_get_widget(xml, "CfgWnd");
-	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
-			GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
+	g_signal_connect_data(GTK_OBJECT(widget), "destroy",
+			GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, 0);
 
-	widget = glade_xml_get_widget(xml, "btn_cancel");
+	widget = glade_xml_get_widget(xml, "btn_close");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(on_config_clicked), NULL, NULL, G_CONNECT_AFTER);
-
-	widget = glade_xml_get_widget(xml, "btn_ok");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-			GTK_SIGNAL_FUNC(SaveConfig), xml, NULL, G_CONNECT_AFTER);
+			GTK_SIGNAL_FUNC(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
 
 	widget = glade_xml_get_widget(xml, "checkUseFixes");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
@@ -420,9 +418,6 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
 
  free(pB);
  
-    gtk_widget_destroy (glade_xml_get_widget (xml, "CfgWnd"));
-//    g_free (xml);
-
-	/* Close the window and exit control from the plugin */
-	exit (0); 
+	// Close the window and exit control from the plugin
+	gtk_exit (0); 
 }