diff options
-rw-r--r-- | src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c | 17 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk-anonymity_spin_buttons.h | 19 | ||||
-rw-r--r-- | src/fs/gnunet-fs-gtk-main_window_file_publish.c | 5 |
3 files changed, 33 insertions, 8 deletions
diff --git a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c index 6c22aa7b..380daa09 100644 --- a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c +++ b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | (C) 2005, 2006, 2010 Christian Grothoff (and other contributing authors) | 3 | (C) 2005, 2006, 2010, 2012 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -119,6 +119,14 @@ GNUNET_GTK_get_selected_anonymity_combo_level (GtkComboBox *combo, guint *p_leve | |||
119 | } | 119 | } |
120 | 120 | ||
121 | 121 | ||
122 | /** | ||
123 | * Set the anonymity level displayed by a combo box. | ||
124 | * | ||
125 | * @param builder the builder of the combo box | ||
126 | * @param combo_name name of the combo box | ||
127 | * @param sel_level desired anonymity level | ||
128 | * @return TRUE on success, FALSE on failure | ||
129 | */ | ||
122 | gboolean | 130 | gboolean |
123 | GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name, | 131 | GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name, |
124 | guint sel_level) | 132 | guint sel_level) |
@@ -132,6 +140,13 @@ GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name, | |||
132 | } | 140 | } |
133 | 141 | ||
134 | 142 | ||
143 | /** | ||
144 | * Set the anonymity level displayed by a combo box. | ||
145 | * | ||
146 | * @param combo the combo box | ||
147 | * @param sel_level desired anonymity level | ||
148 | * @return TRUE on success, FALSE on failure | ||
149 | */ | ||
135 | gboolean | 150 | gboolean |
136 | GNUNET_GTK_select_anonymity_combo_level (GtkComboBox *combo, guint sel_level) | 151 | GNUNET_GTK_select_anonymity_combo_level (GtkComboBox *combo, guint sel_level) |
137 | { | 152 | { |
diff --git a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.h b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.h index 7847904a..ee8e30f0 100644 --- a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.h +++ b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | (C) 2005, 2006, 2010 Christian Grothoff (and other contributing authors) | 3 | (C) 2005, 2006, 2010, 2012 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
@@ -54,11 +54,26 @@ gboolean | |||
54 | GNUNET_GTK_get_selected_anonymity_combo_level (GtkComboBox *combo, guint *p_level); | 54 | GNUNET_GTK_get_selected_anonymity_combo_level (GtkComboBox *combo, guint *p_level); |
55 | 55 | ||
56 | 56 | ||
57 | 57 | /** | |
58 | * Set the anonymity level displayed by a combo box. | ||
59 | * | ||
60 | * @param builder the builder of the combo box | ||
61 | * @param combo_name name of the combo box | ||
62 | * @param sel_level desired anonymity level | ||
63 | * @return TRUE on success, FALSE on failure | ||
64 | */ | ||
58 | gboolean | 65 | gboolean |
59 | GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name, | 66 | GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name, |
60 | guint sel_level); | 67 | guint sel_level); |
61 | 68 | ||
69 | |||
70 | /** | ||
71 | * Set the anonymity level displayed by a combo box. | ||
72 | * | ||
73 | * @param combo the combo box | ||
74 | * @param sel_level desired anonymity level | ||
75 | * @return TRUE on success, FALSE on failure | ||
76 | */ | ||
62 | gboolean | 77 | gboolean |
63 | GNUNET_GTK_select_anonymity_combo_level (GtkComboBox *combo, guint sel_level); | 78 | GNUNET_GTK_select_anonymity_combo_level (GtkComboBox *combo, guint sel_level); |
64 | 79 | ||
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c index 387736b6..2e71ec13 100644 --- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c +++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c | |||
@@ -1091,7 +1091,6 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy, | |||
1091 | struct GNUNET_FS_FileInformation *fip; | 1091 | struct GNUNET_FS_FileInformation *fip; |
1092 | guint64 abs_etime; | 1092 | guint64 abs_etime; |
1093 | guint replication_level; | 1093 | guint replication_level; |
1094 | struct GNUNET_FS_BlockOptions bo; | ||
1095 | GtkListStore *anon_liststore; | 1094 | GtkListStore *anon_liststore; |
1096 | 1095 | ||
1097 | anon_liststore = GTK_LIST_STORE (gtk_builder_get_object (ctx->main_window_builder, "main_window_search_anonymity_liststore")); | 1096 | anon_liststore = GTK_LIST_STORE (gtk_builder_get_object (ctx->main_window_builder, "main_window_search_anonymity_liststore")); |
@@ -1114,10 +1113,6 @@ GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb (GtkWidget * dummy, | |||
1114 | 6, &abs_etime, | 1113 | 6, &abs_etime, |
1115 | 7, &replication_level, | 1114 | 7, &replication_level, |
1116 | -1); | 1115 | -1); |
1117 | bo.anonymity_level = anonymity_level; | ||
1118 | bo.content_priority = priority; | ||
1119 | bo.expiration_time.abs_value = (uint64_t) abs_etime; | ||
1120 | bo.replication_level = replication_level; | ||
1121 | /* FIXME: can we just give our anon_liststore out like this? What about | 1116 | /* FIXME: can we just give our anon_liststore out like this? What about |
1122 | (unintended) sharing of state? */ | 1117 | (unintended) sharing of state? */ |
1123 | GNUNET_FS_GTK_edit_publish_dialog (ctx->master_pubdialog, | 1118 | GNUNET_FS_GTK_edit_publish_dialog (ctx->master_pubdialog, |