[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28657 - in gnunet-gtk: contrib src/setup
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28657 - in gnunet-gtk: contrib src/setup |
Date: |
Thu, 15 Aug 2013 14:39:03 +0200 |
Author: grothoff
Date: 2013-08-15 14:39:03 +0200 (Thu, 15 Aug 2013)
New Revision: 28657
Modified:
gnunet-gtk/contrib/gnunet_setup_gns_edit_pkey.glade
gnunet-gtk/contrib/gnunet_setup_gns_edit_vpn.glade
gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
gnunet-gtk/src/setup/gnunet-setup-gns-edit.c
gnunet-gtk/src/setup/gnunet-setup-gns.c
gnunet-gtk/src/setup/gnunet-setup-options.c
gnunet-gtk/src/setup/gnunet-setup.c
Log:
-update PKEY editing dialog to new crypto
Modified: gnunet-gtk/contrib/gnunet_setup_gns_edit_pkey.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gns_edit_pkey.glade 2013-08-15 12:34:38 UTC
(rev 28656)
+++ gnunet-gtk/contrib/gnunet_setup_gns_edit_pkey.glade 2013-08-15 12:39:03 UTC
(rev 28657)
@@ -237,7 +237,7 @@
<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 hash of the public key of the authority here.</property>
+ <property name="tooltip_text" translatable="yes">Enter
the public key of the authority here.</property>
<property name="max_length">105</property>
<property name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
@@ -260,7 +260,7 @@
<object class="GtkLabel" id="edit_dialog_pkey_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>GADS
authority for the subzone (PKEY)</b></property>
+ <property name="label" translatable="yes"><b>GNS
authority for the subzone (PKEY)</b></property>
<property name="use_markup">True</property>
</object>
</child>
Modified: gnunet-gtk/contrib/gnunet_setup_gns_edit_vpn.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gns_edit_vpn.glade 2013-08-15 12:34:38 UTC
(rev 28656)
+++ gnunet-gtk/contrib/gnunet_setup_gns_edit_vpn.glade 2013-08-15 12:39:03 UTC
(rev 28657)
@@ -362,7 +362,7 @@
<object class="GtkLabel" id="edit_dialog_vpn_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>GNUnet VPN
address (GADS only)</b></property>
+ <property name="label" translatable="yes"><b>GNUnet VPN
address (GNS only)</b></property>
<property name="use_markup">True</property>
</object>
</child>
Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2013-08-15
12:34:38 UTC (rev 28656)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2013-08-15
12:39:03 UTC (rev 28657)
@@ -4519,7 +4519,7 @@
<object class="GtkCellRendererCombo"
id="GNUNET_setup_gns_type_cellrenderercombo">
<property
name="model">GNUNET_setup_gns_type_liststore</property>
<property name="text_column">1</property>
- <signal name="changed"
handler="GNUNET_setup_gns_type_cellrenderercombo_changed_cb" swapped="no"/>
+ <signal name="edited"
handler="GNUNET_setup_gns_type_cellrenderercombo_edited_cb" swapped="no"/>
</object>
<attributes>
<attribute name="visible">10</attribute>
Modified: gnunet-gtk/src/setup/gnunet-setup-gns-edit.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns-edit.c 2013-08-15 12:34:38 UTC
(rev 28656)
+++ gnunet-gtk/src/setup/gnunet-setup-gns-edit.c 2013-08-15 12:39:03 UTC
(rev 28657)
@@ -1126,14 +1126,14 @@
{
GtkEditable *entry;
const gchar *preedit;
- struct GNUNET_HashCode hc;
+ struct GNUNET_CRYPTO_EccPublicKey pub;
entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
"edit_dialog_pkey_entry")),
preedit = gtk_editable_get_chars (entry, 0, -1);
if ( (NULL == preedit) ||
(GNUNET_OK !=
- GNUNET_CRYPTO_hash_from_string (preedit, &hc)) )
+ GNUNET_CRYPTO_ecc_public_key_from_string (preedit, &pub)) )
{
edit_dialog_disable_save (edc);
return;
Modified: gnunet-gtk/src/setup/gnunet-setup-gns.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns.c 2013-08-15 12:34:38 UTC (rev
28656)
+++ gnunet-gtk/src/setup/gnunet-setup-gns.c 2013-08-15 12:39:03 UTC (rev
28657)
@@ -1148,7 +1148,7 @@
show_error_message (_("Record combination not permitted"),
_("Given the existing records, adding a new record of
this type is not allowed.\n"
"CNAME and PKEY records cannot co-exist with other
records.\n"
- "NS records in GADS can only co-exist with A and AAAA
records.\n"));
+ "NS records in GNS can only co-exist with A and AAAA
records.\n"));
return GNUNET_NO;
}
return GNUNET_OK;
@@ -1296,7 +1296,7 @@
(0 != strcmp (new_text, GNUNET_GNS_MASTERZONE_STR)) )
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Name `%s' invalid for GADS/DNS (too long for a DNS
label?)\n"),
+ _("Name `%s' invalid for GNS/DNS (too long for a DNS
label?)\n"),
new_text);
gdk_beep ();
return;
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2013-08-15 12:34:38 UTC (rev
28656)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2013-08-15 12:39:03 UTC (rev
28657)
@@ -1966,7 +1966,7 @@
NULL},
- /* GADS/GNS */
+ /* GNS */
{
"GNUNET_setup_general_services_gns_checkbutton",
Modified: gnunet-gtk/src/setup/gnunet-setup.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup.c 2013-08-15 12:34:38 UTC (rev 28656)
+++ gnunet-gtk/src/setup/gnunet-setup.c 2013-08-15 12:39:03 UTC (rev 28657)
@@ -125,7 +125,7 @@
/**
* The main visible page in our main notebook changed. If the
- * GADS page is visible, hide the help text, otherwise show it.
+ * GNS page is visible, hide the help text, otherwise show it.
*/
void
GNUNET_setup_notebook_switch_page_cb (GtkNotebook *notebook,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28657 - in gnunet-gtk: contrib src/setup,
gnunet <=