[GNUnet-SVN] r30007 - in gnunet-gtk: contrib src/setup

[gnunet]

Author: grothoff
Date: 2013-10-08 20:10:35 +0200 (Tue, 08 Oct 2013)
New Revision: 30007

Modified:
   gnunet-gtk/contrib/gnunet_setup_main_window.glade
   gnunet-gtk/src/setup/gnunet-setup-exit-services.c
Log:
finished implementing hosted service editing (#2796)

Modified: gnunet-gtk/contrib/gnunet_setup_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_main_window.glade   2013-10-08 18:05:38 UTC 
(rev 30006)
+++ gnunet-gtk/contrib/gnunet_setup_main_window.glade   2013-10-08 18:10:35 UTC 
(rev 30007)
@@ -3914,7 +3914,9 @@
                                 <property name="sort_indicator">True</property>
                                 <property name="sort_column_id">0</property>
                                 <child>
-                                  <object class="GtkCellRendererText" 
id="GNUNET_SETUP_hosted_service_identifier_cellrenderertext"/>
+                                  <object class="GtkCellRendererText" 
id="GNUNET_SETUP_hosted_service_identifier_cellrenderertext">
+                                    <property name="editable">True</property>
+                                  </object>
                                   <attributes>
                                     <attribute name="text">0</attribute>
                                   </attributes>

Modified: gnunet-gtk/src/setup/gnunet-setup-exit-services.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-exit-services.c   2013-10-08 18:05:38 UTC 
(rev 30006)
+++ gnunet-gtk/src/setup/gnunet-setup-exit-services.c   2013-10-08 18:10:35 UTC 
(rev 30007)
@@ -640,19 +640,26 @@
   struct sockaddr_in v4;
   struct sockaddr_in6 v6;
 
-  if ( (GNUNET_OK !=
+  if ( ('[' != new_text[0]) &&
+       (GNUNET_OK !=
         GNUNET_STRINGS_to_address_ipv4 (new_text, strlen (new_text),
-                                        &v4)) &&
+                                        &v4)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Illegal IPv4 destination address `%s'\n"),
+                new_text);
+    return;
+  }
+  if ( ('[' == new_text[0]) &&
        (GNUNET_OK !=
         GNUNET_STRINGS_to_address_ipv6 (new_text, strlen (new_text),
                                         &v6)) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Illegal IP destination address `%s'\n"),
+                _("Illegal IPv6 destination address `%s'\n"),
                 new_text);
     return;
   }
-
   tm = GTK_TREE_MODEL (GNUNET_SETUP_get_object 
("GNUNET_setup_hosted_service_liststore"));
   if (NULL == tm)
   {