From b7e261606bffd87c8bcc81a76cf09b276eca7ec1 Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Mon, 28 Dec 2009 09:04:21 +0000
Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@39695
 e17a0e51-4ae3-4d35-97c3-1a29b211df97

---
 plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 | 21 ++-------------------
 plugins/dfcdrom/cdrcfg-0.1df/main.c         | 11 +----------
 2 files changed, 3 insertions(+), 29 deletions(-)

(limited to 'plugins/dfcdrom')

diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
index 02164f0c..25610e2e 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
+++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
@@ -295,8 +295,8 @@ Threaded - Faster (With Cache)</property>
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <widget class="GtkButton" id="cfg_cancelbutton">
-                <property name="label">gtk-cancel</property>
+              <widget class="GtkButton" id="cfg_closebutton">
+                <property name="label">gtk-close</property>
                 <property name="response_id">-6</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -311,23 +311,6 @@ Threaded - Faster (With Cache)</property>
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkButton" id="cfg_okbutton">
-                <property name="label">gtk-ok</property>
-                <property name="response_id">-5</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_cfg_okbutton_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
           </widget>
           <packing>
             <property name="expand">False</property>
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index 9eac7ef4..55172d20 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -125,11 +125,6 @@ void fill_drives_list(GtkWidget *widget) {
 }
 
 static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
-	gtk_widget_destroy(widget);
-	gtk_exit(0);
-}
-
-static void OnConfigOk(GtkWidget *widget, gpointer user_data) {
 	GladeXML *xml;
 
 	xml = glade_get_widget_tree(MainWindow);
@@ -178,14 +173,10 @@ long CDRconfigure() {
 	g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
 		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "cfg_cancelbutton");
+	widget = glade_xml_get_widget(xml, "cfg_closebutton");
 	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
 		GTK_SIGNAL_FUNC(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
 
-	widget = glade_xml_get_widget(xml, "cfg_okbutton");
-	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
-		GTK_SIGNAL_FUNC(OnConfigOk), xml, NULL, G_CONNECT_AFTER);
-
 	widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
 	fill_drives_list(widget);
 	gtk_entry_set_text(GTK_ENTRY(GTK_BIN(widget)->child), CdromDev);
-- 
cgit v1.2.3