[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12501 - gnunet-gtk/src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12501 - gnunet-gtk/src |
Date: |
Sun, 8 Aug 2010 13:12:31 +0200 |
Author: grothoff
Date: 2010-08-08 13:12:31 +0200 (Sun, 08 Aug 2010)
New Revision: 12501
Modified:
gnunet-gtk/src/fs_event_handler.c
gnunet-gtk/src/gnunet-gtk.c
gnunet-gtk/src/main_window_file_search.c
Log:
fixes
Modified: gnunet-gtk/src/fs_event_handler.c
===================================================================
--- gnunet-gtk/src/fs_event_handler.c 2010-08-08 09:24:45 UTC (rev 12500)
+++ gnunet-gtk/src/fs_event_handler.c 2010-08-08 11:12:31 UTC (rev 12501)
@@ -1292,6 +1292,8 @@
{
struct SearchTab *utab;
struct SearchResult *sr;
+ GtkNotebook *notebook;
+ gint page;
utab = search_tab_head;
while (utab != NULL)
@@ -1310,8 +1312,17 @@
}
else
{
- /* FIXME: make 'utab' the current page */
- GNUNET_break (0);
+ /* make 'utab' the current page */
+ notebook = GTK_NOTEBOOK (GNUNET_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
+ for (page=0;page<gtk_notebook_get_n_pages (notebook);page++)
+ if (utab->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,
Modified: gnunet-gtk/src/gnunet-gtk.c
===================================================================
--- gnunet-gtk/src/gnunet-gtk.c 2010-08-08 09:24:45 UTC (rev 12500)
+++ gnunet-gtk/src/gnunet-gtk.c 2010-08-08 11:12:31 UTC (rev 12501)
@@ -584,14 +584,30 @@
}
else
{
- /* FIXME: hide FS-menu options */
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
+
"GNUNET_GTK_main_menu_file_create_pseudonym")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
+
"GNUNET_GTK_main_menu_file_advertise_pseudonym")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
+
"GNUNET_GTK_main_menu_file_publish")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
+
"GNUNET_GTK_main_menu_file_search")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
+
"GNUNET_GTK_main_menu_file_download_uri")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
+
"GNUNET_GTK_main_menu_file_open_gnunet_directory")));
+ /* FIXME: set warning in status bar... */
}
mc->pnc = GNUNET_PEERINFO_notify (cfg, sched,
&GNUNET_GTK_peerinfo_processor,
NULL);
if (mc->pnc == NULL)
{
- /* FIXME: hide peerinfo widget and menu view option */
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
+
"GNUNET_GTK_main_window_peerinfo_treeview")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (mc->builder,
+
"GNUNET_GTK_main_menu_view_neighbours")));
+ /* FIXME: set warning in status bar... */
}
/* make GUI visible */
if (!tray_only)
Modified: gnunet-gtk/src/main_window_file_search.c
===================================================================
--- gnunet-gtk/src/main_window_file_search.c 2010-08-08 09:24:45 UTC (rev
12500)
+++ gnunet-gtk/src/main_window_file_search.c 2010-08-08 11:12:31 UTC (rev
12501)
@@ -207,6 +207,8 @@
{
GtkWidget *ad;
GtkListStore *ls;
+ GtkTreeIter iter;
+ GNUNET_HashCode *nsid;
GNUNET_assert (builder == NULL);
builder = GNUNET_GTK_get_new_builder ("search_dialog.glade");
@@ -220,7 +222,23 @@
&add_namespace_to_ls,
ls);
gtk_dialog_run (GTK_DIALOG (ad));
- /* FIXME: free nsids from 'ls' */
+
+ /* free nsids from 'ls' */
+ if (TRUE ==
+ gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ls),
+ &iter))
+ {
+ do
+ {
+ gtk_tree_model_get (GTK_TREE_MODEL (ls),
+ &iter,
+ 2, &nsid,
+ -1);
+ GNUNET_free (nsid);
+ }
+ while (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (ls),
+ &iter));
+ }
gtk_widget_destroy (ad);
g_object_unref (G_OBJECT (builder));
builder = NULL;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12501 - gnunet-gtk/src,
gnunet <=