diff options
Diffstat (limited to 'src/setup/gnunet-setup-gns-edit.c')
-rw-r--r-- | src/setup/gnunet-setup-gns-edit.c | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/src/setup/gnunet-setup-gns-edit.c b/src/setup/gnunet-setup-gns-edit.c index eb7f821b..d79f650f 100644 --- a/src/setup/gnunet-setup-gns-edit.c +++ b/src/setup/gnunet-setup-gns-edit.c | |||
@@ -35,9 +35,9 @@ enum ZoneListColumn | |||
35 | * A gchararray with the name of the zone for users. | 35 | * A gchararray with the name of the zone for users. |
36 | */ | 36 | */ |
37 | ZONELIST_COL_NAME = 0, | 37 | ZONELIST_COL_NAME = 0, |
38 | 38 | ||
39 | /** | 39 | /** |
40 | * A gchararray with the name of the configuration file option with | 40 | * A gchararray with the name of the configuration file option with |
41 | * the zone key. | 41 | * the zone key. |
42 | */ | 42 | */ |
43 | ZONELIST_COL_OPTION = 1 | 43 | ZONELIST_COL_OPTION = 1 |
@@ -51,7 +51,7 @@ enum ZoneListColumn | |||
51 | */ | 51 | */ |
52 | static void | 52 | static void |
53 | edit_dialog_disable_save (struct EditDialogContext *edc) | 53 | edit_dialog_disable_save (struct EditDialogContext *edc) |
54 | { | 54 | { |
55 | gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder, | 55 | gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder, |
56 | "edit_dialog_save_button")), | 56 | "edit_dialog_save_button")), |
57 | FALSE); | 57 | FALSE); |
@@ -65,7 +65,7 @@ edit_dialog_disable_save (struct EditDialogContext *edc) | |||
65 | */ | 65 | */ |
66 | static void | 66 | static void |
67 | edit_dialog_enable_save (struct EditDialogContext *edc) | 67 | edit_dialog_enable_save (struct EditDialogContext *edc) |
68 | { | 68 | { |
69 | gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder, | 69 | gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder, |
70 | "edit_dialog_save_button")), | 70 | "edit_dialog_save_button")), |
71 | TRUE); | 71 | TRUE); |
@@ -111,9 +111,9 @@ GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb (GtkToggleButton *but | |||
111 | { | 111 | { |
112 | struct EditDialogContext *edc = user_data; | 112 | struct EditDialogContext *edc = user_data; |
113 | 113 | ||
114 | if (gtk_toggle_button_get_active (button)) | 114 | if (gtk_toggle_button_get_active (button)) |
115 | gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (edc->builder, | 115 | gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (edc->builder, |
116 | "edit_dialog_expiration_relative_combobox"))); | 116 | "edit_dialog_expiration_relative_combobox"))); |
117 | else | 117 | else |
118 | gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder, | 118 | gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder, |
119 | "edit_dialog_expiration_relative_combobox"))); | 119 | "edit_dialog_expiration_relative_combobox"))); |
@@ -146,7 +146,7 @@ GNS_edit_dialog_expiration_absolute_radiobutton_toggled_cb (GtkToggleButton *but | |||
146 | { | 146 | { |
147 | struct EditDialogContext *edc = user_data; | 147 | struct EditDialogContext *edc = user_data; |
148 | 148 | ||
149 | if (gtk_toggle_button_get_active (button)) | 149 | if (gtk_toggle_button_get_active (button)) |
150 | { | 150 | { |
151 | gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (edc->builder, | 151 | gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (edc->builder, |
152 | "edit_dialog_expiration_absolute_calendar"))); | 152 | "edit_dialog_expiration_absolute_calendar"))); |
@@ -235,14 +235,14 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc) | |||
235 | -1 /* position: append */, | 235 | -1 /* position: append */, |
236 | 0, GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_NO), | 236 | 0, GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_NO), |
237 | -1); | 237 | -1); |
238 | gtk_combo_box_set_active_iter (cb, &iter); | 238 | gtk_combo_box_set_active_iter (cb, &iter); |
239 | if ( (! edc->n_is_relative) && | 239 | if ( (! edc->n_is_relative) && |
240 | (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != edc->n_exp_time) ) | 240 | (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != edc->n_exp_time) ) |
241 | { | 241 | { |
242 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 242 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
243 | "edit_dialog_expiration_absolute_radiobutton")), | 243 | "edit_dialog_expiration_absolute_radiobutton")), |
244 | TRUE); | 244 | TRUE); |
245 | 245 | ||
246 | gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder, | 246 | gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder, |
247 | "edit_dialog_expiration_relative_combobox"))); | 247 | "edit_dialog_expiration_relative_combobox"))); |
248 | at.abs_value_us = edc->n_exp_time; | 248 | at.abs_value_us = edc->n_exp_time; |
@@ -258,7 +258,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc) | |||
258 | "edit_dialog_expiration_absolute_calendar")); | 258 | "edit_dialog_expiration_absolute_calendar")); |
259 | gtk_calendar_select_month (cal, | 259 | gtk_calendar_select_month (cal, |
260 | ymd->tm_mon, | 260 | ymd->tm_mon, |
261 | ymd->tm_year + 1900); | 261 | ymd->tm_year + 1900); |
262 | gtk_calendar_mark_day (cal, | 262 | gtk_calendar_mark_day (cal, |
263 | ymd->tm_mday); | 263 | ymd->tm_mday); |
264 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder, | 264 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder, |
@@ -289,7 +289,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc) | |||
289 | break; | 289 | break; |
290 | g_free (opt); | 290 | g_free (opt); |
291 | opt = NULL; | 291 | opt = NULL; |
292 | } while (gtk_tree_model_iter_next (tm, &iter)); | 292 | } while (gtk_tree_model_iter_next (tm, &iter)); |
293 | } | 293 | } |
294 | if (NULL != opt) | 294 | if (NULL != opt) |
295 | { | 295 | { |
@@ -302,7 +302,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc) | |||
302 | /** | 302 | /** |
303 | * Perform the reverse of the 'edit_dialog_setup_common_elements' function, | 303 | * Perform the reverse of the 'edit_dialog_setup_common_elements' function, |
304 | * that is, extract the values from the (common) widgets and store the | 304 | * that is, extract the values from the (common) widgets and store the |
305 | * values in 'edc'. | 305 | * values in 'edc'. |
306 | * | 306 | * |
307 | * @param edc edit dialog to extract data from | 307 | * @param edc edit dialog to extract data from |
308 | */ | 308 | */ |
@@ -313,7 +313,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc) | |||
313 | struct GNUNET_TIME_Relative rt; | 313 | struct GNUNET_TIME_Relative rt; |
314 | GtkComboBox *cb; | 314 | GtkComboBox *cb; |
315 | GtkTreeModel *tm; | 315 | GtkTreeModel *tm; |
316 | GtkTreeIter iter; | 316 | GtkTreeIter iter; |
317 | gchar *opt; | 317 | gchar *opt; |
318 | 318 | ||
319 | /* is public flag */ | 319 | /* is public flag */ |
@@ -322,7 +322,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc) | |||
322 | /* is shadow flag */ | 322 | /* is shadow flag */ |
323 | edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 323 | edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
324 | "edit_dialog_options_shadow_checkbutton"))); | 324 | "edit_dialog_options_shadow_checkbutton"))); |
325 | 325 | ||
326 | /* 'forever' expiration time */ | 326 | /* 'forever' expiration time */ |
327 | if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 327 | if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
328 | "edit_dialog_expiration_never_radiobutton")))) | 328 | "edit_dialog_expiration_never_radiobutton")))) |
@@ -330,7 +330,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc) | |||
330 | edc->n_exp_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us; | 330 | edc->n_exp_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us; |
331 | edc->n_is_relative = TRUE; /* doesn't matter, but make sure it is well-defined anyway */ | 331 | edc->n_is_relative = TRUE; /* doesn't matter, but make sure it is well-defined anyway */ |
332 | } | 332 | } |
333 | 333 | ||
334 | /* 'relative' expiration time */ | 334 | /* 'relative' expiration time */ |
335 | if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 335 | if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
336 | "edit_dialog_expiration_relative_radiobutton")))) | 336 | "edit_dialog_expiration_relative_radiobutton")))) |
@@ -343,7 +343,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc) | |||
343 | GNUNET_break (0); | 343 | GNUNET_break (0); |
344 | return; | 344 | return; |
345 | } | 345 | } |
346 | gtk_tree_model_get (tm, &iter, | 346 | gtk_tree_model_get (tm, &iter, |
347 | 0, &rt_s, | 347 | 0, &rt_s, |
348 | -1); | 348 | -1); |
349 | GNUNET_break (GNUNET_YES == | 349 | GNUNET_break (GNUNET_YES == |
@@ -365,7 +365,7 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc) | |||
365 | guint second; | 365 | guint second; |
366 | char fancydate[128]; | 366 | char fancydate[128]; |
367 | struct GNUNET_TIME_Absolute atime; | 367 | struct GNUNET_TIME_Absolute atime; |
368 | 368 | ||
369 | gtk_calendar_get_date (GTK_CALENDAR (gtk_builder_get_object (edc->builder, | 369 | gtk_calendar_get_date (GTK_CALENDAR (gtk_builder_get_object (edc->builder, |
370 | "edit_dialog_expiration_absolute_calendar")), | 370 | "edit_dialog_expiration_absolute_calendar")), |
371 | &year, &month, &day); | 371 | &year, &month, &day); |
@@ -378,8 +378,8 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc) | |||
378 | GNUNET_snprintf (fancydate, | 378 | GNUNET_snprintf (fancydate, |
379 | sizeof (fancydate), | 379 | sizeof (fancydate), |
380 | "%u-%u-%u %u:%u:%u", | 380 | "%u-%u-%u %u:%u:%u", |
381 | (unsigned int) year, | 381 | (unsigned int) year, |
382 | (unsigned int) month + 1, | 382 | (unsigned int) month + 1, |
383 | (unsigned int) day, | 383 | (unsigned int) day, |
384 | (unsigned int) hour, | 384 | (unsigned int) hour, |
385 | (unsigned int) minute, | 385 | (unsigned int) minute, |
@@ -476,7 +476,7 @@ GNS_edit_a_dialog_response_cb (GtkDialog *dialog, | |||
476 | struct EditDialogContext *edc = user_data; | 476 | struct EditDialogContext *edc = user_data; |
477 | GtkEntry *entry; | 477 | GtkEntry *entry; |
478 | const gchar *value; | 478 | const gchar *value; |
479 | 479 | ||
480 | if (GTK_RESPONSE_OK == response_id) | 480 | if (GTK_RESPONSE_OK == response_id) |
481 | { | 481 | { |
482 | edit_dialog_putes_common_elements (edc); | 482 | edit_dialog_putes_common_elements (edc); |
@@ -524,7 +524,7 @@ GNS_edit_dialog_a (struct EditDialogContext *edc) | |||
524 | { | 524 | { |
525 | GNUNET_break (0); | 525 | GNUNET_break (0); |
526 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 526 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
527 | return; | 527 | return; |
528 | } | 528 | } |
529 | if (GNUNET_YES == | 529 | if (GNUNET_YES == |
530 | edc->old_record_in_namestore) | 530 | edc->old_record_in_namestore) |
@@ -585,7 +585,7 @@ GNS_edit_aaaa_dialog_response_cb (GtkDialog *dialog, | |||
585 | struct EditDialogContext *edc = user_data; | 585 | struct EditDialogContext *edc = user_data; |
586 | GtkEntry *entry; | 586 | GtkEntry *entry; |
587 | const gchar *value; | 587 | const gchar *value; |
588 | 588 | ||
589 | if (GTK_RESPONSE_OK == response_id) | 589 | if (GTK_RESPONSE_OK == response_id) |
590 | { | 590 | { |
591 | edit_dialog_putes_common_elements (edc); | 591 | edit_dialog_putes_common_elements (edc); |
@@ -633,7 +633,7 @@ GNS_edit_dialog_aaaa (struct EditDialogContext *edc) | |||
633 | { | 633 | { |
634 | GNUNET_break (0); | 634 | GNUNET_break (0); |
635 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 635 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
636 | return; | 636 | return; |
637 | } | 637 | } |
638 | if (GNUNET_YES == | 638 | if (GNUNET_YES == |
639 | edc->old_record_in_namestore) | 639 | edc->old_record_in_namestore) |
@@ -693,7 +693,7 @@ GNS_edit_cname_dialog_response_cb (GtkDialog *dialog, | |||
693 | struct EditDialogContext *edc = user_data; | 693 | struct EditDialogContext *edc = user_data; |
694 | GtkEntry *entry; | 694 | GtkEntry *entry; |
695 | const gchar *value; | 695 | const gchar *value; |
696 | 696 | ||
697 | if (GTK_RESPONSE_OK == response_id) | 697 | if (GTK_RESPONSE_OK == response_id) |
698 | { | 698 | { |
699 | edit_dialog_putes_common_elements (edc); | 699 | edit_dialog_putes_common_elements (edc); |
@@ -741,7 +741,7 @@ GNS_edit_dialog_cname (struct EditDialogContext *edc) | |||
741 | { | 741 | { |
742 | GNUNET_break (0); | 742 | GNUNET_break (0); |
743 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 743 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
744 | return; | 744 | return; |
745 | } | 745 | } |
746 | if (GNUNET_YES == | 746 | if (GNUNET_YES == |
747 | edc->old_record_in_namestore) | 747 | edc->old_record_in_namestore) |
@@ -801,7 +801,7 @@ GNS_edit_leho_dialog_response_cb (GtkDialog *dialog, | |||
801 | struct EditDialogContext *edc = user_data; | 801 | struct EditDialogContext *edc = user_data; |
802 | GtkEntry *entry; | 802 | GtkEntry *entry; |
803 | const gchar *value; | 803 | const gchar *value; |
804 | 804 | ||
805 | if (GTK_RESPONSE_OK == response_id) | 805 | if (GTK_RESPONSE_OK == response_id) |
806 | { | 806 | { |
807 | edit_dialog_putes_common_elements (edc); | 807 | edit_dialog_putes_common_elements (edc); |
@@ -849,7 +849,7 @@ GNS_edit_dialog_leho (struct EditDialogContext *edc) | |||
849 | { | 849 | { |
850 | GNUNET_break (0); | 850 | GNUNET_break (0); |
851 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 851 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
852 | return; | 852 | return; |
853 | } | 853 | } |
854 | if (GNUNET_YES == | 854 | if (GNUNET_YES == |
855 | edc->old_record_in_namestore) | 855 | edc->old_record_in_namestore) |
@@ -911,7 +911,7 @@ GNS_edit_mx_dialog_response_cb (GtkDialog *dialog, | |||
911 | const gchar *value; | 911 | const gchar *value; |
912 | char *result; | 912 | char *result; |
913 | unsigned int distance; | 913 | unsigned int distance; |
914 | 914 | ||
915 | if (GTK_RESPONSE_OK == response_id) | 915 | if (GTK_RESPONSE_OK == response_id) |
916 | { | 916 | { |
917 | edit_dialog_putes_common_elements (edc); | 917 | edit_dialog_putes_common_elements (edc); |
@@ -922,8 +922,8 @@ GNS_edit_mx_dialog_response_cb (GtkDialog *dialog, | |||
922 | "edit_dialog_mx_distance_spinbutton"))); | 922 | "edit_dialog_mx_distance_spinbutton"))); |
923 | g_free (edc->n_value); | 923 | g_free (edc->n_value); |
924 | GNUNET_asprintf (&result, | 924 | GNUNET_asprintf (&result, |
925 | "%hu,%s", | 925 | "%hu,%s", |
926 | distance, | 926 | distance, |
927 | value); | 927 | value); |
928 | edc->n_value = g_strdup (result); | 928 | edc->n_value = g_strdup (result); |
929 | GNUNET_free (result); | 929 | GNUNET_free (result); |
@@ -969,12 +969,12 @@ GNS_edit_dialog_mx (struct EditDialogContext *edc) | |||
969 | { | 969 | { |
970 | GNUNET_break (0); | 970 | GNUNET_break (0); |
971 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 971 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
972 | return; | 972 | return; |
973 | } | 973 | } |
974 | if (GNUNET_YES == | 974 | if (GNUNET_YES == |
975 | edc->old_record_in_namestore) | 975 | edc->old_record_in_namestore) |
976 | { | 976 | { |
977 | if (2 != SSCANF(edc->n_value, | 977 | if (2 != SSCANF(edc->n_value, |
978 | "%hu,%253s", &mx_pref, result)) | 978 | "%hu,%253s", &mx_pref, result)) |
979 | { | 979 | { |
980 | GNUNET_break (0); | 980 | GNUNET_break (0); |
@@ -1042,7 +1042,7 @@ GNS_edit_ns_dialog_response_cb (GtkDialog *dialog, | |||
1042 | struct EditDialogContext *edc = user_data; | 1042 | struct EditDialogContext *edc = user_data; |
1043 | GtkEntry *entry; | 1043 | GtkEntry *entry; |
1044 | const gchar *value; | 1044 | const gchar *value; |
1045 | 1045 | ||
1046 | if (GTK_RESPONSE_OK == response_id) | 1046 | if (GTK_RESPONSE_OK == response_id) |
1047 | { | 1047 | { |
1048 | edit_dialog_putes_common_elements (edc); | 1048 | edit_dialog_putes_common_elements (edc); |
@@ -1090,7 +1090,7 @@ GNS_edit_dialog_ns (struct EditDialogContext *edc) | |||
1090 | { | 1090 | { |
1091 | GNUNET_break (0); | 1091 | GNUNET_break (0); |
1092 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 1092 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
1093 | return; | 1093 | return; |
1094 | } | 1094 | } |
1095 | if (GNUNET_YES == | 1095 | if (GNUNET_YES == |
1096 | edc->old_record_in_namestore) | 1096 | edc->old_record_in_namestore) |
@@ -1126,7 +1126,7 @@ edit_dialog_pkey_validity_check (struct EditDialogContext *edc) | |||
1126 | "edit_dialog_pkey_entry")), | 1126 | "edit_dialog_pkey_entry")), |
1127 | preedit = gtk_editable_get_chars (entry, 0, -1); | 1127 | preedit = gtk_editable_get_chars (entry, 0, -1); |
1128 | if ( (NULL == preedit) || | 1128 | if ( (NULL == preedit) || |
1129 | (GNUNET_OK != | 1129 | (GNUNET_OK != |
1130 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (preedit, | 1130 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (preedit, |
1131 | strlen (preedit), | 1131 | strlen (preedit), |
1132 | &pub)) ) | 1132 | &pub)) ) |
@@ -1154,7 +1154,7 @@ GNS_edit_pkey_dialog_response_cb (GtkDialog *dialog, | |||
1154 | struct EditDialogContext *edc = user_data; | 1154 | struct EditDialogContext *edc = user_data; |
1155 | GtkEntry *entry; | 1155 | GtkEntry *entry; |
1156 | const gchar *value; | 1156 | const gchar *value; |
1157 | 1157 | ||
1158 | if (GTK_RESPONSE_OK == response_id) | 1158 | if (GTK_RESPONSE_OK == response_id) |
1159 | { | 1159 | { |
1160 | edit_dialog_putes_common_elements (edc); | 1160 | edit_dialog_putes_common_elements (edc); |
@@ -1202,7 +1202,7 @@ GNS_edit_dialog_pkey (struct EditDialogContext *edc) | |||
1202 | { | 1202 | { |
1203 | GNUNET_break (0); | 1203 | GNUNET_break (0); |
1204 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 1204 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
1205 | return; | 1205 | return; |
1206 | } | 1206 | } |
1207 | if (GNUNET_YES == | 1207 | if (GNUNET_YES == |
1208 | edc->old_record_in_namestore) | 1208 | edc->old_record_in_namestore) |
@@ -1262,7 +1262,7 @@ GNS_edit_ptr_dialog_response_cb (GtkDialog *dialog, | |||
1262 | struct EditDialogContext *edc = user_data; | 1262 | struct EditDialogContext *edc = user_data; |
1263 | GtkEntry *entry; | 1263 | GtkEntry *entry; |
1264 | const gchar *value; | 1264 | const gchar *value; |
1265 | 1265 | ||
1266 | if (GTK_RESPONSE_OK == response_id) | 1266 | if (GTK_RESPONSE_OK == response_id) |
1267 | { | 1267 | { |
1268 | edit_dialog_putes_common_elements (edc); | 1268 | edit_dialog_putes_common_elements (edc); |
@@ -1310,7 +1310,7 @@ GNS_edit_dialog_ptr (struct EditDialogContext *edc) | |||
1310 | { | 1310 | { |
1311 | GNUNET_break (0); | 1311 | GNUNET_break (0); |
1312 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 1312 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
1313 | return; | 1313 | return; |
1314 | } | 1314 | } |
1315 | if (GNUNET_YES == | 1315 | if (GNUNET_YES == |
1316 | edc->old_record_in_namestore) | 1316 | edc->old_record_in_namestore) |
@@ -1392,7 +1392,7 @@ GNS_edit_soa_dialog_response_cb (GtkDialog *dialog, | |||
1392 | unsigned int soa_expire; | 1392 | unsigned int soa_expire; |
1393 | unsigned int soa_min; | 1393 | unsigned int soa_min; |
1394 | char *result; | 1394 | char *result; |
1395 | 1395 | ||
1396 | if (GTK_RESPONSE_OK == response_id) | 1396 | if (GTK_RESPONSE_OK == response_id) |
1397 | { | 1397 | { |
1398 | edit_dialog_putes_common_elements (edc); | 1398 | edit_dialog_putes_common_elements (edc); |
@@ -1412,12 +1412,12 @@ GNS_edit_soa_dialog_response_cb (GtkDialog *dialog, | |||
1412 | "edit_dialog_soa_expire_time_spinbutton"))); | 1412 | "edit_dialog_soa_expire_time_spinbutton"))); |
1413 | soa_min = gtk_spin_button_get_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder, | 1413 | soa_min = gtk_spin_button_get_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder, |
1414 | "edit_dialog_soa_minimum_ttl_spinbutton"))); | 1414 | "edit_dialog_soa_minimum_ttl_spinbutton"))); |
1415 | GNUNET_asprintf (&result, | 1415 | GNUNET_asprintf (&result, |
1416 | "rname=%s mname=%s %lu,%lu,%lu,%lu,%lu", | 1416 | "rname=%s mname=%s %lu,%lu,%lu,%lu,%lu", |
1417 | source_host, contact_email, | 1417 | source_host, contact_email, |
1418 | soa_serial, | 1418 | soa_serial, |
1419 | soa_refresh, | 1419 | soa_refresh, |
1420 | soa_retry, | 1420 | soa_retry, |
1421 | soa_expire, | 1421 | soa_expire, |
1422 | soa_min); | 1422 | soa_min); |
1423 | edc->n_value = g_strdup (result); | 1423 | edc->n_value = g_strdup (result); |
@@ -1486,12 +1486,12 @@ GNS_edit_dialog_soa (struct EditDialogContext *edc) | |||
1486 | { | 1486 | { |
1487 | GNUNET_break (0); | 1487 | GNUNET_break (0); |
1488 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 1488 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
1489 | return; | 1489 | return; |
1490 | } | 1490 | } |
1491 | if (GNUNET_YES == | 1491 | if (GNUNET_YES == |
1492 | edc->old_record_in_namestore) | 1492 | edc->old_record_in_namestore) |
1493 | { | 1493 | { |
1494 | if (7 != SSCANF (edc->n_value, | 1494 | if (7 != SSCANF (edc->n_value, |
1495 | "rname=%253s mname=%253s %u,%u,%u,%u,%u", | 1495 | "rname=%253s mname=%253s %u,%u,%u,%u,%u", |
1496 | soa_rname, soa_mname, | 1496 | soa_rname, soa_mname, |
1497 | &soa_serial, &soa_refresh, &soa_retry, &soa_expire, &soa_min)) | 1497 | &soa_serial, &soa_refresh, &soa_retry, &soa_expire, &soa_min)) |
@@ -1582,7 +1582,7 @@ GNS_edit_srv_dialog_response_cb (GtkDialog *dialog, | |||
1582 | gpointer user_data) | 1582 | gpointer user_data) |
1583 | { | 1583 | { |
1584 | struct EditDialogContext *edc = user_data; | 1584 | struct EditDialogContext *edc = user_data; |
1585 | 1585 | ||
1586 | if (GTK_RESPONSE_OK == response_id) | 1586 | if (GTK_RESPONSE_OK == response_id) |
1587 | { | 1587 | { |
1588 | edit_dialog_putes_common_elements (edc); | 1588 | edit_dialog_putes_common_elements (edc); |
@@ -1637,7 +1637,7 @@ GNS_edit_dialog_srv (struct EditDialogContext *edc) | |||
1637 | { | 1637 | { |
1638 | GNUNET_break (0); | 1638 | GNUNET_break (0); |
1639 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 1639 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
1640 | return; | 1640 | return; |
1641 | } | 1641 | } |
1642 | if (GNUNET_YES == | 1642 | if (GNUNET_YES == |
1643 | edc->old_record_in_namestore) | 1643 | edc->old_record_in_namestore) |
@@ -1688,7 +1688,7 @@ GNS_edit_txt_dialog_response_cb (GtkDialog *dialog, | |||
1688 | struct EditDialogContext *edc = user_data; | 1688 | struct EditDialogContext *edc = user_data; |
1689 | GtkEntry *entry; | 1689 | GtkEntry *entry; |
1690 | const gchar *value; | 1690 | const gchar *value; |
1691 | 1691 | ||
1692 | if (GTK_RESPONSE_OK == response_id) | 1692 | if (GTK_RESPONSE_OK == response_id) |
1693 | { | 1693 | { |
1694 | edit_dialog_putes_common_elements (edc); | 1694 | edit_dialog_putes_common_elements (edc); |
@@ -1736,7 +1736,7 @@ GNS_edit_dialog_txt (struct EditDialogContext *edc) | |||
1736 | { | 1736 | { |
1737 | GNUNET_break (0); | 1737 | GNUNET_break (0); |
1738 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 1738 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
1739 | return; | 1739 | return; |
1740 | } | 1740 | } |
1741 | if (GNUNET_YES == | 1741 | if (GNUNET_YES == |
1742 | edc->old_record_in_namestore) | 1742 | edc->old_record_in_namestore) |
@@ -1767,12 +1767,12 @@ edit_dialog_vpn_validity_check (struct EditDialogContext *edc) | |||
1767 | GtkEditable *entry; | 1767 | GtkEditable *entry; |
1768 | const gchar *preedit; | 1768 | const gchar *preedit; |
1769 | struct GNUNET_HashCode hc; | 1769 | struct GNUNET_HashCode hc; |
1770 | 1770 | ||
1771 | entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder, | 1771 | entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder, |
1772 | "edit_dialog_vpn_peer_entry")), | 1772 | "edit_dialog_vpn_peer_entry")), |
1773 | preedit = gtk_editable_get_chars (entry, 0, -1); | 1773 | preedit = gtk_editable_get_chars (entry, 0, -1); |
1774 | if ( (NULL == preedit) || | 1774 | if ( (NULL == preedit) || |
1775 | (GNUNET_OK != | 1775 | (GNUNET_OK != |
1776 | GNUNET_CRYPTO_hash_from_string (preedit, &hc)) ) | 1776 | GNUNET_CRYPTO_hash_from_string (preedit, &hc)) ) |
1777 | { | 1777 | { |
1778 | edit_dialog_disable_save (edc); | 1778 | edit_dialog_disable_save (edc); |
@@ -1801,7 +1801,7 @@ GNS_edit_vpn_dialog_response_cb (GtkDialog *dialog, | |||
1801 | const gchar *peer; | 1801 | const gchar *peer; |
1802 | unsigned int proto; | 1802 | unsigned int proto; |
1803 | char *result; | 1803 | char *result; |
1804 | 1804 | ||
1805 | if (GTK_RESPONSE_OK == response_id) | 1805 | if (GTK_RESPONSE_OK == response_id) |
1806 | { | 1806 | { |
1807 | edit_dialog_putes_common_elements (edc); | 1807 | edit_dialog_putes_common_elements (edc); |
@@ -1813,7 +1813,7 @@ GNS_edit_vpn_dialog_response_cb (GtkDialog *dialog, | |||
1813 | peer = gtk_entry_get_text (entry); | 1813 | peer = gtk_entry_get_text (entry); |
1814 | proto = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 1814 | proto = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
1815 | "edit_dialog_vpn_protocol_tcp_radiobutton"))) ? IPPROTO_TCP : IPPROTO_UDP; | 1815 | "edit_dialog_vpn_protocol_tcp_radiobutton"))) ? IPPROTO_TCP : IPPROTO_UDP; |
1816 | GNUNET_asprintf (&result, | 1816 | GNUNET_asprintf (&result, |
1817 | "%u %s %s", | 1817 | "%u %s %s", |
1818 | proto, | 1818 | proto, |
1819 | (const char *) peer, | 1819 | (const char *) peer, |
@@ -1857,14 +1857,14 @@ GNS_edit_dialog_vpn (struct EditDialogContext *edc) | |||
1857 | char s_peer[103 + 1]; | 1857 | char s_peer[103 + 1]; |
1858 | char s_serv[253 + 1]; | 1858 | char s_serv[253 + 1]; |
1859 | unsigned int proto; | 1859 | unsigned int proto; |
1860 | 1860 | ||
1861 | edc->builder = GNUNET_GTK_get_new_builder ("gnunet_setup_gns_edit_vpn.glade", | 1861 | edc->builder = GNUNET_GTK_get_new_builder ("gnunet_setup_gns_edit_vpn.glade", |
1862 | edc); | 1862 | edc); |
1863 | if (NULL == edc->builder) | 1863 | if (NULL == edc->builder) |
1864 | { | 1864 | { |
1865 | GNUNET_break (0); | 1865 | GNUNET_break (0); |
1866 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ | 1866 | edc->cont (edc, GTK_RESPONSE_CANCEL); /* treat as 'cancel' */ |
1867 | return; | 1867 | return; |
1868 | } | 1868 | } |
1869 | if (GNUNET_YES == | 1869 | if (GNUNET_YES == |
1870 | edc->old_record_in_namestore) | 1870 | edc->old_record_in_namestore) |
@@ -1885,7 +1885,7 @@ GNS_edit_dialog_vpn (struct EditDialogContext *edc) | |||
1885 | gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder, | 1885 | gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder, |
1886 | "edit_dialog_vpn_peer_entry")), | 1886 | "edit_dialog_vpn_peer_entry")), |
1887 | s_peer); | 1887 | s_peer); |
1888 | if (IPPROTO_UDP == proto) | 1888 | if (IPPROTO_UDP == proto) |
1889 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 1889 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
1890 | "edit_dialog_vpn_protocol_udp_radiobutton")), TRUE); | 1890 | "edit_dialog_vpn_protocol_udp_radiobutton")), TRUE); |
1891 | else | 1891 | else |