[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20690 - gnunet-gtk/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20690 - gnunet-gtk/src/gns |
Date: |
Thu, 22 Mar 2012 19:24:58 +0100 |
Author: wachs
Date: 2012-03-22 19:24:58 +0100 (Thu, 22 Mar 2012)
New Revision: 20690
Modified:
gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
- fix
Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c 2012-03-22 18:20:49 UTC (rev
20689)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c 2012-03-22 18:24:58 UTC (rev
20690)
@@ -655,12 +655,17 @@
TREE_COL_RECORD_TYPE, &type,
TREE_COL_VAL_AS_STR, &old_value,
-1);
- if (0 == strcmp(new_text, old_value))
+
+ if (old_value != NULL)
{
- GNUNET_free(old_value);
- return;
+ if (0 == strcmp(new_text, old_value))
+ {
+ GNUNET_free (old_value);
+ return;
+ }
+ GNUNET_free (old_value);
}
- GNUNET_free(old_value);
+
if (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (type,
new_text,
&data,
@@ -890,6 +895,7 @@
struct GNUNET_GNS_Context *gns;
struct GNUNET_CRYPTO_ShortHashCode zone;
struct GNUNET_NAMESTORE_ZoneIterator * it;
+ char *label;
};
void GNUNET_GNS_GTK_delete_popup_menu_delete_cb (GtkMenuItem *menuitem,
@@ -932,8 +938,6 @@
char *val;
int public;
guint64 exp_t;
-GNUNET_break(0);
-GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s'\n", name);
GNUNET_assert (zc_ctx != NULL);
if ((NULL == zone_key) && (NULL == name))
@@ -941,6 +945,10 @@
struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
GNUNET_CRYPTO_short_hash_to_enc(&zc_ctx->zone, &shenc);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Zone `%s 'iteration done\n", &shenc);
+ pseu_entry = GTK_ENTRY((gtk_builder_get_object (zc_ctx->gns->builder,
"GNUNET_GNS_GTK_pseu_entry")));
+ GNUNET_assert (zc_ctx->label != NULL);
+ gtk_entry_set_text (pseu_entry, zc_ctx->label);
+ GNUNET_free (zc_ctx->label);
GNUNET_free (zc_ctx);
return;
}
@@ -953,8 +961,7 @@
if (0 == strcmp(name, "+"))
{
- pseu_entry = GTK_ENTRY((gtk_builder_get_object (zc_ctx->gns->builder,
"GNUNET_GNS_GTK_pseu_entry")));
- GNUNET_assert (pseu_entry != NULL);
+
if ((rd == NULL) || (rd_count != 1))
{
GNUNET_break (0);
@@ -969,8 +976,7 @@
val = GNUNET_NAMESTORE_value_to_string (rd[0].record_type,
rd[0].data,
rd[0].data_size);
- gtk_entry_set_text (pseu_entry, val);
- GNUNET_free (val);
+ zc_ctx->label = val;
GNUNET_NAMESTORE_zone_iterator_next(zc_ctx->it);
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20690 - gnunet-gtk/src/gns,
gnunet <=