diff options
Diffstat (limited to 'src/fs/gnunet-fs-gtk_main-window-search.c')
-rw-r--r-- | src/fs/gnunet-fs-gtk_main-window-search.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c index d23cb656..438a9517 100644 --- a/src/fs/gnunet-fs-gtk_main-window-search.c +++ b/src/fs/gnunet-fs-gtk_main-window-search.c | |||
@@ -43,8 +43,10 @@ static void | |||
43 | beep () | 43 | beep () |
44 | { | 44 | { |
45 | gdk_display_beep (gdk_screen_get_display ( | 45 | gdk_display_beep (gdk_screen_get_display ( |
46 | gdk_window_get_screen (gtk_widget_get_parent_window (GTK_WIDGET ( | 46 | gdk_window_get_screen (gtk_widget_get_parent_window ( |
47 | GNUNET_FS_GTK_get_main_window_object ("GNUNET_GTK_main_window")))))); | 47 | GTK_WIDGET ( |
48 | GNUNET_FS_GTK_get_main_window_object ( | ||
49 | "GNUNET_GTK_main_window")))))); | ||
48 | } | 50 | } |
49 | 51 | ||
50 | 52 | ||
@@ -178,7 +180,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx) | |||
178 | GtkTreeIter iter; | 180 | GtkTreeIter iter; |
179 | 181 | ||
180 | mime_combo = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ( | 182 | mime_combo = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ( |
181 | "main_window_search_mime_combobox")); | 183 | "main_window_search_mime_combobox")); |
182 | mime_model = gtk_combo_box_get_model (mime_combo); | 184 | mime_model = gtk_combo_box_get_model (mime_combo); |
183 | mime_keyword = NULL; | 185 | mime_keyword = NULL; |
184 | if ((NULL != mime_model) && | 186 | if ((NULL != mime_model) && |
@@ -198,7 +200,7 @@ start_search (struct GNUNET_GTK_MainWindowContext *main_ctx) | |||
198 | GtkComboBox *namespace_box; | 200 | GtkComboBox *namespace_box; |
199 | 201 | ||
200 | namespace_box = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ( | 202 | namespace_box = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ( |
201 | "main_window_search_namespace_combobox")); | 203 | "main_window_search_namespace_combobox")); |
202 | nsid = gtk_entry_get_text ( | 204 | nsid = gtk_entry_get_text ( |
203 | GTK_ENTRY (gtk_bin_get_child (GTK_BIN (namespace_box)))); | 205 | GTK_ENTRY (gtk_bin_get_child (GTK_BIN (namespace_box)))); |
204 | if ((NULL != nsid) && ((0 == strcasecmp (nsid, "<none>")) || | 206 | if ((NULL != nsid) && ((0 == strcasecmp (nsid, "<none>")) || |
@@ -362,9 +364,9 @@ abort_pseu_lookup (struct PseuLookupContext *lctx) | |||
362 | * operation. | 364 | * operation. |
363 | * | 365 | * |
364 | * @param cls closure | 366 | * @param cls closure |
365 | * @param success #GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate) | 367 | * @param success #GNUNET_SYSERR on failure (including timeout/queue |
366 | * #GNUNET_NO if content was already there or not found | 368 | * drop/failure to validate) #GNUNET_NO if content was already there or not |
367 | * #GNUNET_YES (or other positive value) on success | 369 | * found #GNUNET_YES (or other positive value) on success |
368 | * @param emsg NULL on success, otherwise an error message | 370 | * @param emsg NULL on success, otherwise an error message |
369 | */ | 371 | */ |
370 | static void | 372 | static void |
@@ -416,13 +418,15 @@ save_pseudonym_with_nick (struct PseuLookupContext *lctx, const char *nick) | |||
416 | main_ctx = GNUNET_FS_GTK_get_main_context (); | 418 | main_ctx = GNUNET_FS_GTK_get_main_context (); |
417 | lctx->namestore = GNUNET_NAMESTORE_connect (main_ctx->cfg); | 419 | lctx->namestore = GNUNET_NAMESTORE_connect (main_ctx->cfg); |
418 | GNUNET_assert (NULL != lctx->namestore); | 420 | GNUNET_assert (NULL != lctx->namestore); |
419 | lctx->qe = GNUNET_NAMESTORE_records_store (lctx->namestore, | 421 | lctx->qe = |
420 | main_ctx->sks_zone, | 422 | GNUNET_NAMESTORE_records_store (lctx->namestore, |
421 | nick, | 423 | GNUNET_IDENTITY_ego_get_private_key ( |
422 | 1, | 424 | main_ctx->sks_zone), |
423 | &rd, | 425 | nick, |
424 | &store_continuation, | 426 | 1, |
425 | lctx); | 427 | &rd, |
428 | &store_continuation, | ||
429 | lctx); | ||
426 | } | 430 | } |
427 | 431 | ||
428 | 432 | ||
@@ -667,7 +671,7 @@ GNUNET_FS_GTK_save_button_clicked_cb (GtkButton *button, gpointer user_data) | |||
667 | return; | 671 | return; |
668 | } | 672 | } |
669 | widget = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ( | 673 | widget = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ( |
670 | "main_window_search_namespace_combobox")); | 674 | "main_window_search_namespace_combobox")); |
671 | text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget)))); | 675 | text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget)))); |
672 | ret = GNUNET_GNSRECORD_zkey_to_pkey (text, &pkey); | 676 | ret = GNUNET_GNSRECORD_zkey_to_pkey (text, &pkey); |
673 | if (GNUNET_OK != ret) | 677 | if (GNUNET_OK != ret) |