[gnac] Fixed a bug preventing the properties window from being correctly displayed after having been hidden

[Benoît Dupasquier <bdupasqu src gnome org>]

commit b21a4ae917d29a441e40052d286f7b195a3ab131
Author: Benoît Dupasquier <bdupasqu src gnome org>
Date:   Tue May 4 23:11:39 2010 +0100

    Fixed a bug preventing the properties window from being correctly displayed after having been hidden

 data/ui/gnac-properties-window.xml |    5 +----
 src/gnac-properties.c              |   11 +++++++++++
 src/gnac-properties.h              |    5 +++++
 3 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/data/ui/gnac-properties-window.xml b/data/ui/gnac-properties-window.xml
index 43371e7..337e583 100644
--- a/data/ui/gnac-properties-window.xml
+++ b/data/ui/gnac-properties-window.xml
@@ -18,8 +18,7 @@
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
     <property name="skip_taskbar_hint">True</property>
-    <signal name="delete_event" handler="gnac_on_close_properties"/>
-    <signal name="destroy_event" handler="gnac_on_close_properties"/>
+    <signal name="delete_event" handler="gnac_properties_on_delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -34,8 +33,6 @@
                 <property name="visible">True</property>
                 <property name="border_width">6</property>
                 <property name="spacing">6</property>
-                <signal name="delete_event" handler="gnac_on_close_properties"/>
-                <signal name="destroy_event" handler="gnac_on_close_properties"/>
                 <child>
                   <object class="GtkVBox" id="vbox4">
                     <property name="visible">True</property>
diff --git a/src/gnac-properties.c b/src/gnac-properties.c
index 562a576..b85044f 100644
--- a/src/gnac-properties.c
+++ b/src/gnac-properties.c
@@ -637,6 +637,17 @@ gnac_on_close_properties(GtkWidget *widget,
 }
 
 
+gboolean
+gnac_properties_on_delete_event(GtkWidget *widget,
+                                GdkEvent  *event,
+                                gpointer   data)
+{
+  gnac_on_close_properties(widget, data);
+  /* do not send the "destroy" signal */
+  return TRUE;
+}
+
+
 void
 gnac_properties_destroy(void)
 {
diff --git a/src/gnac-properties.h b/src/gnac-properties.h
index 86c0da0..a1bcf43 100644
--- a/src/gnac-properties.h
+++ b/src/gnac-properties.h
@@ -76,6 +76,11 @@ void
 gnac_on_close_properties(GtkWidget *widget, 
                          gpointer   data);
 
+gboolean
+gnac_properties_on_delete_event(GtkWidget *widget,
+                                GdkEvent  *event,
+                                gpointer   data);
+
 void
 gnac_properties_destroy(void);