[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22414 - in gnunet-gtk: contrib src/setup
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22414 - in gnunet-gtk: contrib src/setup |
Date: |
Sun, 1 Jul 2012 17:50:56 +0200 |
Author: grothoff
Date: 2012-07-01 17:50:56 +0200 (Sun, 01 Jul 2012)
New Revision: 22414
Modified:
gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
gnunet-gtk/src/setup/gnunet-setup-gns.c
Log:
-towards multi-zone editing
Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-07-01
15:37:23 UTC (rev 22413)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-07-01
15:50:56 UTC (rev 22414)
@@ -4464,7 +4464,7 @@
</packing>
</child>
<child>
- <object class="GtkVSeparator"
id="GNUNET_setup_qr_vseparator">
+ <object class="GtkVSeparator"
id="GNUNET_setup_gns_qr_vseparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
Modified: gnunet-gtk/src/setup/gnunet-setup-gns.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns.c 2012-07-01 15:37:23 UTC (rev
22413)
+++ gnunet-gtk/src/setup/gnunet-setup-gns.c 2012-07-01 15:50:56 UTC (rev
22414)
@@ -174,11 +174,6 @@
static char *zone_as_string;
/**
- * Default directory of zone files as a string.
- */
-static char *zonekey_directory;
-
-/**
* Handle to the namestore.
*/
static struct GNUNET_NAMESTORE_Handle *namestore;
@@ -1562,7 +1557,14 @@
GNUNET_free (zc_ctx->label);
GNUNET_free (zc_ctx);
#if HAVE_QRENCODE_H
- setup_qrcode ();
+ setup_qrcode ();
+ gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_image")));
+ gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_saveas_button")));
+ gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_vseparator")));
+#else
+ gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_image")));
+ gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_saveas_button")));
+ gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_vseparator")));
#endif
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")));
@@ -1741,44 +1743,41 @@
/**
- * Connect to the namestore and initialize the main
- * GNS tree view.
+ * Load a particular zone into the main tree view.
+ *
+ * @param zonename name of the option in the configuration file
+ * with the name of the file with the private key of the
+ * zone to load
*/
-void
-GNUNET_SETUP_gns_init ()
+static void
+load_zone (const char *zonename)
{
struct GNUNET_CRYPTO_ShortHashAsciiEncoded shenc;
char *label;
char *keyfile;
- char *servicehome;
struct ZoneIteration_Context *zc_ctx;
GtkTreeIter toplevel;
- GtkLabel *status_label;
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg,
- "PATHS",
- "SERVICEHOME",
- &servicehome))
- {
- GNUNET_asprintf (&zonekey_directory, "");
- }
- else
- {
- GNUNET_asprintf (&zonekey_directory, "%s%s%s",servicehome,
DIR_SEPARATOR_STR, "gns");
- GNUNET_free (servicehome);
- }
+ /* clear previous zone */
+ gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_status_label")));
+ gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_main_scrolledwindow")));
+ gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_image")));
+ gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_saveas_button")));
+ gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_vseparator")));
+ gtk_tree_store_clear (ts);
/* setup crypto keys */
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg,
"gns",
- "ZONEKEY",
+ zonename,
&keyfile))
{
- 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);
+ GNUNET_asprintf (&label,
+ _("Option `%s' missing in section `%s'\n"),
+ zonename, "gns");
+ show_error_message (_("Failed to load zone"),
+ label);
+ GNUNET_free (label);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using `%s'\n", keyfile);
@@ -1787,10 +1786,8 @@
keyfile = NULL;
if (NULL == pkey)
{
- 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);
+ show_error_message (_("Failed to load zone"),
+ _("Failed to read or create private zone key"));
return;
}
GNUNET_CRYPTO_rsa_key_get_public (pkey, &pubkey);
@@ -1799,33 +1796,12 @@
&zone);
GNUNET_CRYPTO_short_hash_to_enc(&zone, &shenc);
- /* connect to namestore */
- namestore = GNUNET_NAMESTORE_connect (cfg);
- if (NULL == namestore)
- {
- 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;
- }
- ts = GTK_TREE_STORE (GNUNET_SETUP_get_object
("GNUNET_setup_gns_treestore"));
- 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);
-#if HAVE_QRENCODE_H
- setup_qrcode ();
-#else
- gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_image")));
- gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_saveas_button")));
- gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object
("GNUNET_setup_gns_qr_vseparator")));
-#endif
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")),
label);
g_free (label);
-
/* Load zone from namestore! */
/* Append a top level row and leave it empty */
gtk_tree_store_insert_with_values (ts, &toplevel, NULL, 0,
@@ -1847,7 +1823,57 @@
}
+void
+GNUNET_setup_gns_shorten_zone_selection_radiobutton_toggled_cb
(GtkToggleButton *togglebutton,
+ gpointer
user_data)
+{
+ GNUNET_break (0);
+}
+
+
+void
+GNUNET_setup_gns_private_zone_selection_radiobutton_toggled_cb
(GtkToggleButton *togglebutton,
+ gpointer
user_data)
+{
+ GNUNET_break (0);
+}
+
+
+void
+GNUNET_setup_gns_master_zone_selection_radiobutton_toggled_cb (GtkToggleButton
*togglebutton,
+ gpointer
user_data)
+{
+ GNUNET_break (0);
+}
+
+
/**
+ * Connect to the namestore and initialize the main
+ * GNS tree view.
+ */
+void
+GNUNET_SETUP_gns_init ()
+{
+ gchar *label;
+ GtkLabel *status_label;
+
+ namestore = GNUNET_NAMESTORE_connect (cfg);
+ if (NULL == namestore)
+ {
+ 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;
+ }
+ ts = GTK_TREE_STORE (GNUNET_SETUP_get_object
("GNUNET_setup_gns_treestore"));
+ tv = GTK_TREE_VIEW (GNUNET_SETUP_get_object
("GNUNET_setup_gns_main_treeview"));
+ tm = GTK_TREE_MODEL(ts);
+ load_zone ("ZONEKEY");
+}
+
+
+/**
* Disconnect from the namestore and clean up the main
* GNS tree view.
*/
@@ -1869,11 +1895,6 @@
GNUNET_CRYPTO_rsa_key_free (pkey);
pkey = NULL;
}
- if (NULL != zonekey_directory)
- {
- GNUNET_free (zonekey_directory);
- zonekey_directory = NULL;
- }
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22414 - in gnunet-gtk: contrib src/setup,
gnunet <=