[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22290 - in gnunet-gtk: contrib src/gns src/setup
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22290 - in gnunet-gtk: contrib src/gns src/setup |
Date: |
Tue, 26 Jun 2012 13:55:14 +0200 |
Author: grothoff
Date: 2012-06-26 13:55:14 +0200 (Tue, 26 Jun 2012)
New Revision: 22290
Modified:
gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
gnunet-gtk/src/gns/gnunet-gns-gtk.c
gnunet-gtk/src/setup/gnunet-setup-gns.c
Log:
-fix
Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-06-26
11:54:28 UTC (rev 22289)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-06-26
11:55:14 UTC (rev 22290)
@@ -4523,7 +4523,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="GNUNET_GNS_GTK_zone_label">
+ <object class="GtkLabel"
id="GNUNET_setup_gns_zone_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"><b>SET
TO PUBLIC KEY OF THE ZONE</b></property>
@@ -4539,8 +4539,20 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="GNUNET_setup_gns_status_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b><big>Loading...</big></b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkScrolledWindow"
id="GNUNET_setup_gns_main_scrolledwindow">
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
@@ -4648,7 +4660,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-06-26 11:54:28 UTC (rev 22289)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-06-26 11:55:14 UTC (rev 22290)
@@ -180,7 +180,7 @@
return;
if (NULL != gns->ns)
{
- GNUNET_NAMESTORE_disconnect (gns->ns, GNUNET_NO);
+ GNUNET_NAMESTORE_disconnect (gns->ns);
gns->ns = NULL;
}
if (NULL != gns->pkey)
Modified: gnunet-gtk/src/setup/gnunet-setup-gns.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns.c 2012-06-26 11:54:28 UTC (rev
22289)
+++ gnunet-gtk/src/setup/gnunet-setup-gns.c 2012-06-26 11:55:14 UTC (rev
22290)
@@ -1202,8 +1202,8 @@
GNUNET_free (zc_ctx->label);
GNUNET_free (zc_ctx);
- /* FIXME: hide message 'loading' and make tree view visible! */
-
+ gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_status_label")));
+ gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_main_scrolledwindow")));
return;
}
@@ -1348,8 +1348,6 @@
}
-
-
/**
* The user edited the preferred name (PSEU) of this namespace.
* Push the update to the namestore.
@@ -1415,6 +1413,7 @@
char *servicehome;
struct ZoneIteration_Context *zc_ctx;
GtkTreeIter toplevel;
+ GtkLabel *status_label;
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg,
"PATHS",
@@ -1435,21 +1434,23 @@
"ZONEKEY",
&keyfile))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Option `%s' missing in section `%s'\n"), "ZONEKEY", "gns");
- /* FIXME: display error message in GNS tab! */
+ status_label = GTK_LABEL (GNUNET_SETUP_get_object
("GNUNET_setup_gns_status_label"));
+ label = g_markup_printf_escaped (_("Option `%s' missing in section
`%s'\n"),
+ "ZONEKEY", "gns");
+ gtk_label_set_markup (status_label, label);
+ g_free (label);
return;
}
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using `%s'\n", keyfile);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using `%s'\n", keyfile);
pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
GNUNET_free (keyfile);
keyfile = NULL;
if (NULL == pkey)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to read or create private zone key\n"));
- /* FIXME: display error message in GNS tab! */
+ status_label = GTK_LABEL (GNUNET_SETUP_get_object
("GNUNET_setup_gns_status_label"));
+ label = g_markup_printf_escaped (_("Failed to read or create private zone
key\n"));
+ gtk_label_set_markup (status_label, label);
+ g_free (label);
return;
}
GNUNET_CRYPTO_rsa_key_get_public (pkey, &pubkey);
@@ -1462,20 +1463,20 @@
namestore = GNUNET_NAMESTORE_connect (cfg);
if (NULL == namestore)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to connect to namestore\n"));
- /* FIXME: display error message in GNS tab! */
+ status_label = GTK_LABEL (GNUNET_SETUP_get_object
("GNUNET_setup_gns_status_label"));
+ label = g_markup_printf_escaped (_("<b><big>Failed to connect to
namestore</b></big>"));
+ gtk_label_set_markup (status_label, label);
+ g_free (label);
return;
}
- /* FIXME: adjust names below... */
- ts = GTK_TREE_STORE (GNUNET_SETUP_get_object
("GNUNET_SETUP_gns_treestore"));
- ls = GTK_LIST_STORE (GNUNET_SETUP_get_object
("GNUNET_SETUP_gns_type_liststore"));
- tv = GTK_TREE_VIEW (GNUNET_SETUP_get_object
("GNUNET_SETUP_gns_main_treeview"));
+ ts = GTK_TREE_STORE (GNUNET_SETUP_get_object
("GNUNET_setup_gns_treestore"));
+ ls = GTK_LIST_STORE (GNUNET_SETUP_get_object
("GNUNET_setup_gns_type_liststore"));
+ tv = GTK_TREE_VIEW (GNUNET_SETUP_get_object
("GNUNET_setup_gns_main_treeview"));
tm = GTK_TREE_MODEL(ts);
zone_as_string = GNUNET_strdup ((char *) &shenc);
label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"),
zone_as_string);
- gtk_label_set_markup (GTK_LABEL (GNUNET_SETUP_get_object
("GNUNET_SETUP_gns_zone_label")),
+ gtk_label_set_markup (GTK_LABEL (GNUNET_SETUP_get_object
("GNUNET_setup_gns_zone_label")),
label);
g_free (label);
@@ -1497,7 +1498,6 @@
GNUNET_NAMESTORE_RF_NONE,
&zone_iteration_proc,
zc_ctx);
- /* FIXME: show message 'loading', when done make tree view visible! */
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22290 - in gnunet-gtk: contrib src/gns src/setup,
gnunet <=