5 files changed, 14 insertions, 12 deletions

diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 2af42833..1aad22f3 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -199,7 +199,7 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
  * @param widget the dialog
  * @param event the destroying event
  * @param user_data the builder of the dialog
- * @return TRUE (allow destruction)
+ * @return FALSE (allow destruction)
  */
 gboolean
 GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
@@ -210,7 +210,6 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
   GtkTreeModel *tm;
   GtkTreeIter iter;
   
-  fprintf (stderr, "DELETE!\n");
   tm = GTK_TREE_MODEL (gtk_builder_get_object (builder,
                                                "GNUNET_GTK_select_pseudonym_liststore"));
   if (gtk_tree_model_get_iter_first (tm, &iter))
@@ -225,7 +224,7 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
     while (gtk_tree_model_iter_next (tm, &iter));
   }
   g_object_unref (G_OBJECT (builder));
-  return TRUE;
+  return FALSE;
 }
 
 
@@ -314,7 +313,7 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
                             &add_to_list, 
                             ls);
 
-  /* FIXME-UNCLEAN: this signal can be connected by (modern) Glade automatically */
+  /* FIXME-GTK3: this signal can be connected by (modern) Glade automatically */
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
   sel = gtk_tree_view_get_selection (tv);
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index 170f1bc9..1cd45e8d 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -84,7 +84,7 @@ save_as_dialog_free_download_context (struct DownloadContext *dc)
  * @param widget the dialog object
  * @param event the deletion event
  * @param user_data the 'structDownloadAsDialogContext' of the dialog
- * @return always FALSE
+ * @return always FALSE (destroy the window)
  */
 gboolean
 GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
@@ -106,6 +106,7 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
     GNUNET_free (dlc);
     return FALSE;
   }
+  /* FIXME-UGLY: this code should be in the 'save_as_dialog_response_cb' instead */
   GNUNET_free_non_null (dc->filename);
   dc->filename =
       GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dlc->dialog));
@@ -143,6 +144,8 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
   dlc->response = response_id;
   /* dialogs don't get delete-event the way normal windows do,
      call the handler manually */
+  /* FIXME-UGLY: this is a bit ugly; instead, move the code
+     to close the dialog nicely into here! */
   GNUNET_GTK_save_as_dialog_delete_event_cb (GTK_WIDGET (dialog), NULL,
                                              user_data);
   gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/src/fs/gnunet-fs-gtk_open-uri.c b/src/fs/gnunet-fs-gtk_open-uri.c
index 1b146c9f..90235c76 100644
--- a/src/fs/gnunet-fs-gtk_open-uri.c
+++ b/src/fs/gnunet-fs-gtk_open-uri.c
@@ -138,7 +138,7 @@ GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton * button,
  * @param widget the window
  * @param event the deletion event
  * @param user_data the 'GtkBuilder' of the URI dialog
- * @return TRUE (allow destruction)
+ * @return FALSE (allow destruction)
  */
 gboolean
 GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget * widget,
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index c57ab9d8..4f33fc62 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -904,7 +904,7 @@ GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb (GtkButton *button,
  * @param widget the widget emitting the event
  * @param event the event
  * @param user_data progress dialog context of our window
- * @return FALSE to refuse to close
+ * @return TRUE to refuse to close
  */
 gboolean
 GNUNET_FS_GTK_progress_dialog_delete_event_cb (GtkWidget *widget,
@@ -912,7 +912,7 @@ GNUNET_FS_GTK_progress_dialog_delete_event_cb (GtkWidget *widget,
                                                void *cls)
 {
   /* Don't allow GTK to kill the window, until the scan is finished */
-  return FALSE;
+  return TRUE;
 }
 
 
@@ -1982,7 +1982,7 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer user_
   ctx->pseudonym_selection = gtk_tree_view_get_selection (pseudonym_treeview);
   ctx->pseudonym_treemodel = gtk_tree_view_get_model (pseudonym_treeview);
 
-  /* connect signals; FIXME-UNCLEAN: these could be connected with (modern) Glade */
+  /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade */
   g_signal_connect (G_OBJECT (ctx->file_info_selection), "changed",
                     G_CALLBACK (selection_changed_cb), ctx);
   g_signal_connect (G_OBJECT (ctx->pseudonym_selection), "changed",
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 0951b316..6d9a641c 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -253,7 +253,7 @@ GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox * widget,
  * @param ts the tree selection object
  * @param user_data the 'struct EditPublicationDialogContext'
  */
-/* FIXME-UNCLEAN: connect this signal via glade (modern versions of Glade support this) */
+/* FIXME-GTK3: connect this signal via glade (modern versions of Glade support this) */
 static void
 metadata_selection_changed_cb (GtkTreeSelection *ts,
                                gpointer user_data)
@@ -502,7 +502,7 @@ GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (Gt
  * @param ts the tree selection object
  * @param user_data the 'struct EditPublicationDialogContext'
  */
-/* FIXME-UNCLEAN: connect this signal via glade (modern versions of Glade support this) */
+/* FIXME-GTK3: connect this signal via glade (modern versions of Glade support this) */
 static void
 keywords_selection_changed_cb (GtkTreeSelection *ts,
                                gpointer user_data)
@@ -1152,7 +1152,7 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
   gtk_widget_set_visible (GTK_WIDGET (root_label),
                           is_namespace_edit ? TRUE : FALSE);
 
-  /* FIXME-UNCLEAN: these signal handlers can be set by (modern) versions of Glade */
+  /* FIXME-GTK3: these signal handlers can be set by (modern) versions of Glade */
   keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview);
   g_signal_connect (G_OBJECT (keywords_selection), "changed",
                     G_CALLBACK (keywords_selection_changed_cb), ctx);