implementing Paste button (fixes #3420)

3 files changed, 33 insertions, 2 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 78fb96e3..e66b4da1 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -70,6 +70,11 @@ static struct GNUNET_NAMESTORE_ZoneMonitor *zone_mon;
  */
 static GtkWidget *contacts_treeview;
 
+/**
+ * The "paste" button.
+ */
+static GtkWidget *b_paste;
+
 
 /**
  * A row was activated in the contacts list.  Initiate call.
@@ -263,9 +268,11 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
   if (NULL == ego)
   {
     /* ego deselected (likely shutdown) */
+    gtk_widget_set_sensitive (b_paste, FALSE);
     return;
   }
   gtk_widget_hide (contacts_treeview);
+  gtk_widget_set_sensitive (b_paste, TRUE);
   temp_zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
   zone_mon = GNUNET_NAMESTORE_zone_monitor_start (GCG_get_configuration (),
                                                   temp_zone_pkey,
@@ -375,6 +382,9 @@ GCG_CONTACTS_init ()
                       ("gnunet_conversation_gtk_contacts_liststore"));
   contacts_treemodel
     = GTK_TREE_MODEL (contacts_liststore);
+  b_paste = GTK_WIDGET (GCG_get_main_window_object
+                        ("gnunet_conversation_gtk_contacts_paste_button"));
+
 }
 
 
diff --git a/src/conversation/gnunet-conversation-gtk_get_label.c b/src/conversation/gnunet-conversation-gtk_get_label.c
index ea99fc1f..cfc41cab 100644
--- a/src/conversation/gnunet-conversation-gtk_get_label.c
+++ b/src/conversation/gnunet-conversation-gtk_get_label.c
@@ -117,6 +117,8 @@ gnunet_conversation_gtk_enter_label_entry_changed_cb (GtkEditable *editable,
     return;
   }
   ego = GCG_ZONES_get_selected_zone ();
+  if (NULL == ego)
+    return;
   pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
   qe = GNUNET_NAMESTORE_records_lookup (GCG_IMPORT_get_namestore (),
                                         pkey,
diff --git a/src/conversation/gnunet-conversation-gtk_import.c b/src/conversation/gnunet-conversation-gtk_import.c
index 1b24f1f6..71cb86c6 100644
--- a/src/conversation/gnunet-conversation-gtk_import.c
+++ b/src/conversation/gnunet-conversation-gtk_import.c
@@ -133,7 +133,15 @@ GSC_add_contact (const gchar *name,
   size_t value_size;
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *zkey;
   uint32_t type;
+  char cname[256];
 
+  if (GNUNET_OK !=
+      GNUNET_DNSPARSER_check_name (address))
+  {
+    GCG_log (_("Domain name `%s' invalid\n"),
+             address);
+    return;
+  }
   if (NULL != add_contact_qe)
   {
     GCG_log (_("Adding contact failed: %s\n"),
@@ -153,9 +161,20 @@ GSC_add_contact (const gchar *name,
   }
   else
   {
+    value_size = 0;
+    if (GNUNET_OK !=
+        GNUNET_DNSPARSER_builder_add_name (cname,
+                                           sizeof (cname),
+                                           &value_size,
+                                           address))
+    {
+      GNUNET_break (0);
+      GCG_log (_("Failed to create CNAME record for domain name `%s'\n"),
+               address);
+      return;
+    }
     type = GNUNET_DNSPARSER_TYPE_CNAME;
-    value = address;
-    value_size = strlen (address) + 1;
+    value = cname;
   }
   rd.data = value;
   rd.data_size = value_size;