[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16938 - gnunet-gtk/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16938 - gnunet-gtk/src/fs |
Date: |
Sun, 18 Sep 2011 15:55:43 +0200 |
Author: grothoff
Date: 2011-09-18 15:55:43 +0200 (Sun, 18 Sep 2011)
New Revision: 16938
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
Log:
fixing uri tab implementation - #1771
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c 2011-09-18 13:47:35 UTC
(rev 16937)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-event_handler.c 2011-09-18 13:55:43 UTC
(rev 16938)
@@ -32,6 +32,8 @@
static struct SearchTab *search_tab_tail;
+static struct SearchTab *uri_tab;
+
struct PublishTab
{
@@ -887,6 +889,8 @@
g_object_unref (tab->builder);
GNUNET_free (tab->query_txt);
GNUNET_CONTAINER_DLL_remove (search_tab_head, search_tab_tail, tab);
+ if (tab == uri_tab)
+ uri_tab = NULL;
GNUNET_free (tab);
}
@@ -1336,24 +1340,16 @@
const struct GNUNET_CONTAINER_MetaData *meta,
const struct GNUNET_FS_Uri *uri)
{
- struct SearchTab *utab;
struct SearchResult *sr;
GtkNotebook *notebook;
gint page;
- utab = search_tab_head;
- while (utab != NULL)
+ if (uri_tab == NULL)
{
- if (utab->sc == NULL)
- break;
- utab = utab->next;
+ uri_tab = setup_search (NULL, NULL);
+ gtk_widget_set_visible (uri_tab->close_button, FALSE);
+ gtk_widget_set_visible (uri_tab->pause_button, FALSE);
}
- if (utab == NULL)
- {
- utab = setup_search (NULL, NULL);
- gtk_widget_set_visible (utab->close_button, FALSE);
- gtk_widget_set_visible (utab->pause_button, FALSE);
- }
else
{
/* make 'utab' the current page */
@@ -1361,17 +1357,17 @@
GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
for (page = 0; page < gtk_notebook_get_n_pages (notebook); page++)
- if (utab->frame == gtk_notebook_get_nth_page (notebook, page))
+ if (uri_tab->frame == gtk_notebook_get_nth_page (notebook, page))
{
gtk_notebook_set_current_page (notebook, page);
break;
}
}
- sr = GNUNET_GTK_add_search_result (utab, iter, NULL, uri, meta, NULL, 0);
+ sr = GNUNET_GTK_add_search_result (uri_tab, iter, NULL, uri, meta, NULL, 0);
if (NULL != srp)
*srp = sr;
- return utab;
+ return uri_tab;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16938 - gnunet-gtk/src/fs,
gnunet <=