[GNUnet-SVN] r32317 - gnunet-gtk/src/conversation

[gnunet]

Author: yids
Date: 2014-02-11 20:05:19 +0100 (Tue, 11 Feb 2014)
New Revision: 32317

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
Log:
- address book shows contacts again


Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-11 
18:44:25 UTC (rev 32316)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-11 
19:05:19 UTC (rev 32317)
@@ -1157,10 +1157,11 @@
   GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
   s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
 //  fprintf (stdout, "%s \n", name);
-//  gtk_list_store_insert_with_values (zone_liststore,
-//                                       &iter, -1,
-//                                       0, name,
-//                                       -1); 
+  gtk_list_store_insert_with_values (zone_liststore,
+                                       &iter, -1,
+                                       0, name,
+                                       1, ego,
+                                      -1); 
   }
 
 
@@ -1351,11 +1352,11 @@
   // zone list
   zone_liststore =
      GTK_LIST_STORE (get_object 
("gnunet_conversation_gtk_contacts_zone_liststore"));
-  //zone_treeview =
-  //    GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview"));
+  zone_treeview =
+      GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview"));
   zone_treestore =
       GTK_TREE_STORE (get_object 
("gnunet_conversation_gtk_contacts_zone_treestore"));
-  zone_treemodel = GTK_TREE_MODEL (zone_treestore);
+  zone_treemodel = GTK_TREE_MODEL (zone_liststore);
 
   //gtk_tree_view_set_activate_on_single_click(contacts_treeview, TRUE);
 
@@ -1855,6 +1856,9 @@
   struct GNUNET_IDENTITY_Ego *tempEgo;
   char *tempName;
   struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
+  GtkTreeSelection *selection;
+  GtkTreeIter iterA;
+  
 
   gtk_combo_box_get_active_iter(widget, &contacts_zone_iter);   
 
@@ -1866,13 +1870,21 @@
   FPRINTF(stderr,"blat: %s\n", tempName);
   temp_zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (tempEgo);
   gtk_list_store_clear(contacts_liststore);
-
+/*
   GNUNET_IDENTITY_ego_lookup (cfg,
                              tempName,
                              setCurrentAddressbookEgo,
                              NULL); 
-         
-  list_it =
+*/       
+  //selection = gtk_tree_view_get_selection (zone_treeview);
+  
+  //gtk_tree_selection_get_selected (selection, &zone_treemodel, &iterA);
+  
+  //gtk_tree_model_get_iter_first(zone_treemodel, &iterA);
+  //gtk_tree_model_get (zone_treemodel, &iterA, 0, &tempName, 1, &tempEgo, -1);
+ 
+
+ list_it =
     GNUNET_NAMESTORE_zone_iteration_start (ns, &temp_zone_pkey, 
&display_record,
                                            NULL);