aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/gnunet-conversation-gtk_contacts.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/conversation/gnunet-conversation-gtk_contacts.c')
-rw-r--r--src/conversation/gnunet-conversation-gtk_contacts.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 821d5009..bcb6d7ca 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -47,10 +47,6 @@
47 * Our configurations. 47 * Our configurations.
48 */ 48 */
49static struct GNUNET_CONFIGURATION_Handle *cfg; 49static struct GNUNET_CONFIGURATION_Handle *cfg;
50/**
51 * Name of our ego.
52 */
53static char *contacts_ego_name;
54 50
55/** 51/**
56 * Our ego. 52 * Our ego.
@@ -61,10 +57,6 @@ static struct GNUNET_IDENTITY_Ego *contacts_ego;
61 57
62//static struct GNUNET_CONFIGURATION_Handle *cfg1; 58//static struct GNUNET_CONFIGURATION_Handle *cfg1;
63//static struct GNUNET_CONFIGURATION_Handle *cfg2; 59//static struct GNUNET_CONFIGURATION_Handle *cfg2;
64/**
65 * Be verbose.
66 */
67static int verbose = 1;
68 60
69 61
70 62
@@ -89,7 +81,9 @@ static GtkListStore *zone_liststore;
89/** 81/**
90 * zone treestore 82 * zone treestore
91 */ 83 */
84/*
92static GtkTreeStore *zone_treestore; 85static GtkTreeStore *zone_treestore;
86*/
93 87
94/** 88/**
95 * zone treeview 89 * zone treeview
@@ -145,7 +139,9 @@ static struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey;
145/** 139/**
146 * Public key of the zone we are currently editing. 140 * Public key of the zone we are currently editing.
147 */ 141 */
142/*
148static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; 143static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
144*/
149 145
150 146
151 147
@@ -173,10 +169,10 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
173 const char *rname, unsigned int rd_len, 169 const char *rname, unsigned int rd_len,
174 const struct GNUNET_GNSRECORD_Data *rd) 170 const struct GNUNET_GNSRECORD_Data *rd)
175{ 171{
176 const char *typestring; 172/* const char *typestring;*/
177 char *s, *type; 173 char *s, *type;
178 unsigned int i; 174 unsigned int i;
179 const char *ets; 175/* const char *ets;*/
180 struct GNUNET_TIME_Absolute at; 176 struct GNUNET_TIME_Absolute at;
181 struct GNUNET_TIME_Relative rt; 177 struct GNUNET_TIME_Relative rt;
182 GtkTreeIter display_iter; 178 GtkTreeIter display_iter;
@@ -196,7 +192,7 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
196 if ((GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type) && 192 if ((GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type) &&
197 (0 != strcmp (rname, "+"))) 193 (0 != strcmp (rname, "+")))
198 continue; 194 continue;
199 typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type); 195/* typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);*/
200 s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type, rd[i].data, 196 s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type, rd[i].data,
201 rd[i].data_size); 197 rd[i].data_size);
202 if (NULL == s) 198 if (NULL == s)
@@ -208,12 +204,12 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
208 if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)) 204 if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
209 { 205 {
210 rt.rel_value_us = rd[i].expiration_time; 206 rt.rel_value_us = rd[i].expiration_time;
211 ets = GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_YES); 207/* ets = GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_YES);*/
212 } 208 }
213 else 209 else
214 { 210 {
215 at.abs_value_us = rd[i].expiration_time; 211 at.abs_value_us = rd[i].expiration_time;
216 ets = GNUNET_STRINGS_absolute_time_to_string (at); 212/* ets = GNUNET_STRINGS_absolute_time_to_string (at);*/
217 } 213 }
218 if (rd[i].record_type == 65536) 214 if (rd[i].record_type == 65536)
219 { 215 {
@@ -263,14 +259,18 @@ static void
263identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx, 259identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
264 const char *name) 260 const char *name)
265{ 261{
262/*
266 struct GNUNET_CRYPTO_EcdsaPublicKey pk; 263 struct GNUNET_CRYPTO_EcdsaPublicKey pk;
267 char *s; 264 char *s;
265*/
268 GtkTreeIter iter; 266 GtkTreeIter iter;
269 267
270 if (NULL != ego) 268 if (NULL != ego)
271 { 269 {
270/*
272 GNUNET_IDENTITY_ego_get_public_key (ego, &pk); 271 GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
273 s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); 272 s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
273*/
274 fprintf (stderr, "contacts idenity_cb: %s \n", name); 274 fprintf (stderr, "contacts idenity_cb: %s \n", name);
275 275
276 276
@@ -546,11 +546,13 @@ print_ego (void *cls,
546// GNUNET_free (s); 546// GNUNET_free (s);
547} 547}
548*/ 548*/
549/*
549static void 550static void
550setCurrentAddressbookEgo(void *cls, struct GNUNET_IDENTITY_Ego *ego) 551setCurrentAddressbookEgo(void *cls, struct GNUNET_IDENTITY_Ego *ego)
551{ 552{
552 currentAddressBookEgo = ego; 553 currentAddressBookEgo = ego;
553} 554}
555*/
554 556
555/** 557/**
556 * A different zone was selected in the zone toggle bar. Load the 558 * A different zone was selected in the zone toggle bar. Load the