[GNUnet-SVN] r33581 - in gnunet-gtk: contrib src/namestore

[gnunet]

Author: grothoff
Date: 2014-06-07 15:46:32 +0200 (Sat, 07 Jun 2014)
New Revision: 33581

Modified:
   gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade
   gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
Log:
use changed signal instead of edited to immediately popup dialog upon record 
type selection

Modified: gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade   2014-06-07 
13:32:22 UTC (rev 33580)
+++ gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade   2014-06-07 
13:46:32 UTC (rev 33581)
@@ -105,6 +105,14 @@
         <col id="0">65542</col>
         <col id="1">PHONE</col>
       </row>
+      <row>
+        <col id="0">33</col>
+        <col id="1" translatable="yes">SRV</col>
+      </row>
+      <row>
+        <col id="0">52</col>
+        <col id="1" translatable="yes">TLSA</col>
+      </row>
     </data>
   </object>
   <object class="GtkListStore" id="zone_liststore">
@@ -365,7 +373,7 @@
                           <object class="GtkCellRendererCombo" 
id="gnunet_namestore_gtk_type_cellrenderercombo">
                             <property 
name="model">gnunet_namestore_gtk_type_liststore</property>
                             <property name="text_column">1</property>
-                            <signal name="edited" 
handler="gnunet_namestore_gtk_type_cellrenderercombo_edited_cb" swapped="no"/>
+                            <signal name="changed" 
handler="gnunet_namestore_gtk_type_cellrenderercombo_changed_cb" swapped="no"/>
                           </object>
                           <attributes>
                             <attribute name="visible">10</attribute>

Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c     2014-06-07 13:32:22 UTC 
(rev 33580)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c     2014-06-07 13:46:32 UTC 
(rev 33581)
@@ -1746,33 +1746,27 @@
  *
  * @param text renderer updated renderer
  * @param path_string the path identifying the edited cell
- * @param new_text updated text
+ * @param iter selected position
  * @param user_data unused
  */
 void
-gnunet_namestore_gtk_type_cellrenderercombo_edited_cb (GtkCellRendererText 
*text,
-                                                       gchar *path_string,
-                                                       gchar *new_text,
-                                                       gpointer user_data)
+gnunet_namestore_gtk_type_cellrenderercombo_changed_cb (GtkCellRendererText 
*text,
+                                                        gchar *path_string,
+                                                        GtkTreeIter *iter,
+                                                        gpointer user_data)
 {
   GtkTreeIter it;
   guint type;
   char *name_str;
   struct GNUNET_HashCode name_hash;
   struct RecordInfo *ri;
+  GtkTreeModel *types;
 
-  if (0 == strcmp (new_text, _(NEW_RECORD_STR)))
-    return; /* no record type was selected */
-  type = GNUNET_GNSRECORD_typename_to_number (new_text);
-  if (UINT32_MAX == type)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-               "Invalid or unsupported record type `%s'\n",
-               new_text);
-    show_error_message (_("Unsupported record type"),
-                       new_text);
-    return;
-  }
+  types = GTK_TREE_MODEL (get_object ("gnunet_namestore_gtk_type_liststore"));
+  gtk_tree_model_get (types,
+                      iter,
+                      GNS_TYPE_TO_NAME_LISTSTORE_COLUMN_TYPE, &type,
+                      -1);
   /* check if this is a new record */
   gtk_tree_model_get_iter_from_string (tm, &it, path_string);
   gtk_tree_model_get (tm, &it,