diff options
Diffstat (limited to 'src/identity/gnunet-identity-gtk_advertise.c')
-rw-r--r-- | src/identity/gnunet-identity-gtk_advertise.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/identity/gnunet-identity-gtk_advertise.c b/src/identity/gnunet-identity-gtk_advertise.c index 07ce5a01..60f8e8ea 100644 --- a/src/identity/gnunet-identity-gtk_advertise.c +++ b/src/identity/gnunet-identity-gtk_advertise.c | |||
@@ -34,16 +34,16 @@ | |||
34 | /** | 34 | /** |
35 | * Types of metadata we offer for namespaces. | 35 | * Types of metadata we offer for namespaces. |
36 | */ | 36 | */ |
37 | static gint types[] = | 37 | static gint types[] = |
38 | { | 38 | { |
39 | EXTRACTOR_METATYPE_TITLE, | 39 | EXTRACTOR_METATYPE_TITLE, |
40 | EXTRACTOR_METATYPE_KEYWORDS, | 40 | EXTRACTOR_METATYPE_KEYWORDS, |
41 | EXTRACTOR_METATYPE_SUBJECT, | 41 | EXTRACTOR_METATYPE_SUBJECT, |
42 | EXTRACTOR_METATYPE_DESCRIPTION, | 42 | EXTRACTOR_METATYPE_DESCRIPTION, |
43 | EXTRACTOR_METATYPE_COMMENT, | 43 | EXTRACTOR_METATYPE_COMMENT, |
44 | EXTRACTOR_METATYPE_COPYRIGHT, | 44 | EXTRACTOR_METATYPE_COPYRIGHT, |
45 | EXTRACTOR_METATYPE_URI, | 45 | EXTRACTOR_METATYPE_URI, |
46 | EXTRACTOR_METATYPE_CREATOR, | 46 | EXTRACTOR_METATYPE_CREATOR, |
47 | EXTRACTOR_METATYPE_CREATION_DATE, | 47 | EXTRACTOR_METATYPE_CREATION_DATE, |
48 | EXTRACTOR_METATYPE_RESERVED | 48 | EXTRACTOR_METATYPE_RESERVED |
49 | }; | 49 | }; |
@@ -59,17 +59,17 @@ enum METADATA_ModelColumns | |||
59 | * A guint | 59 | * A guint |
60 | */ | 60 | */ |
61 | METADATA_MC_TYPE_AS_ENUM = 0, | 61 | METADATA_MC_TYPE_AS_ENUM = 0, |
62 | 62 | ||
63 | /** | 63 | /** |
64 | * A gchararray | 64 | * A gchararray |
65 | */ | 65 | */ |
66 | METADATA_MC_TYPE_AS_STRING = 1, | 66 | METADATA_MC_TYPE_AS_STRING = 1, |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * A gchararray | 69 | * A gchararray |
70 | */ | 70 | */ |
71 | METADATA_MC_VALUE = 2 | 71 | METADATA_MC_VALUE = 2 |
72 | 72 | ||
73 | }; | 73 | }; |
74 | 74 | ||
75 | 75 | ||
@@ -80,7 +80,7 @@ enum KEYWORDS_ModelColumns | |||
80 | { | 80 | { |
81 | 81 | ||
82 | /** | 82 | /** |
83 | * A gchararray | 83 | * A gchararray |
84 | */ | 84 | */ |
85 | KEYWORDS_MC_KEYWORD = 0 | 85 | KEYWORDS_MC_KEYWORD = 0 |
86 | 86 | ||
@@ -94,15 +94,15 @@ enum METATYPES_ModelColumns | |||
94 | { | 94 | { |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * A gchararray | 97 | * A gchararray |
98 | */ | 98 | */ |
99 | METATYPES_MC_TYPE_AS_STRING = 0, | 99 | METATYPES_MC_TYPE_AS_STRING = 0, |
100 | 100 | ||
101 | /** | 101 | /** |
102 | * A guint | 102 | * A guint |
103 | */ | 103 | */ |
104 | METATYPES_MC_TYPE_AS_ENUM = 1 | 104 | METATYPES_MC_TYPE_AS_ENUM = 1 |
105 | 105 | ||
106 | }; | 106 | }; |
107 | 107 | ||
108 | 108 | ||
@@ -115,8 +115,8 @@ struct AdvertiseContext | |||
115 | * Builder for accessing objects in the dialog. | 115 | * Builder for accessing objects in the dialog. |
116 | */ | 116 | */ |
117 | GtkBuilder *builder; | 117 | GtkBuilder *builder; |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * Private key of the namespace we will be advertising. | 120 | * Private key of the namespace we will be advertising. |
121 | */ | 121 | */ |
122 | struct GNUNET_CRYPTO_EccPrivateKey priv; | 122 | struct GNUNET_CRYPTO_EccPrivateKey priv; |
@@ -125,7 +125,7 @@ struct AdvertiseContext | |||
125 | * Main dialog object. | 125 | * Main dialog object. |
126 | */ | 126 | */ |
127 | GtkWidget *dialog; | 127 | GtkWidget *dialog; |
128 | 128 | ||
129 | /** | 129 | /** |
130 | * List of keywords to advertise under. | 130 | * List of keywords to advertise under. |
131 | */ | 131 | */ |
@@ -224,7 +224,7 @@ publish_continuation (void *cls, | |||
224 | const char *emsg) | 224 | const char *emsg) |
225 | { | 225 | { |
226 | struct PublishContext *pc = cls; | 226 | struct PublishContext *pc = cls; |
227 | 227 | ||
228 | pc->pub = NULL; | 228 | pc->pub = NULL; |
229 | if (NULL == uri) | 229 | if (NULL == uri) |
230 | { | 230 | { |
@@ -291,15 +291,15 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
291 | const char *id; | 291 | const char *id; |
292 | 292 | ||
293 | if (GTK_RESPONSE_OK != response_id) | 293 | if (GTK_RESPONSE_OK != response_id) |
294 | goto cleanup; | 294 | goto cleanup; |
295 | ksk_uri = NULL; | 295 | ksk_uri = NULL; |
296 | if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ac->keywords), &iter)) | 296 | if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ac->keywords), &iter)) |
297 | { | 297 | { |
298 | GNUNET_break (0); | 298 | GNUNET_break (0); |
299 | goto cleanup; | 299 | goto cleanup; |
300 | } | 300 | } |
301 | do | 301 | do |
302 | { | 302 | { |
303 | gtk_tree_model_get (GTK_TREE_MODEL (ac->keywords), &iter, | 303 | gtk_tree_model_get (GTK_TREE_MODEL (ac->keywords), &iter, |
304 | KEYWORDS_MC_KEYWORD, &keyword, | 304 | KEYWORDS_MC_KEYWORD, &keyword, |
305 | -1); | 305 | -1); |
@@ -310,7 +310,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
310 | g_free (keyword); | 310 | g_free (keyword); |
311 | } | 311 | } |
312 | while (gtk_tree_model_iter_next (GTK_TREE_MODEL (ac->keywords), &iter)); | 312 | while (gtk_tree_model_iter_next (GTK_TREE_MODEL (ac->keywords), &iter)); |
313 | 313 | ||
314 | meta = GNUNET_CONTAINER_meta_data_create (); | 314 | meta = GNUNET_CONTAINER_meta_data_create (); |
315 | if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ac->metadata), | 315 | if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ac->metadata), |
316 | &iter)) | 316 | &iter)) |
@@ -323,7 +323,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
323 | -1); | 323 | -1); |
324 | if (ntype > 0) | 324 | if (ntype > 0) |
325 | { | 325 | { |
326 | GNUNET_CONTAINER_meta_data_insert (meta, "<user>", | 326 | GNUNET_CONTAINER_meta_data_insert (meta, "<user>", |
327 | ntype, | 327 | ntype, |
328 | EXTRACTOR_METAFORMAT_UTF8, | 328 | EXTRACTOR_METAFORMAT_UTF8, |
329 | "text/plain", value, | 329 | "text/plain", value, |
@@ -335,8 +335,8 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
335 | } | 335 | } |
336 | 336 | ||
337 | bo.expiration_time = GNUNET_GTK_get_expiration_time | 337 | bo.expiration_time = GNUNET_GTK_get_expiration_time |
338 | (GTK_SPIN_BUTTON | 338 | (GTK_SPIN_BUTTON |
339 | (gtk_builder_get_object | 339 | (gtk_builder_get_object |
340 | (ac->builder, | 340 | (ac->builder, |
341 | "GNUNET_GTK_identity_advertise_expiration_year_spin_button"))); | 341 | "GNUNET_GTK_identity_advertise_expiration_year_spin_button"))); |
342 | anonymity = 1; | 342 | anonymity = 1; |
@@ -346,21 +346,21 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
346 | bo.anonymity_level = anonymity; | 346 | bo.anonymity_level = anonymity; |
347 | bo.content_priority | 347 | bo.content_priority |
348 | = (unsigned int) gtk_spin_button_get_value | 348 | = (unsigned int) gtk_spin_button_get_value |
349 | (GTK_SPIN_BUTTON | 349 | (GTK_SPIN_BUTTON |
350 | (gtk_builder_get_object | 350 | (gtk_builder_get_object |
351 | (ac->builder, | 351 | (ac->builder, |
352 | "GNUNET_GTK_identity_advertise_priority_spin_button"))); | 352 | "GNUNET_GTK_identity_advertise_priority_spin_button"))); |
353 | bo.replication_level | 353 | bo.replication_level |
354 | = (unsigned int) gtk_spin_button_get_value | 354 | = (unsigned int) gtk_spin_button_get_value |
355 | (GTK_SPIN_BUTTON | 355 | (GTK_SPIN_BUTTON |
356 | (gtk_builder_get_object | 356 | (gtk_builder_get_object |
357 | (ac->builder, | 357 | (ac->builder, |
358 | "GNUNET_GTK_identity_advertise_replication_spin_button"))); | 358 | "GNUNET_GTK_identity_advertise_replication_spin_button"))); |
359 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (&ac->priv, | 359 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (&ac->priv, |
360 | &pk); | 360 | &pk); |
361 | id = gtk_entry_get_text | 361 | id = gtk_entry_get_text |
362 | (GTK_ENTRY | 362 | (GTK_ENTRY |
363 | (gtk_builder_get_object | 363 | (gtk_builder_get_object |
364 | (ac->builder, | 364 | (ac->builder, |
365 | "GNUNET_GTK_identity_advertise_root_entry"))); | 365 | "GNUNET_GTK_identity_advertise_root_entry"))); |
366 | uri = GNUNET_FS_uri_sks_create (&pk, id); | 366 | uri = GNUNET_FS_uri_sks_create (&pk, id); |
@@ -389,7 +389,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
389 | GNUNET_free (ac); | 389 | GNUNET_free (ac); |
390 | } | 390 | } |
391 | 391 | ||
392 | 392 | ||
393 | /** | 393 | /** |
394 | * User edited keywords in the keyword tree view. Update | 394 | * User edited keywords in the keyword tree view. Update |
395 | * the model accordingly. | 395 | * the model accordingly. |
@@ -398,7 +398,7 @@ GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog, | |||
398 | * @param path the path identifying the edited cell | 398 | * @param path the path identifying the edited cell |
399 | * @param new_text the new text | 399 | * @param new_text the new text |
400 | * @param user_data the 'struct AdvertiseContext' | 400 | * @param user_data the 'struct AdvertiseContext' |
401 | */ | 401 | */ |
402 | void | 402 | void |
403 | GNUNET_GTK_identity_advertise_keywords_text_edited_cb (GtkCellRendererText *renderer, | 403 | GNUNET_GTK_identity_advertise_keywords_text_edited_cb (GtkCellRendererText *renderer, |
404 | gchar *path, | 404 | gchar *path, |
@@ -454,7 +454,7 @@ GNUNET_GTK_identity_advertise_keywords_text_edited_cb (GtkCellRendererText *rend | |||
454 | } | 454 | } |
455 | } | 455 | } |
456 | g_free (old_text); | 456 | g_free (old_text); |
457 | gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object | 457 | gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object |
458 | (ac->builder, | 458 | (ac->builder, |
459 | "GNUNET_GTK_identity_advertise_ok_button")), | 459 | "GNUNET_GTK_identity_advertise_ok_button")), |
460 | 0 != ac->num_keywords); | 460 | 0 != ac->num_keywords); |
@@ -482,7 +482,7 @@ GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb (GtkWidget *w | |||
482 | 482 | ||
483 | if (event->keyval != GDK_KEY_Delete) | 483 | if (event->keyval != GDK_KEY_Delete) |
484 | return FALSE; | 484 | return FALSE; |
485 | sel = gtk_tree_view_get_selection (GTK_TREE_VIEW | 485 | sel = gtk_tree_view_get_selection (GTK_TREE_VIEW |
486 | (gtk_builder_get_object | 486 | (gtk_builder_get_object |
487 | (ac->builder, | 487 | (ac->builder, |
488 | "GNUNET_GTK_identity_advertise_metadata_treeview"))); | 488 | "GNUNET_GTK_identity_advertise_metadata_treeview"))); |
@@ -559,8 +559,8 @@ GNUNET_GTK_identity_advertise_metadata_value_entry_changed_cb (GtkEditable *edit | |||
559 | 559 | ||
560 | value_entry = GTK_ENTRY (gtk_builder_get_object (ac->builder, | 560 | value_entry = GTK_ENTRY (gtk_builder_get_object (ac->builder, |
561 | "GNUNET_GTK_identity_advertise_metadata_value_entry")); | 561 | "GNUNET_GTK_identity_advertise_metadata_value_entry")); |
562 | value = gtk_entry_get_text (value_entry); | 562 | value = gtk_entry_get_text (value_entry); |
563 | add_button = GTK_WIDGET (gtk_builder_get_object (ac->builder, | 563 | add_button = GTK_WIDGET (gtk_builder_get_object (ac->builder, |
564 | "GNUNET_GTK_identity_advertise_metadata_add_button")); | 564 | "GNUNET_GTK_identity_advertise_metadata_add_button")); |
565 | if ( (NULL == value) || | 565 | if ( (NULL == value) || |
566 | (0 == strlen (value)) ) | 566 | (0 == strlen (value)) ) |
@@ -608,7 +608,7 @@ GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb (GtkButton * button | |||
608 | type_as_string = EXTRACTOR_metatype_to_string (type); | 608 | type_as_string = EXTRACTOR_metatype_to_string (type); |
609 | value_entry = GTK_ENTRY (gtk_builder_get_object (ac->builder, | 609 | value_entry = GTK_ENTRY (gtk_builder_get_object (ac->builder, |
610 | "GNUNET_GTK_identity_advertise_metadata_value_entry")); | 610 | "GNUNET_GTK_identity_advertise_metadata_value_entry")); |
611 | value = gtk_entry_get_text (value_entry); | 611 | value = gtk_entry_get_text (value_entry); |
612 | if ( (NULL == value) || | 612 | if ( (NULL == value) || |
613 | (0 == strlen (value)) ) | 613 | (0 == strlen (value)) ) |
614 | { | 614 | { |
@@ -657,10 +657,10 @@ GIG_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EccPrivateKey *priv) | |||
657 | (ac->builder, "GNUNET_GTK_identity_advertise_metadata_liststore")); | 657 | (ac->builder, "GNUNET_GTK_identity_advertise_metadata_liststore")); |
658 | ac->meta_types = GTK_LIST_STORE (gtk_builder_get_object | 658 | ac->meta_types = GTK_LIST_STORE (gtk_builder_get_object |
659 | (ac->builder, "GNUNET_GTK_identity_metadata_types_liststore")); | 659 | (ac->builder, "GNUNET_GTK_identity_metadata_types_liststore")); |
660 | for (i = 0; EXTRACTOR_METATYPE_RESERVED != types[i]; i++) | 660 | for (i = 0; EXTRACTOR_METATYPE_RESERVED != types[i]; i++) |
661 | { | 661 | { |
662 | gtk_list_store_insert_with_values (ac->meta_types, | 662 | gtk_list_store_insert_with_values (ac->meta_types, |
663 | &iter, G_MAXINT, | 663 | &iter, G_MAXINT, |
664 | METATYPES_MC_TYPE_AS_STRING, | 664 | METATYPES_MC_TYPE_AS_STRING, |
665 | EXTRACTOR_metatype_to_string (types[i]), | 665 | EXTRACTOR_metatype_to_string (types[i]), |
666 | METATYPES_MC_TYPE_AS_ENUM, | 666 | METATYPES_MC_TYPE_AS_ENUM, |