[chronojump] Encoder: Fixed windows opened without content

[Xavier de Blas <xaviblas src gnome org>]

commit 572282cb0d2e5d5c26602b7e86c38ca798f350c7
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Feb 19 14:55:29 2013 +0100

    Encoder: Fixed windows opened without content

 src/gui/encoder.cs       |    3 +--
 src/gui/genericWindow.cs |   17 ++++-------------
 2 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index db3786a..3025c53 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -387,7 +387,6 @@ public partial class ChronoJumpWindow
                //genericWin.DestroyOnAccept=true;
                //here is comented because we are going to read the checkboxes
 
-               genericWin.SetButtonAcceptLabel(Catalog.GetString("Close"));
                genericWin.ShowNow();
        }
        
@@ -452,6 +451,7 @@ public partial class ChronoJumpWindow
                                        currentPerson.Name), Constants.GenericWindowShow.TREEVIEW);
 
                genericWin.SetTreeview(columnsString, false, dataPrint);
+               genericWin.ShowButtonCancel(true);
                genericWin.SetButtonAcceptLabel(Catalog.GetString("Load"));
                genericWin.SetButtonAcceptSensitive(false);
                genericWin.Button_accept.Clicked += new EventHandler(on_encoder_load_signal_accepted);
@@ -1279,7 +1279,6 @@ public partial class ChronoJumpWindow
                genericWin.LabelEntry2 = Catalog.GetString("Resistance");
                genericWin.LabelEntry3 = Catalog.GetString("Description");
                genericWin.ShowButtonCancel(false);
-               genericWin.SetButtonAcceptLabel(Catalog.GetString("Close"));
                genericWin.ShowNow();
        }
 
diff --git a/src/gui/genericWindow.cs b/src/gui/genericWindow.cs
index e40dd50..a450220 100644
--- a/src/gui/genericWindow.cs
+++ b/src/gui/genericWindow.cs
@@ -74,11 +74,6 @@ public class GenericWindow
        //and we want to ensure next window will be created at needed size
        public bool DestroyOnAccept;
        
-       //if someone use delete_event should be considered as an accept?
-       //useful when there's only a close button and after some stuff is processed, 
-       //but user clicked on delete_event instead of close button
-       public bool DeleteMeansAccept = false;
-
        public GenericWindow ()
        {
                Glade.XML gladeXML;
@@ -106,7 +101,6 @@ public class GenericWindow
                if(showNow)
                        GenericWindowBox.generic_window.Show ();
                GenericWindowBox.HideOnAccept = true;
-               GenericWindowBox.DeleteMeansAccept = true;
                GenericWindowBox.DestroyOnAccept = false;
                
                return GenericWindowBox;
@@ -450,13 +444,10 @@ public class GenericWindow
        
        protected void on_delete_event (object o, DeleteEventArgs args)
        {
-               if(DeleteMeansAccept) {
-                       button_accept.Click();
-               }
-               else {
-                       GenericWindowBox.generic_window.Hide();
-                       GenericWindowBox = null;
-               }
+               args.RetVal = true;
+                       
+               GenericWindowBox.generic_window.Hide();
+               GenericWindowBox = null;
        }
 
        protected void on_button_accept_clicked (object o, EventArgs args)