-LRN: delete handlers for dialogs

4 files changed, 46 insertions, 10 deletions

diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index 69420841..9ce0bd95 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -23,6 +23,7 @@
     <property name="deletable">False</property>
     <property name="transient_for">GNUNET_GTK_main_window</property>
     <signal name="realize" handler="GNUNET_GTK_edit_publication_window_realize_cb" swapped="no"/>
+    <signal name="delete-event" handler="GNUNET_GTK_edit_publication_window_delete_event_cb" swapped="no"/>
     <child>
       <object class="GtkVBox" id="GNUNET_GTK_edit_publication_master_vbox">
         <property name="visible">True</property>
@@ -1905,6 +1906,7 @@
     <property name="skip_pager_hint">True</property>
     <property name="deletable">False</property>
     <property name="transient_for">GNUNET_GTK_main_window</property>
+    <signal name="delete-event" handler="GNUNET_GTK_open_url_window_delete_event_cb" swapped="no"/>
     <child>
       <object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
         <property name="visible">True</property>
@@ -2663,16 +2665,6 @@
       <column type="gpointer"/>
     </columns>
   </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -2683,6 +2675,7 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
     <signal name="realize" handler="GNUNET_GTK_select_pseudonym_dialog_realize_cb" swapped="no"/>
+    <signal name="delete-event" handler="GNUNET_GTK_select_pseudonym_dialog_delete_event_cb" swapped="no"/>
     <signal name="response" handler="GNUNET_GTK_select_pseudonym_dialog_response_cb" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
@@ -2802,6 +2795,16 @@
     <property name="page_increment">10</property>
     <property name="page_size">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkAdjustment" id="adjustment5">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index 80336aed..9106cde1 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -902,6 +902,20 @@ GNUNET_GTK_edit_publication_confirm_button_clicked_cb (GtkButton *button, gpoint
   gtk_widget_hide (GTK_WIDGET (pubwindow));
 }
 
+gboolean
+GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget *widget,
+    GdkEvent *event, gpointer user_data)
+{
+  GtkBuilder *builder;
+  GtkButton *button;
+  builder = GTK_BUILDER (user_data);
+
+  button = GTK_BUTTON (gtk_builder_get_object (builder,
+      "GNUNET_GTK_edit_publication_cancel_button"));
+
+  GNUNET_GTK_edit_publication_cancel_button_clicked_cb (button, user_data);
+  return TRUE;
+}
 
 /**
  * Add each of the keywords to the keyword list store.
diff --git a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
index 77ae7353..b15060ba 100644
--- a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
@@ -26,6 +26,14 @@
 #include "gnunet-fs-gtk.h"
 #include "gnunet-fs-gtk-edit_publish_dialog.h"
 
+gboolean
+GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
+    GdkEvent *event, gpointer user_Data)
+{
+  gtk_widget_hide (widget);
+  return TRUE;
+}
+
 /**
  * Callback with information about local (!) namespaces.
  * Contains the names of the local namespace and the global
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_download.c b/src/fs/gnunet-fs-gtk-main_window_file_download.c
index 4f79329f..cc3b7f8f 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_download.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_download.c
@@ -126,6 +126,17 @@ GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton *button,
   return;
 }
 
+gboolean
+GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget *widget,
+    GdkEvent *event, gpointer user_data)
+{
+  GtkBuilder *builder;
+  builder = GTK_BUILDER (user_data);
+
+  gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "GNUNET_GTK_open_url_window")));
+  return TRUE;
+}
+
 #ifndef GDK_KEY_Return
 #define GDK_KEY_Return GDK_Return
 #endif