-use named constants instead of -5

6 files changed, 15 insertions, 9 deletions

diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 1aad22f3..942ae563 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -140,7 +140,7 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
   struct GNUNET_CONTAINER_MetaData *meta;
   struct GNUNET_FS_BlockOptions bo;
 
-  if (-5 != response_id)
+  if (GTK_RESPONSE_OK != response_id)
   {
     gtk_widget_destroy (GTK_WIDGET (dialog));
     g_object_unref (G_OBJECT (builder));
diff --git a/src/fs/gnunet-fs-gtk_create-pseudonym.c b/src/fs/gnunet-fs-gtk_create-pseudonym.c
index 558fcb91..86e5abe9 100644
--- a/src/fs/gnunet-fs-gtk_create-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_create-pseudonym.c
@@ -31,7 +31,7 @@
  * User completed the 'create pseudonym' dialog.  Run the desired action.
  *
  * @param dialog the dialog
- * @param response_id '-5' on "OK"
+ * @param response_id GTK_RESPONSE_OK on "OK"
  * @param user_data the builder of the dialog
  */
 void
@@ -43,7 +43,7 @@ GNUNET_GTK_create_namespace_dialog_response_cb (GtkDialog * dialog,
   const char *name;
   struct GNUNET_FS_Namespace *ns;
 
-  if (response_id != -5)
+  if (GTK_RESPONSE_OK != response_id)
   {
     gtk_widget_destroy (GTK_WIDGET (dialog));
     g_object_unref (G_OBJECT (builder));
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index f020111c..96dd2f45 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -117,6 +117,10 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
   GtkToggleButton *cb;
 
   dc = dlc->dc;
+  fprintf (stderr,
+           "Response is %u, ok is %u\n",
+           dlc->response,
+           GTK_RESPONSE_OK);
   if (GTK_RESPONSE_OK != dlc->response)
   {
     save_as_dialog_free_download_context (dc);
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index b711ee90..95a6e280 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -238,6 +238,8 @@ get_suggested_filename_anonymity (GtkTreeModel *tm,
                       15, &local_filename, 
                       16, &downloaded_anonymity, 
                       -1);
+  if ( (NULL != local_filename) && (GNUNET_YES == top) )
+    *local_parents = GNUNET_YES;
   if ( (NULL == local_filename) && (GNUNET_NO == top) )
     *local_parents = GNUNET_NO;
   if ( (downloaded_anonymity != -1) && (*anonymity == -1) && (GNUNET_NO == top) )
@@ -369,7 +371,7 @@ start_download (GtkTreeView *tree_view,
   if (download_directory == NULL)
     download_directory = getcwd (cwd, sizeof (cwd));
   /* Calculate suggested filename */
-  local_parents = GNUNET_YES;
+  local_parents = GNUNET_NO;
   anonymity = -1;
   filename_is_absolute = GNUNET_NO;
   filename = get_suggested_filename_anonymity (tm, &iter, GNUNET_YES,
diff --git a/src/fs/gnunet-fs-gtk_open-directory.c b/src/fs/gnunet-fs-gtk_open-directory.c
index d73a5846..21247d2b 100644
--- a/src/fs/gnunet-fs-gtk_open-directory.c
+++ b/src/fs/gnunet-fs-gtk_open-directory.c
@@ -125,7 +125,7 @@ GNUNET_GTK_open_directory_dialog_response_cb (GtkDialog * dialog,
   char *filename;
   struct AddChildContext acc;
 
-  if (-5 != response_id)
+  if (GTK_RESPONSE_OK != response_id)
   {
     gtk_widget_destroy (GTK_WIDGET (dialog));
     g_object_unref (G_OBJECT (builder));
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index cd1f1262..074a1ad1 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -1256,7 +1256,7 @@ scan_file_or_directory (struct MainPublishingDialogContext *ctx,
  * Function called when the "open" (directory) dialog was closed.
  *
  * @param dialog the open dialog
- * @param response_id result of the dialog ("-5" means to "run")
+ * @param response_id result of the dialog (GTK_RESPONSE_OK means to "run")
  * @param user_data master publishing dialog context of our window
  */
 void
@@ -1266,7 +1266,7 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
 {
   struct MainPublishingDialogContext *ctx = user_data;
 
-  if (response_id == -5 /* OK */)
+  if (GTK_RESPONSE_OK == response_id)
   {
     char *filename;
     int do_index;
@@ -1317,7 +1317,7 @@ GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
  * Function called when the "open" (file) dialog was closed.
  *
  * @param dialog the open dialog
- * @param response_id result of the dialog ("-5" means to "run")
+ * @param response_id result of the dialog (GTK_RESPONSE_OK means to "run")
  * @param user_data master publishing dialog context of our window
  */
 void
@@ -1327,7 +1327,7 @@ GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
 {
   struct MainPublishingDialogContext *ctx = user_data;
 
-  if (response_id == -5 /* OK */)
+  if (GTK_RESPONSE_OK == response_id)
   {
     char *filename;
     struct GNUNET_FS_BlockOptions bo;