diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-03-22 13:15:22 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-03-22 13:15:22 +0000 |
commit | dca397cfa4b7c7acec558552f4baf50a3d25b562 (patch) | |
tree | 681364c7a37214de731c925afbde89f2cb35ea4f | |
parent | f5ac42daf4247b0b51e67f30022427466342ecd1 (diff) | |
download | gnunet-gtk-dca397cfa4b7c7acec558552f4baf50a3d25b562.tar.gz gnunet-gtk-dca397cfa4b7c7acec558552f4baf50a3d25b562.zip |
- fileopen fix
-rw-r--r-- | src/gns/gnunet-gns-gtk.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c index dcf4ca67..70fa5314 100644 --- a/src/gns/gnunet-gns-gtk.c +++ b/src/gns/gnunet-gns-gtk.c | |||
@@ -237,15 +237,18 @@ GNUNET_GNS_GTK_zone_open_dialog_response_cb (GtkDialog * dialog, | |||
237 | if (GTK_RESPONSE_OK != response_id) | 237 | if (GTK_RESPONSE_OK != response_id) |
238 | { | 238 | { |
239 | gtk_widget_destroy (GTK_WIDGET (dialog)); | 239 | gtk_widget_destroy (GTK_WIDGET (dialog)); |
240 | g_object_unref (G_OBJECT (builder)); | 240 | g_object_unref (G_OBJECT (dialog)); |
241 | return; | 241 | return; |
242 | } | 242 | } |
243 | filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog)); | 243 | filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog)); |
244 | gtk_widget_destroy (GTK_WIDGET (dialog)); | 244 | gtk_widget_destroy (GTK_WIDGET (dialog)); |
245 | g_object_unref (G_OBJECT (builder)); | 245 | g_object_unref (G_OBJECT (dialog)); |
246 | 246 | ||
247 | /* FIXME: move to new zone 'filename' */ | 247 | /* FIXME: move to new zone 'filename' */ |
248 | fprintf (stderr, "Got zone `%s'\n", filename); | 248 | fprintf (stderr, "Got zone `%s'\n", filename); |
249 | |||
250 | fork(); | ||
251 | |||
249 | GNUNET_free (filename); | 252 | GNUNET_free (filename); |
250 | } | 253 | } |
251 | 254 | ||
@@ -367,6 +370,7 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t | |||
367 | GtkWidget *dialog; | 370 | GtkWidget *dialog; |
368 | char *label; | 371 | char *label; |
369 | char *keyfile; | 372 | char *keyfile; |
373 | char *servicehome; | ||
370 | 374 | ||
371 | gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context)); | 375 | gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context)); |
372 | 376 | ||
@@ -386,6 +390,19 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t | |||
386 | return; | 390 | return; |
387 | } | 391 | } |
388 | 392 | ||
393 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (), | ||
394 | "PATHS", | ||
395 | "SERVICEHOME", | ||
396 | &servicehome)) | ||
397 | { | ||
398 | GNUNET_asprintf(&zonekey_directory, ""); | ||
399 | } | ||
400 | else | ||
401 | { | ||
402 | GNUNET_asprintf(&zonekey_directory, "%s%s%s",servicehome, DIR_SEPARATOR_STR, "gns"); | ||
403 | GNUNET_free (servicehome); | ||
404 | } | ||
405 | |||
389 | /* setup crypto keys */ | 406 | /* setup crypto keys */ |
390 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (), | 407 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (), |
391 | "gns", | 408 | "gns", |