diff options
-rw-r--r-- | contrib/gnunet_namestore_edit_a.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_aaaa.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_box.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_cert.glade | 17 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_cname.glade | 14 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_gns2dns.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_leho.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_mx.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_phone.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_pkey.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_ptr.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_soa.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_srv.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_tlsa.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_txt.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_edit_vpn.glade | 15 | ||||
-rw-r--r-- | contrib/gnunet_namestore_gtk_main_window.glade | 15 | ||||
-rw-r--r-- | src/namestore/gnunet-namestore-gtk.c | 24 |
18 files changed, 2 insertions, 278 deletions
diff --git a/contrib/gnunet_namestore_edit_a.glade b/contrib/gnunet_namestore_edit_a.glade index 7197bc5d..97505d13 100644 --- a/contrib/gnunet_namestore_edit_a.glade +++ b/contrib/gnunet_namestore_edit_a.glade | |||
@@ -290,21 +290,6 @@ | |||
290 | <property name="position">1</property> | 290 | <property name="position">1</property> |
291 | </packing> | 291 | </packing> |
292 | </child> | 292 | </child> |
293 | <child> | ||
294 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
295 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
296 | <property name="visible">True</property> | ||
297 | <property name="can_focus">True</property> | ||
298 | <property name="receives_default">False</property> | ||
299 | <property name="xalign">0.5</property> | ||
300 | <property name="draw_indicator">True</property> | ||
301 | </object> | ||
302 | <packing> | ||
303 | <property name="expand">True</property> | ||
304 | <property name="fill">True</property> | ||
305 | <property name="position">2</property> | ||
306 | </packing> | ||
307 | </child> | ||
308 | </object> | 293 | </object> |
309 | </child> | 294 | </child> |
310 | </object> | 295 | </object> |
diff --git a/contrib/gnunet_namestore_edit_aaaa.glade b/contrib/gnunet_namestore_edit_aaaa.glade index a36d7183..39ba278f 100644 --- a/contrib/gnunet_namestore_edit_aaaa.glade +++ b/contrib/gnunet_namestore_edit_aaaa.glade | |||
@@ -290,21 +290,6 @@ | |||
290 | <property name="position">1</property> | 290 | <property name="position">1</property> |
291 | </packing> | 291 | </packing> |
292 | </child> | 292 | </child> |
293 | <child> | ||
294 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
295 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
296 | <property name="visible">True</property> | ||
297 | <property name="can_focus">True</property> | ||
298 | <property name="receives_default">False</property> | ||
299 | <property name="xalign">0.5</property> | ||
300 | <property name="draw_indicator">True</property> | ||
301 | </object> | ||
302 | <packing> | ||
303 | <property name="expand">True</property> | ||
304 | <property name="fill">True</property> | ||
305 | <property name="position">2</property> | ||
306 | </packing> | ||
307 | </child> | ||
308 | </object> | 293 | </object> |
309 | </child> | 294 | </child> |
310 | </object> | 295 | </object> |
diff --git a/contrib/gnunet_namestore_edit_box.glade b/contrib/gnunet_namestore_edit_box.glade index 02b3afde..5cd530d8 100644 --- a/contrib/gnunet_namestore_edit_box.glade +++ b/contrib/gnunet_namestore_edit_box.glade | |||
@@ -932,21 +932,6 @@ For PGP, specify the key identifier. | |||
932 | <property name="position">1</property> | 932 | <property name="position">1</property> |
933 | </packing> | 933 | </packing> |
934 | </child> | 934 | </child> |
935 | <child> | ||
936 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
937 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
938 | <property name="visible">True</property> | ||
939 | <property name="can_focus">True</property> | ||
940 | <property name="receives_default">False</property> | ||
941 | <property name="xalign">0</property> | ||
942 | <property name="draw_indicator">True</property> | ||
943 | </object> | ||
944 | <packing> | ||
945 | <property name="expand">True</property> | ||
946 | <property name="fill">True</property> | ||
947 | <property name="position">2</property> | ||
948 | </packing> | ||
949 | </child> | ||
950 | </object> | 935 | </object> |
951 | </child> | 936 | </child> |
952 | </object> | 937 | </object> |
diff --git a/contrib/gnunet_namestore_edit_cert.glade b/contrib/gnunet_namestore_edit_cert.glade index 5e7f4b04..0782a4dc 100644 --- a/contrib/gnunet_namestore_edit_cert.glade +++ b/contrib/gnunet_namestore_edit_cert.glade | |||
@@ -326,7 +326,7 @@ | |||
326 | <object class="GtkEntry" id="edit_dialog_cert_import_entry"> | 326 | <object class="GtkEntry" id="edit_dialog_cert_import_entry"> |
327 | <property name="visible">True</property> | 327 | <property name="visible">True</property> |
328 | <property name="can_focus">True</property> | 328 | <property name="can_focus">True</property> |
329 | <property name="tooltip_text" translatable="yes">Enter identifier to import CERT information from the network. | 329 | <property name="tooltip_text" translatable="yes">Enter identifier to import CERT information from the network. |
330 | For example, for PKIX specify the DNS name. | 330 | For example, for PKIX specify the DNS name. |
331 | For PGP, specify the key identifier. | 331 | For PGP, specify the key identifier. |
332 | </property> | 332 | </property> |
@@ -434,21 +434,6 @@ For PGP, specify the key identifier. | |||
434 | <property name="position">1</property> | 434 | <property name="position">1</property> |
435 | </packing> | 435 | </packing> |
436 | </child> | 436 | </child> |
437 | <child> | ||
438 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
439 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
440 | <property name="visible">True</property> | ||
441 | <property name="can_focus">True</property> | ||
442 | <property name="receives_default">False</property> | ||
443 | <property name="xalign">0.5</property> | ||
444 | <property name="draw_indicator">True</property> | ||
445 | </object> | ||
446 | <packing> | ||
447 | <property name="expand">True</property> | ||
448 | <property name="fill">True</property> | ||
449 | <property name="position">2</property> | ||
450 | </packing> | ||
451 | </child> | ||
452 | </object> | 437 | </object> |
453 | </child> | 438 | </child> |
454 | </object> | 439 | </object> |
diff --git a/contrib/gnunet_namestore_edit_cname.glade b/contrib/gnunet_namestore_edit_cname.glade index d568804a..0fd44cd9 100644 --- a/contrib/gnunet_namestore_edit_cname.glade +++ b/contrib/gnunet_namestore_edit_cname.glade | |||
@@ -274,20 +274,6 @@ | |||
274 | <property name="position">1</property> | 274 | <property name="position">1</property> |
275 | </packing> | 275 | </packing> |
276 | </child> | 276 | </child> |
277 | <child> | ||
278 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
279 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
280 | <property name="visible">True</property> | ||
281 | <property name="can_focus">True</property> | ||
282 | <property name="receives_default">False</property> | ||
283 | <property name="draw_indicator">True</property> | ||
284 | </object> | ||
285 | <packing> | ||
286 | <property name="expand">True</property> | ||
287 | <property name="fill">True</property> | ||
288 | <property name="position">2</property> | ||
289 | </packing> | ||
290 | </child> | ||
291 | </object> | 277 | </object> |
292 | </child> | 278 | </child> |
293 | </object> | 279 | </object> |
diff --git a/contrib/gnunet_namestore_edit_gns2dns.glade b/contrib/gnunet_namestore_edit_gns2dns.glade index 5df942ab..f4ed1a8c 100644 --- a/contrib/gnunet_namestore_edit_gns2dns.glade +++ b/contrib/gnunet_namestore_edit_gns2dns.glade | |||
@@ -288,21 +288,6 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i | |||
288 | <property name="position">1</property> | 288 | <property name="position">1</property> |
289 | </packing> | 289 | </packing> |
290 | </child> | 290 | </child> |
291 | <child> | ||
292 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
293 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
294 | <property name="visible">True</property> | ||
295 | <property name="can_focus">True</property> | ||
296 | <property name="receives_default">False</property> | ||
297 | <property name="xalign">0.5</property> | ||
298 | <property name="draw_indicator">True</property> | ||
299 | </object> | ||
300 | <packing> | ||
301 | <property name="expand">True</property> | ||
302 | <property name="fill">True</property> | ||
303 | <property name="position">2</property> | ||
304 | </packing> | ||
305 | </child> | ||
306 | </object> | 291 | </object> |
307 | </child> | 292 | </child> |
308 | </object> | 293 | </object> |
diff --git a/contrib/gnunet_namestore_edit_leho.glade b/contrib/gnunet_namestore_edit_leho.glade index 776d0c3e..b277e683 100644 --- a/contrib/gnunet_namestore_edit_leho.glade +++ b/contrib/gnunet_namestore_edit_leho.glade | |||
@@ -290,21 +290,6 @@ | |||
290 | <property name="position">1</property> | 290 | <property name="position">1</property> |
291 | </packing> | 291 | </packing> |
292 | </child> | 292 | </child> |
293 | <child> | ||
294 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
295 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
296 | <property name="visible">True</property> | ||
297 | <property name="can_focus">True</property> | ||
298 | <property name="receives_default">False</property> | ||
299 | <property name="xalign">0.5</property> | ||
300 | <property name="draw_indicator">True</property> | ||
301 | </object> | ||
302 | <packing> | ||
303 | <property name="expand">True</property> | ||
304 | <property name="fill">True</property> | ||
305 | <property name="position">2</property> | ||
306 | </packing> | ||
307 | </child> | ||
308 | </object> | 293 | </object> |
309 | </child> | 294 | </child> |
310 | </object> | 295 | </object> |
diff --git a/contrib/gnunet_namestore_edit_mx.glade b/contrib/gnunet_namestore_edit_mx.glade index 01ed7feb..2a852fd2 100644 --- a/contrib/gnunet_namestore_edit_mx.glade +++ b/contrib/gnunet_namestore_edit_mx.glade | |||
@@ -324,21 +324,6 @@ | |||
324 | <property name="position">1</property> | 324 | <property name="position">1</property> |
325 | </packing> | 325 | </packing> |
326 | </child> | 326 | </child> |
327 | <child> | ||
328 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
329 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
330 | <property name="visible">True</property> | ||
331 | <property name="can_focus">True</property> | ||
332 | <property name="receives_default">False</property> | ||
333 | <property name="xalign">0.5</property> | ||
334 | <property name="draw_indicator">True</property> | ||
335 | </object> | ||
336 | <packing> | ||
337 | <property name="expand">True</property> | ||
338 | <property name="fill">True</property> | ||
339 | <property name="position">2</property> | ||
340 | </packing> | ||
341 | </child> | ||
342 | </object> | 327 | </object> |
343 | </child> | 328 | </child> |
344 | </object> | 329 | </object> |
diff --git a/contrib/gnunet_namestore_edit_phone.glade b/contrib/gnunet_namestore_edit_phone.glade index 1c6fafe5..b7c9ffd9 100644 --- a/contrib/gnunet_namestore_edit_phone.glade +++ b/contrib/gnunet_namestore_edit_phone.glade | |||
@@ -339,21 +339,6 @@ | |||
339 | <property name="position">1</property> | 339 | <property name="position">1</property> |
340 | </packing> | 340 | </packing> |
341 | </child> | 341 | </child> |
342 | <child> | ||
343 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
344 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
345 | <property name="visible">True</property> | ||
346 | <property name="can_focus">True</property> | ||
347 | <property name="receives_default">False</property> | ||
348 | <property name="xalign">0.5</property> | ||
349 | <property name="draw_indicator">True</property> | ||
350 | </object> | ||
351 | <packing> | ||
352 | <property name="expand">True</property> | ||
353 | <property name="fill">True</property> | ||
354 | <property name="position">2</property> | ||
355 | </packing> | ||
356 | </child> | ||
357 | </object> | 342 | </object> |
358 | </child> | 343 | </child> |
359 | </object> | 344 | </object> |
diff --git a/contrib/gnunet_namestore_edit_pkey.glade b/contrib/gnunet_namestore_edit_pkey.glade index 1cfb24ff..cb1b5f46 100644 --- a/contrib/gnunet_namestore_edit_pkey.glade +++ b/contrib/gnunet_namestore_edit_pkey.glade | |||
@@ -290,21 +290,6 @@ | |||
290 | <property name="position">1</property> | 290 | <property name="position">1</property> |
291 | </packing> | 291 | </packing> |
292 | </child> | 292 | </child> |
293 | <child> | ||
294 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
295 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
296 | <property name="visible">True</property> | ||
297 | <property name="can_focus">True</property> | ||
298 | <property name="receives_default">False</property> | ||
299 | <property name="xalign">0.5</property> | ||
300 | <property name="draw_indicator">True</property> | ||
301 | </object> | ||
302 | <packing> | ||
303 | <property name="expand">True</property> | ||
304 | <property name="fill">True</property> | ||
305 | <property name="position">2</property> | ||
306 | </packing> | ||
307 | </child> | ||
308 | </object> | 293 | </object> |
309 | </child> | 294 | </child> |
310 | </object> | 295 | </object> |
diff --git a/contrib/gnunet_namestore_edit_ptr.glade b/contrib/gnunet_namestore_edit_ptr.glade index ec8d2039..47093336 100644 --- a/contrib/gnunet_namestore_edit_ptr.glade +++ b/contrib/gnunet_namestore_edit_ptr.glade | |||
@@ -290,21 +290,6 @@ | |||
290 | <property name="position">1</property> | 290 | <property name="position">1</property> |
291 | </packing> | 291 | </packing> |
292 | </child> | 292 | </child> |
293 | <child> | ||
294 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
295 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
296 | <property name="visible">True</property> | ||
297 | <property name="can_focus">True</property> | ||
298 | <property name="receives_default">False</property> | ||
299 | <property name="xalign">0.5</property> | ||
300 | <property name="draw_indicator">True</property> | ||
301 | </object> | ||
302 | <packing> | ||
303 | <property name="expand">True</property> | ||
304 | <property name="fill">True</property> | ||
305 | <property name="position">2</property> | ||
306 | </packing> | ||
307 | </child> | ||
308 | </object> | 293 | </object> |
309 | </child> | 294 | </child> |
310 | </object> | 295 | </object> |
diff --git a/contrib/gnunet_namestore_edit_soa.glade b/contrib/gnunet_namestore_edit_soa.glade index 442da4d9..d3c7fe92 100644 --- a/contrib/gnunet_namestore_edit_soa.glade +++ b/contrib/gnunet_namestore_edit_soa.glade | |||
@@ -515,21 +515,6 @@ | |||
515 | <property name="position">1</property> | 515 | <property name="position">1</property> |
516 | </packing> | 516 | </packing> |
517 | </child> | 517 | </child> |
518 | <child> | ||
519 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
520 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
521 | <property name="visible">True</property> | ||
522 | <property name="can_focus">True</property> | ||
523 | <property name="receives_default">False</property> | ||
524 | <property name="xalign">0.5</property> | ||
525 | <property name="draw_indicator">True</property> | ||
526 | </object> | ||
527 | <packing> | ||
528 | <property name="expand">True</property> | ||
529 | <property name="fill">True</property> | ||
530 | <property name="position">2</property> | ||
531 | </packing> | ||
532 | </child> | ||
533 | </object> | 518 | </object> |
534 | </child> | 519 | </child> |
535 | </object> | 520 | </object> |
diff --git a/contrib/gnunet_namestore_edit_srv.glade b/contrib/gnunet_namestore_edit_srv.glade index 5471835f..c11f8aef 100644 --- a/contrib/gnunet_namestore_edit_srv.glade +++ b/contrib/gnunet_namestore_edit_srv.glade | |||
@@ -454,21 +454,6 @@ | |||
454 | <property name="position">1</property> | 454 | <property name="position">1</property> |
455 | </packing> | 455 | </packing> |
456 | </child> | 456 | </child> |
457 | <child> | ||
458 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
459 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
460 | <property name="visible">True</property> | ||
461 | <property name="can_focus">True</property> | ||
462 | <property name="receives_default">False</property> | ||
463 | <property name="xalign">0</property> | ||
464 | <property name="draw_indicator">True</property> | ||
465 | </object> | ||
466 | <packing> | ||
467 | <property name="expand">True</property> | ||
468 | <property name="fill">True</property> | ||
469 | <property name="position">2</property> | ||
470 | </packing> | ||
471 | </child> | ||
472 | </object> | 457 | </object> |
473 | </child> | 458 | </child> |
474 | </object> | 459 | </object> |
diff --git a/contrib/gnunet_namestore_edit_tlsa.glade b/contrib/gnunet_namestore_edit_tlsa.glade index 4c6efe42..6c2fa7a1 100644 --- a/contrib/gnunet_namestore_edit_tlsa.glade +++ b/contrib/gnunet_namestore_edit_tlsa.glade | |||
@@ -708,21 +708,6 @@ For PGP, specify the key identifier (not implemented). | |||
708 | <property name="position">1</property> | 708 | <property name="position">1</property> |
709 | </packing> | 709 | </packing> |
710 | </child> | 710 | </child> |
711 | <child> | ||
712 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
713 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
714 | <property name="visible">True</property> | ||
715 | <property name="can_focus">True</property> | ||
716 | <property name="receives_default">False</property> | ||
717 | <property name="xalign">0</property> | ||
718 | <property name="draw_indicator">True</property> | ||
719 | </object> | ||
720 | <packing> | ||
721 | <property name="expand">True</property> | ||
722 | <property name="fill">True</property> | ||
723 | <property name="position">2</property> | ||
724 | </packing> | ||
725 | </child> | ||
726 | </object> | 711 | </object> |
727 | </child> | 712 | </child> |
728 | </object> | 713 | </object> |
diff --git a/contrib/gnunet_namestore_edit_txt.glade b/contrib/gnunet_namestore_edit_txt.glade index 2b5510ca..70a4938b 100644 --- a/contrib/gnunet_namestore_edit_txt.glade +++ b/contrib/gnunet_namestore_edit_txt.glade | |||
@@ -289,21 +289,6 @@ | |||
289 | <property name="position">1</property> | 289 | <property name="position">1</property> |
290 | </packing> | 290 | </packing> |
291 | </child> | 291 | </child> |
292 | <child> | ||
293 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
294 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
295 | <property name="visible">True</property> | ||
296 | <property name="can_focus">True</property> | ||
297 | <property name="receives_default">False</property> | ||
298 | <property name="xalign">0.5</property> | ||
299 | <property name="draw_indicator">True</property> | ||
300 | </object> | ||
301 | <packing> | ||
302 | <property name="expand">True</property> | ||
303 | <property name="fill">True</property> | ||
304 | <property name="position">2</property> | ||
305 | </packing> | ||
306 | </child> | ||
307 | </object> | 292 | </object> |
308 | </child> | 293 | </child> |
309 | </object> | 294 | </object> |
diff --git a/contrib/gnunet_namestore_edit_vpn.glade b/contrib/gnunet_namestore_edit_vpn.glade index ae63f311..6bec787a 100644 --- a/contrib/gnunet_namestore_edit_vpn.glade +++ b/contrib/gnunet_namestore_edit_vpn.glade | |||
@@ -390,21 +390,6 @@ | |||
390 | <property name="position">1</property> | 390 | <property name="position">1</property> |
391 | </packing> | 391 | </packing> |
392 | </child> | 392 | </child> |
393 | <child> | ||
394 | <object class="GtkCheckButton" id="edit_dialog_options_pending_checkbutton"> | ||
395 | <property name="label" translatable="yes">Record is pending approval (not currently usable for anyone)</property> | ||
396 | <property name="visible">True</property> | ||
397 | <property name="can_focus">True</property> | ||
398 | <property name="receives_default">False</property> | ||
399 | <property name="xalign">0.5</property> | ||
400 | <property name="draw_indicator">True</property> | ||
401 | </object> | ||
402 | <packing> | ||
403 | <property name="expand">True</property> | ||
404 | <property name="fill">True</property> | ||
405 | <property name="position">2</property> | ||
406 | </packing> | ||
407 | </child> | ||
408 | </object> | 393 | </object> |
409 | </child> | 394 | </child> |
410 | </object> | 395 | </object> |
diff --git a/contrib/gnunet_namestore_gtk_main_window.glade b/contrib/gnunet_namestore_gtk_main_window.glade index f18abcae..11c4a6ee 100644 --- a/contrib/gnunet_namestore_gtk_main_window.glade +++ b/contrib/gnunet_namestore_gtk_main_window.glade | |||
@@ -53,8 +53,6 @@ | |||
53 | <column type="gboolean"/> | 53 | <column type="gboolean"/> |
54 | <!-- column-name record_offset --> | 54 | <!-- column-name record_offset --> |
55 | <column type="guint"/> | 55 | <column type="guint"/> |
56 | <!-- column-name record_is_pending --> | ||
57 | <column type="gboolean"/> | ||
58 | </columns> | 56 | </columns> |
59 | </object> | 57 | </object> |
60 | <object class="GtkListStore" id="gnunet_namestore_gtk_type_liststore"> | 58 | <object class="GtkListStore" id="gnunet_namestore_gtk_type_liststore"> |
@@ -436,19 +434,6 @@ | |||
436 | </child> | 434 | </child> |
437 | </object> | 435 | </object> |
438 | </child> | 436 | </child> |
439 | <child> | ||
440 | <object class="GtkTreeViewColumn" id="gnunet_namestore_gtk_ispending_treeviewcolumn"> | ||
441 | <property name="sizing">fixed</property> | ||
442 | <property name="fixed_width">58</property> | ||
443 | <property name="title" translatable="yes">Pending</property> | ||
444 | <child> | ||
445 | <object class="GtkCellRendererToggle" id="gnunet_namestore_gtk_ispending_cellrenderertoggle"/> | ||
446 | <attributes> | ||
447 | <attribute name="active">18</attribute> | ||
448 | </attributes> | ||
449 | </child> | ||
450 | </object> | ||
451 | </child> | ||
452 | </object> | 437 | </object> |
453 | </child> | 438 | </child> |
454 | </object> | 439 | </object> |
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c index 872baff5..bdef8986 100644 --- a/src/namestore/gnunet-namestore-gtk.c +++ b/src/namestore/gnunet-namestore-gtk.c | |||
@@ -160,13 +160,8 @@ enum GNSTreestoreColumn | |||
160 | /** | 160 | /** |
161 | * A guint; offset of this record in the array. | 161 | * A guint; offset of this record in the array. |
162 | */ | 162 | */ |
163 | GNS_TREESTORE_COL_RECORD_OFFSET, | 163 | GNS_TREESTORE_COL_RECORD_OFFSET |
164 | 164 | ||
165 | /** | ||
166 | * A gboolean; TRUE if the record is pending approval | ||
167 | * and thus not usable for anyone right now. | ||
168 | */ | ||
169 | GNS_TREESTORE_COL_IS_PENDING | ||
170 | }; | 165 | }; |
171 | 166 | ||
172 | 167 | ||
@@ -987,8 +982,6 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc, | |||
987 | rd.flags = GNUNET_GNSRECORD_RF_PRIVATE; | 982 | rd.flags = GNUNET_GNSRECORD_RF_PRIVATE; |
988 | if (edc->n_is_shadow) | 983 | if (edc->n_is_shadow) |
989 | rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD; | 984 | rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD; |
990 | if (edc->n_is_pending) | ||
991 | rd.flags |= GNUNET_GNSRECORD_RF_PENDING; | ||
992 | rd.record_type = edc->record_type; | 985 | rd.record_type = edc->record_type; |
993 | rd.expiration_time = edc->n_exp_time; | 986 | rd.expiration_time = edc->n_exp_time; |
994 | if (edc->n_is_relative) | 987 | if (edc->n_is_relative) |
@@ -1238,9 +1231,6 @@ edit_dialog_setup_common_elements (struct GNUNET_GTK_NAMESTORE_PluginEnvironment | |||
1238 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 1231 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
1239 | "edit_dialog_options_shadow_checkbutton")), | 1232 | "edit_dialog_options_shadow_checkbutton")), |
1240 | edc->n_is_shadow); | 1233 | edc->n_is_shadow); |
1241 | gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | ||
1242 | "edit_dialog_options_pending_checkbutton")), | ||
1243 | edc->n_is_pending); | ||
1244 | 1234 | ||
1245 | if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == edc->n_exp_time) | 1235 | if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == edc->n_exp_time) |
1246 | { | 1236 | { |
@@ -1340,9 +1330,6 @@ edit_dialog_putes_common_elements (struct GNUNET_GTK_NAMESTORE_PluginEnvironment | |||
1340 | /* is shadow flag */ | 1330 | /* is shadow flag */ |
1341 | edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 1331 | edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
1342 | "edit_dialog_options_shadow_checkbutton"))); | 1332 | "edit_dialog_options_shadow_checkbutton"))); |
1343 | /* is pending flag */ | ||
1344 | edc->n_is_pending = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | ||
1345 | "edit_dialog_options_pending_checkbutton"))); | ||
1346 | 1333 | ||
1347 | /* 'forever' expiration time */ | 1334 | /* 'forever' expiration time */ |
1348 | if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, | 1335 | if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, |
@@ -1589,7 +1576,6 @@ launch_edit_dialog (gint n_type, | |||
1589 | edc->n_public = (0 == (rd_old[off].flags & GNUNET_GNSRECORD_RF_PRIVATE)); | 1576 | edc->n_public = (0 == (rd_old[off].flags & GNUNET_GNSRECORD_RF_PRIVATE)); |
1590 | edc->n_is_relative = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)); | 1577 | edc->n_is_relative = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)); |
1591 | edc->n_is_shadow = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)); | 1578 | edc->n_is_shadow = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)); |
1592 | edc->n_is_pending = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_PENDING)); | ||
1593 | edc->n_exp_time = rd_old[off].expiration_time; | 1579 | edc->n_exp_time = rd_old[off].expiration_time; |
1594 | edc->old_record_in_namestore = GNUNET_YES; | 1580 | edc->old_record_in_namestore = GNUNET_YES; |
1595 | } | 1581 | } |
@@ -2021,7 +2007,6 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget, | |||
2021 | guint64 n_exp_time; | 2007 | guint64 n_exp_time; |
2022 | gboolean n_is_relative; | 2008 | gboolean n_is_relative; |
2023 | gboolean n_is_shadow; | 2009 | gboolean n_is_shadow; |
2024 | gboolean n_is_pending; | ||
2025 | char *n_value; | 2010 | char *n_value; |
2026 | 2011 | ||
2027 | /* Removing a single record */ | 2012 | /* Removing a single record */ |
@@ -2039,7 +2024,6 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget, | |||
2039 | GNS_TREESTORE_COL_EXP_TIME, &n_exp_time, | 2024 | GNS_TREESTORE_COL_EXP_TIME, &n_exp_time, |
2040 | GNS_TREESTORE_COL_EXP_TIME_IS_REL, &n_is_relative, | 2025 | GNS_TREESTORE_COL_EXP_TIME_IS_REL, &n_is_relative, |
2041 | GNS_TREESTORE_COL_IS_SHADOW, &n_is_shadow, | 2026 | GNS_TREESTORE_COL_IS_SHADOW, &n_is_shadow, |
2042 | GNS_TREESTORE_COL_IS_PENDING, &n_is_pending, | ||
2043 | GNS_TREESTORE_COL_VAL_AS_STR, &n_value, | 2027 | GNS_TREESTORE_COL_VAL_AS_STR, &n_value, |
2044 | -1); | 2028 | -1); |
2045 | /* valid name */ | 2029 | /* valid name */ |
@@ -2051,8 +2035,6 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget, | |||
2051 | rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION; | 2035 | rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION; |
2052 | if (n_is_shadow) | 2036 | if (n_is_shadow) |
2053 | rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD; | 2037 | rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD; |
2054 | if (n_is_pending) | ||
2055 | rd.flags |= GNUNET_GNSRECORD_RF_PENDING; | ||
2056 | rd.record_type = n_type; | 2038 | rd.record_type = n_type; |
2057 | rd.expiration_time = n_exp_time; | 2039 | rd.expiration_time = n_exp_time; |
2058 | if (GNUNET_OK != | 2040 | if (GNUNET_OK != |
@@ -2273,7 +2255,6 @@ zone_iteration_proc (void *cls, | |||
2273 | char *type_str; | 2255 | char *type_str; |
2274 | gboolean time_is_relative; | 2256 | gboolean time_is_relative; |
2275 | gboolean is_public; | 2257 | gboolean is_public; |
2276 | gboolean is_pending; | ||
2277 | gboolean is_shadow; | 2258 | gboolean is_shadow; |
2278 | guint64 exp_t; | 2259 | guint64 exp_t; |
2279 | GtkEntry *pseu_entry; | 2260 | GtkEntry *pseu_entry; |
@@ -2389,8 +2370,6 @@ zone_iteration_proc (void *cls, | |||
2389 | is_public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) != GNUNET_GNSRECORD_RF_PRIVATE); | 2370 | is_public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) != GNUNET_GNSRECORD_RF_PRIVATE); |
2390 | /* Set shadow toggle */ | 2371 | /* Set shadow toggle */ |
2391 | is_shadow = ((rd[c].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD) == GNUNET_GNSRECORD_RF_SHADOW_RECORD); | 2372 | is_shadow = ((rd[c].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD) == GNUNET_GNSRECORD_RF_SHADOW_RECORD); |
2392 | /* Set pending toggle */ | ||
2393 | is_pending = ((rd[c].flags & GNUNET_GNSRECORD_RF_PENDING) == GNUNET_GNSRECORD_RF_PENDING); | ||
2394 | /* Expiration time */ | 2373 | /* Expiration time */ |
2395 | time_is_relative = (0 != (rd[c].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)); | 2374 | time_is_relative = (0 != (rd[c].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)); |
2396 | 2375 | ||
@@ -2442,7 +2421,6 @@ zone_iteration_proc (void *cls, | |||
2442 | GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, type_str, | 2421 | GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, type_str, |
2443 | GNS_TREESTORE_COL_IS_PUBLIC, is_public, | 2422 | GNS_TREESTORE_COL_IS_PUBLIC, is_public, |
2444 | GNS_TREESTORE_COL_IS_SHADOW, is_shadow, | 2423 | GNS_TREESTORE_COL_IS_SHADOW, is_shadow, |
2445 | GNS_TREESTORE_COL_IS_PENDING, is_pending, | ||
2446 | GNS_TREESTORE_COL_EXP_TIME, exp_t, | 2424 | GNS_TREESTORE_COL_EXP_TIME, exp_t, |
2447 | GNS_TREESTORE_COL_EXP_TIME_AS_STR, exp, | 2425 | GNS_TREESTORE_COL_EXP_TIME_AS_STR, exp, |
2448 | GNS_TREESTORE_COL_EXP_TIME_IS_REL, time_is_relative, | 2426 | GNS_TREESTORE_COL_EXP_TIME_IS_REL, time_is_relative, |