[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29935 - in gnunet-gtk: contrib src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29935 - in gnunet-gtk: contrib src/namestore |
|
Date: |
Mon, 7 Oct 2013 19:46:50 +0200 |
Author: grothoff
Date: 2013-10-07 19:46:49 +0200 (Mon, 07 Oct 2013)
New Revision: 29935
Added:
gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade
Removed:
gnunet-gtk/contrib/gnunet_namestore_edit_ns.glade
Modified:
gnunet-gtk/contrib/Makefile.am
gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
gnunet-gtk/src/namestore/gnunet-namestore-gtk_edit.c
gnunet-gtk/src/namestore/gnunet-namestore-gtk_edit.h
Log:
-use GNS2DNS record now, instead of NS
Modified: gnunet-gtk/contrib/Makefile.am
===================================================================
--- gnunet-gtk/contrib/Makefile.am 2013-10-07 17:36:30 UTC (rev 29934)
+++ gnunet-gtk/contrib/Makefile.am 2013-10-07 17:46:49 UTC (rev 29935)
@@ -55,16 +55,16 @@
gnunet_namestore_gtk_main_window.glade \
gnunet_namestore_gtk_qr_save_as_dialog.glade \
gnunet_namestore_edit_a.glade \
- gnunet_namestore_edit_ns.glade \
+ gnunet_namestore_edit_aaaa.glade \
gnunet_namestore_edit_cname.glade \
- gnunet_namestore_edit_soa.glade \
- gnunet_namestore_edit_ptr.glade \
+ gnunet_namestore_edit_gns2dns.glade \
+ gnunet_namestore_edit_leho.glade \
gnunet_namestore_edit_mx.glade \
- gnunet_namestore_edit_txt.glade \
- gnunet_namestore_edit_aaaa.glade \
gnunet_namestore_edit_pkey.glade \
- gnunet_namestore_edit_leho.glade \
+ gnunet_namestore_edit_ptr.glade \
+ gnunet_namestore_edit_soa.glade \
gnunet_namestore_edit_srv.glade \
+ gnunet_namestore_edit_txt.glade \
gnunet_namestore_edit_vpn.glade
Copied: gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade (from rev 29934,
gnunet-gtk/contrib/gnunet_namestore_edit_ns.glade)
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade
(rev 0)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade 2013-10-07
17:46:49 UTC (rev 29935)
@@ -0,0 +1,595 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="2.24"/>
+ <!-- interface-naming-policy project-wide -->
+ <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
+ <property name="upper">23</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">12</property>
+ </object>
+ <object class="GtkAdjustment" id="absolute_expiration_minutes_adjustment">
+ <property name="upper">59</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="absolute_expiration_seconds_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
+ <columns>
+ <!-- column-name relativetime -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">7 days</col>
+ </row>
+ <row>
+ <col id="0">1 day</col>
+ </row>
+ <row>
+ <col id="0">1 h</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="zone_liststore">
+ <columns>
+ <!-- column-name zonename -->
+ <column type="gchararray"/>
+ <!-- column-name optionname -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Master Zone</col>
+ <col id="1">ZONEKEY</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Private Zone</col>
+ <col id="1">PRIVATE_ZONEKEY</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Shorten Zone</col>
+ <col id="1">SHORTEN_ZONEKEY</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkDialog" id="edit_gns2dns_dialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">dialog</property>
+ <signal name="response" handler="GNS_edit_gns2dns_dialog_response_cb"
swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="edit_dialog_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="edit_dialog_action_area">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="edit_dialog_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="edit_dialog_delete_button">
+ <property name="label">gtk-delete</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="edit_dialog_save_button">
+ <property name="label">gtk-save</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Store the
updated record in the database. If the record is public, GNUnet will begin to
publish the record to the world, limiting your ability to change it later
(based on the selected expiration values).</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="edit_dialog_name_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="edit_dialog_name_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkHBox" id="edit_dialog_name_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkEntry" id="edit_dialog_name_entry">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
+ <property name="max_length">63</property>
+ <property name="invisible_char">●</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="edit_dialog_name_in_zone_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">in</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">10</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox"
id="edit_dialog_zone_combobox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Select the desired zone for the record. Changing this value
here will move the record to the selected zone.</property>
+ <property name="model">zone_liststore</property>
+ <property name="active">0</property>
+ <property name="entry_text_column">0</property>
+ <child>
+ <object class="GtkCellRendererText"
id="edit_dialog_zone_combobox_cellrenderertext"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="edit_dialog_name_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b>Name</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="edit_dialog_gns2dns_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="edit_dialog_gns2dns_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">4</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="edit_dialog_gns2dns_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkEntry" id="edit_dialog_gns2dns_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Enter
the name of the DNS nameserver for the subzone.</property>
+ <property name="max_length">253</property>
+ <property name="invisible_char">●</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <signal name="changed"
handler="GNS_edit_dialog_gns2dns_entry_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="edit_dialog_gns2dns_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Name of the
authoritative name server for the given name</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="edit_dialog_options_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="edit_dialog_options_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="edit_dialog_options_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
+ <property name="label" translatable="yes">Record is
public (visible to other users)</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
+ <property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="edit_dialog_options_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b>Options</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="edit_dialog_expiration_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment"
id="edit_dialog_expiration_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="edit_dialog_expiration_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkHBox" id="edit_dialog_expiration_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
+ <property name="label"
translatable="yes">Relative</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
+ <property name="label"
translatable="yes">Absolute</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property
name="group">edit_dialog_expiration_relative_radiobutton</property>
+ <signal name="toggled"
handler="GNS_edit_dialog_expiration_absolute_radiobutton_toggled_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
+ <property name="label"
translatable="yes">Never</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property
name="group">edit_dialog_expiration_relative_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCalendar"
id="edit_dialog_expiration_absolute_calendar">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Select the date on which you want this record to expire. At
that date, you can then create a new mapping or have a shadow record go
automatically into effect. Note that for public records you cannot change the
expiration time to an earlier date after the fact.</property>
+ <property name="year">2012</property>
+ <property name="month">9</property>
+ <property name="day">17</property>
+ <property name="show_week_numbers">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="edit_dialog_expiration_absolute_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="edit_dialog_expiration_absolute_hours_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Hours:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="edit_dialog_expiration_absolute_hours_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Which hour of the day selected above should the record
expire?</property>
+ <property name="max_length">2</property>
+ <property name="invisible_char">●</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <property
name="adjustment">absolute_expiration_hours_adjustment</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="edit_dialog_expiration_absolute_minutes_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Minutes:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="edit_dialog_expiration_absolute_minutes_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Which minute of the day selected above should the record
expire?</property>
+ <property name="max_length">2</property>
+ <property name="invisible_char">●</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <property
name="adjustment">absolute_expiration_minutes_adjustment</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="edit_dialog_expiration_absolute_seconds_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Seconds:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="edit_dialog_expiration_absolute_seconds_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip_text"
translatable="yes">Which second of the day selected above should the record
expire?</property>
+ <property name="max_length">2</property>
+ <property name="invisible_char">●</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ <property
name="adjustment">absolute_expiration_seconds_adjustment</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox"
id="edit_dialog_expiration_relative_combobox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text"
translatable="yes">Relative expiration time of the record. The syntax is a
number followed by a space and a time unit, possibly followed by additional
numbers and time units. For example, you can specify "1 d" or "6 h 30 m 15 s".
Use the drop-down menu to select from a set of common defaults. (Editing is not
possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.)
</property>
+ <property
name="model">edit_dialog_expiration_relative_liststore</property>
+ <property name="entry_text_column">0</property>
+ <child>
+ <object class="GtkCellRendererText"
id="edit_dialog_expiration_relative_combobox_cellrenderertext"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="edit_dialog_expiration_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Expiration
Time</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">edit_dialog_cancel_button</action-widget>
+ <action-widget response="-2">edit_dialog_delete_button</action-widget>
+ <action-widget response="-5">edit_dialog_save_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Deleted: gnunet-gtk/contrib/gnunet_namestore_edit_ns.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_ns.glade 2013-10-07 17:36:30 UTC
(rev 29934)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_ns.glade 2013-10-07 17:46:49 UTC
(rev 29935)
@@ -1,595 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
- <property name="upper">23</property>
- <property name="step_increment">1</property>
- <property name="page_increment">12</property>
- </object>
- <object class="GtkAdjustment" id="absolute_expiration_minutes_adjustment">
- <property name="upper">59</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="absolute_expiration_seconds_adjustment">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
- <columns>
- <!-- column-name relativetime -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">7 days</col>
- </row>
- <row>
- <col id="0">1 day</col>
- </row>
- <row>
- <col id="0">1 h</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="zone_liststore">
- <columns>
- <!-- column-name zonename -->
- <column type="gchararray"/>
- <!-- column-name optionname -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Master Zone</col>
- <col id="1">ZONEKEY</col>
- </row>
- <row>
- <col id="0" translatable="yes">Private Zone</col>
- <col id="1">PRIVATE_ZONEKEY</col>
- </row>
- <row>
- <col id="0" translatable="yes">Shorten Zone</col>
- <col id="1">SHORTEN_ZONEKEY</col>
- </row>
- </data>
- </object>
- <object class="GtkDialog" id="edit_ns_dialog">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="modal">True</property>
- <property name="window_position">center-on-parent</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">dialog</property>
- <signal name="response" handler="GNS_edit_ns_dialog_response_cb"
swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="edit_dialog_action_area">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="edit_dialog_cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="edit_dialog_delete_button">
- <property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="edit_dialog_save_button">
- <property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Store the
updated record in the database. If the record is public, GNUnet will begin to
publish the record to the world, limiting your ability to change it later
(based on the selected expiration values).</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="edit_dialog_name_frame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="edit_dialog_name_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkHBox" id="edit_dialog_name_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkEntry" id="edit_dialog_name_entry">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
- <property name="max_length">63</property>
- <property name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="edit_dialog_name_in_zone_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">in</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">10</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox"
id="edit_dialog_zone_combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Select the desired zone for the record. Changing this value
here will move the record to the selected zone.</property>
- <property name="model">zone_liststore</property>
- <property name="active">0</property>
- <property name="entry_text_column">0</property>
- <child>
- <object class="GtkCellRendererText"
id="edit_dialog_zone_combobox_cellrenderertext"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="edit_dialog_name_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Name</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="edit_dialog_ns_frame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="edit_dialog_ns_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">4</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="edit_dialog_ns_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkEntry" id="edit_dialog_ns_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="tooltip_text" translatable="yes">Enter
the name of the DNS nameserver for the subzone.</property>
- <property name="max_length">253</property>
- <property name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <signal name="changed"
handler="GNS_edit_dialog_ns_entry_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="edit_dialog_ns_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Name of the
authoritative name server for the given name</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="edit_dialog_options_frame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="edit_dialog_options_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="edit_dialog_options_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
- <property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
- <property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="edit_dialog_options_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Options</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="edit_dialog_expiration_frame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment"
id="edit_dialog_expiration_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">5</property>
- <property name="bottom_padding">5</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="edit_dialog_expiration_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkHBox" id="edit_dialog_expiration_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
- <property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
- <property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property
name="group">edit_dialog_expiration_relative_radiobutton</property>
- <signal name="toggled"
handler="GNS_edit_dialog_expiration_absolute_radiobutton_toggled_cb"
swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
- <property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property
name="group">edit_dialog_expiration_relative_radiobutton</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCalendar"
id="edit_dialog_expiration_absolute_calendar">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text"
translatable="yes">Select the date on which you want this record to expire. At
that date, you can then create a new mapping or have a shadow record go
automatically into effect. Note that for public records you cannot change the
expiration time to an earlier date after the fact.</property>
- <property name="year">2012</property>
- <property name="month">9</property>
- <property name="day">17</property>
- <property name="show_week_numbers">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox"
id="edit_dialog_expiration_absolute_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="edit_dialog_expiration_absolute_hours_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Hours:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="edit_dialog_expiration_absolute_hours_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text"
translatable="yes">Which hour of the day selected above should the record
expire?</property>
- <property name="max_length">2</property>
- <property name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property
name="adjustment">absolute_expiration_hours_adjustment</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="edit_dialog_expiration_absolute_minutes_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Minutes:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="edit_dialog_expiration_absolute_minutes_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text"
translatable="yes">Which minute of the day selected above should the record
expire?</property>
- <property name="max_length">2</property>
- <property name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property
name="adjustment">absolute_expiration_minutes_adjustment</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="edit_dialog_expiration_absolute_seconds_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Seconds:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="edit_dialog_expiration_absolute_seconds_spinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text"
translatable="yes">Which second of the day selected above should the record
expire?</property>
- <property name="max_length">2</property>
- <property name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property
name="adjustment">absolute_expiration_seconds_adjustment</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox"
id="edit_dialog_expiration_relative_combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Relative expiration time of the record. The syntax is a
number followed by a space and a time unit, possibly followed by additional
numbers and time units. For example, you can specify "1 d" or "6 h 30 m 15 s".
Use the drop-down menu to select from a set of common defaults. (Editing is not
possible right now as Gtk2 and Gtk3 use incompatible ways for doing this.)
</property>
- <property
name="model">edit_dialog_expiration_relative_liststore</property>
- <property name="entry_text_column">0</property>
- <child>
- <object class="GtkCellRendererText"
id="edit_dialog_expiration_relative_combobox_cellrenderertext"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="edit_dialog_expiration_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Expiration
Time</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">edit_dialog_cancel_button</action-widget>
- <action-widget response="-2">edit_dialog_delete_button</action-widget>
- <action-widget response="-5">edit_dialog_save_button</action-widget>
- </action-widgets>
- </object>
-</interface>
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-10-07 17:36:30 UTC
(rev 29934)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-10-07 17:46:49 UTC
(rev 29935)
@@ -1136,8 +1136,8 @@
case GNUNET_DNSPARSER_TYPE_MX:
GNS_edit_dialog_mx (edc);
break;
- case GNUNET_DNSPARSER_TYPE_NS:
- GNS_edit_dialog_ns (edc);
+ case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+ GNS_edit_dialog_gns2dns (edc);
break;
case GNUNET_DNSPARSER_TYPE_SOA:
GNS_edit_dialog_soa (edc);
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk_edit.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk_edit.c 2013-10-07
17:36:30 UTC (rev 29934)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk_edit.c 2013-10-07
17:46:49 UTC (rev 29935)
@@ -999,22 +999,22 @@
}
-/* ************************ NS records *********************** */
+/* ************************ GNS2DNS records *********************** */
/**
- * Check validity of the value in the edit dialog for NS-records.
+ * Check validity of the value in the edit dialog for GNS2DNS-records.
* Then call the shared validity check if the result is OK.
*
* @param edc edit dialog context
*/
static void
-edit_dialog_ns_validity_check (struct EditDialogContext *edc)
+edit_dialog_gns2dns_validity_check (struct EditDialogContext *edc)
{
GtkEditable *entry;
const gchar *preedit;
entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
- "edit_dialog_ns_entry")),
+ "edit_dialog_gns2dns_entry")),
preedit = gtk_editable_get_chars (entry, 0, -1);
if ( (NULL == preedit) ||
(GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
@@ -1035,9 +1035,9 @@
* @param user_data the 'struct EditDialogContext'
*/
void
-GNS_edit_ns_dialog_response_cb (GtkDialog *dialog,
- gint response_id,
- gpointer user_data)
+GNS_edit_gns2dns_dialog_response_cb (GtkDialog *dialog,
+ gint response_id,
+ gpointer user_data)
{
struct EditDialogContext *edc = user_data;
GtkEntry *entry;
@@ -1047,7 +1047,7 @@
{
edit_dialog_putes_common_elements (edc);
entry = GTK_ENTRY (gtk_builder_get_object (edc->builder,
- "edit_dialog_ns_entry"));
+ "edit_dialog_gns2dns_entry"));
value = gtk_entry_get_text (entry);
g_free (edc->n_value);
edc->n_value = g_strdup (value);
@@ -1060,31 +1060,31 @@
/**
- * The user has edited the NS record value. Enable/disable 'save'
+ * The user has edited the GNS2DNS record value. Enable/disable 'save'
* button depending on the validity of the value.
*
* @param entry editing widget
* @param user_data the 'struct EditDialogContext' of the dialog
*/
void
-GNS_edit_dialog_ns_entry_changed_cb (GtkEditable *entry,
- gpointer user_data)
+GNS_edit_dialog_gns2dns_entry_changed_cb (GtkEditable *entry,
+ gpointer user_data)
{
struct EditDialogContext *edc = user_data;
- edit_dialog_ns_validity_check (edc);
+ edit_dialog_gns2dns_validity_check (edc);
}
/**
- * Run an GNS Edit dialog for an 'NS' Record.
+ * Run an GNS Edit dialog for a 'GNS2DNS' Record.
*
* @param edc editing context to use
*/
void
-GNS_edit_dialog_ns (struct EditDialogContext *edc)
+GNS_edit_dialog_gns2dns (struct EditDialogContext *edc)
{
- edc->builder = GNUNET_GTK_get_new_builder ("gnunet_namestore_edit_ns.glade",
+ edc->builder = GNUNET_GTK_get_new_builder
("gnunet_namestore_edit_gns2dns.glade",
edc);
if (NULL == edc->builder)
{
@@ -1097,12 +1097,12 @@
{
/* set NS record */
gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder,
-
"edit_dialog_ns_entry")),
+
"edit_dialog_gns2dns_entry")),
edc->n_value);
}
- edc->validator = &edit_dialog_ns_validity_check;
+ edc->validator = &edit_dialog_gns2dns_validity_check;
edc->dialog = GTK_DIALOG (gtk_builder_get_object (edc->builder,
- "edit_ns_dialog"));
+ "edit_gns2dns_dialog"));
run_edit_dialog (edc);
}
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk_edit.h
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk_edit.h 2013-10-07
17:36:30 UTC (rev 29934)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk_edit.h 2013-10-07
17:46:49 UTC (rev 29935)
@@ -193,7 +193,7 @@
* @param edc editing context to use
*/
void
-GNS_edit_dialog_ns (struct EditDialogContext *edc);
+GNS_edit_dialog_gns2dns (struct EditDialogContext *edc);
/**
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29935 - in gnunet-gtk: contrib src/namestore,
gnunet <=