diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-03-22 10:18:00 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-03-22 10:18:00 +0000 |
commit | 079f016e7345456a1c9625285fc8dc4659f34266 (patch) | |
tree | bb0a4cf405cc18e86193697a586a4a41bbb9205f | |
parent | 3b841c135724d6688f0dbd22ea07b16b2e12a2b8 (diff) | |
download | gnunet-gtk-079f016e7345456a1c9625285fc8dc4659f34266.tar.gz gnunet-gtk-079f016e7345456a1c9625285fc8dc4659f34266.zip |
- cleanup output + expand
-rw-r--r-- | src/gns/gnunet-gns-gtk.c | 1 | ||||
-rw-r--r-- | src/gns/gnunet-gns-gtk.h | 1 | ||||
-rw-r--r-- | src/gns/gnunet-gns-gtk_zone.c | 10 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c index f1fdeac4..dcf4ca67 100644 --- a/src/gns/gnunet-gns-gtk.c +++ b/src/gns/gnunet-gns-gtk.c | |||
@@ -434,6 +434,7 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t | |||
434 | gns->main_window = GTK_WIDGET (get_object ("GNUNET_GNS_GTK_main_window")); | 434 | gns->main_window = GTK_WIDGET (get_object ("GNUNET_GNS_GTK_main_window")); |
435 | gns->ts = GTK_TREE_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_treestore")); | 435 | gns->ts = GTK_TREE_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_treestore")); |
436 | gns->ls = GTK_LIST_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_type_liststore")); | 436 | gns->ls = GTK_LIST_STORE (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_type_liststore")); |
437 | gns->tv = GTK_TREE_VIEW (gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_main_treeview")); | ||
437 | gns->tm = GTK_TREE_MODEL(gns->ts); | 438 | gns->tm = GTK_TREE_MODEL(gns->ts); |
438 | gns->shorten_menu = GTK_CHECK_MENU_ITEM(gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_autoshort_imagemenuitem")); | 439 | gns->shorten_menu = GTK_CHECK_MENU_ITEM(gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_autoshort_imagemenuitem")); |
439 | if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (get_configuration (), | 440 | if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (get_configuration (), |
diff --git a/src/gns/gnunet-gns-gtk.h b/src/gns/gnunet-gns-gtk.h index 9c554aee..cbc899b4 100644 --- a/src/gns/gnunet-gns-gtk.h +++ b/src/gns/gnunet-gns-gtk.h | |||
@@ -43,6 +43,7 @@ struct GNUNET_GNS_Context | |||
43 | GtkTreeStore *ts; | 43 | GtkTreeStore *ts; |
44 | GtkListStore *ls; | 44 | GtkListStore *ls; |
45 | GtkTreeModel *tm; | 45 | GtkTreeModel *tm; |
46 | GtkTreeView *tv; | ||
46 | 47 | ||
47 | struct GNUNET_CRYPTO_RsaPrivateKey *pkey; | 48 | struct GNUNET_CRYPTO_RsaPrivateKey *pkey; |
48 | struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; | 49 | struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; |
diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c index b23d946f..cc306e67 100644 --- a/src/gns/gnunet-gns-gtk_zone.c +++ b/src/gns/gnunet-gns-gtk_zone.c | |||
@@ -271,7 +271,8 @@ check_name_validity_and_remove (struct GNUNET_GNS_Context *gns, gchar *path) | |||
271 | 271 | ||
272 | if (TRUE == gtk_tree_model_iter_parent (gns->tm, &parent, &it)) | 272 | if (TRUE == gtk_tree_model_iter_parent (gns->tm, &parent, &it)) |
273 | { | 273 | { |
274 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Removing single record\n"); | 274 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
275 | "Removing single record for name `%s'\n", name); | ||
275 | 276 | ||
276 | gtk_tree_model_get(gns->tm, &it, | 277 | gtk_tree_model_get(gns->tm, &it, |
277 | TREE_COL_NAME, &n_name, | 278 | TREE_COL_NAME, &n_name, |
@@ -383,6 +384,7 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo, | |||
383 | else if ((NULL != name_str) && (0 != strcmp (NEW_NAME_STR, name_str))) | 384 | else if ((NULL != name_str) && (0 != strcmp (NEW_NAME_STR, name_str))) |
384 | { | 385 | { |
385 | /* Adding a new record */ | 386 | /* Adding a new record */ |
387 | |||
386 | gtk_tree_store_insert_with_values(gns->ts, &child , &it, 0, | 388 | gtk_tree_store_insert_with_values(gns->ts, &child , &it, 0, |
387 | TREE_COL_NAME, name_str, | 389 | TREE_COL_NAME, name_str, |
388 | TREE_COL_NAME_IS_VISIBLE, FALSE, | 390 | TREE_COL_NAME_IS_VISIBLE, FALSE, |
@@ -394,6 +396,7 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo, | |||
394 | TREE_COL_IS_RECORD_ROW, GNUNET_YES, | 396 | TREE_COL_IS_RECORD_ROW, GNUNET_YES, |
395 | TREE_COL_NOT_DUMMY_ROW, GNUNET_YES, | 397 | TREE_COL_NOT_DUMMY_ROW, GNUNET_YES, |
396 | -1); | 398 | -1); |
399 | gtk_tree_view_expand_row (gns->tv, gtk_tree_model_get_path(gns->tm, &it), 0); | ||
397 | 400 | ||
398 | } | 401 | } |
399 | GNUNET_free (type_str); | 402 | GNUNET_free (type_str); |
@@ -587,7 +590,7 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer, | |||
587 | GtkTreeModel *tm = GTK_TREE_MODEL(gns->ts); | 590 | GtkTreeModel *tm = GTK_TREE_MODEL(gns->ts); |
588 | int not_dummy; | 591 | int not_dummy; |
589 | 592 | ||
590 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "New text for `%s' is `%s'\n", path, new_text); | 593 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New text for `%s' is `%s'\n", path, new_text); |
591 | if ((0 == strcmp (new_text, NEW_NAME_STR)) || (0 == strcmp (new_text, ""))) | 594 | if ((0 == strcmp (new_text, NEW_NAME_STR)) || (0 == strcmp (new_text, ""))) |
592 | return; | 595 | return; |
593 | 596 | ||
@@ -686,7 +689,6 @@ void set_exp (struct GNUNET_GNS_Context *gns, char * exp) | |||
686 | /* this is a single record */ | 689 | /* this is a single record */ |
687 | renderer = GTK_CELL_RENDERER_TEXT((gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_name_cellrenderertext"))); | 690 | renderer = GTK_CELL_RENDERER_TEXT((gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_name_cellrenderertext"))); |
688 | path = gtk_tree_model_get_string_from_iter (tm, &it); | 691 | path = gtk_tree_model_get_string_from_iter (tm, &it); |
689 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "PATH `%s'\n", path); | ||
690 | GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (renderer, | 692 | GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb (renderer, |
691 | path, | 693 | path, |
692 | exp, | 694 | exp, |
@@ -866,7 +868,7 @@ void zone_iteration_proc (void *cls, | |||
866 | /* Append elements for records */ | 868 | /* Append elements for records */ |
867 | for (c = 0; c < rd_count; c ++) | 869 | for (c = 0; c < rd_count; c ++) |
868 | { | 870 | { |
869 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Record %u: type %u flags %u expiration %llu data_size %u\n", | 871 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Record %u: type %u flags %u expiration %llu data_size %u\n", |
870 | c, rd[c].record_type, rd[c].flags, rd[c].expiration, rd[c].data_size); | 872 | c, rd[c].record_type, rd[c].flags, rd[c].expiration, rd[c].data_size); |
871 | 873 | ||
872 | /* Set public toggle */ | 874 | /* Set public toggle */ |