1 files changed, 119 insertions, 142 deletions

diff --git a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
index 818caa6c..f5697ef1 100644
--- a/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
+++ b/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
@@ -48,7 +48,7 @@ static guint namespace_selector_window_leave_timeout_source;
  *
  * @param widget the dropdown widget
  * @param event the mouse-enter event
- * @param user_data the builder for the main window
+ * @param user_data the context for the main window
  */
 gboolean
 GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb (GtkWidget *widget,
@@ -85,26 +85,21 @@ namespace_selector_window_leave_timeout_cb (gpointer user_data)
  * window. It will be cancelled if the cursor re-enters the namespace
  * selector window or the toggle button within 100ms
  *
- * @param user_data the builder for the main window
+ * @param user_data the context for the main window
  */
 gboolean
 GNUNET_FS_GTK_search_namespace_selector_window_leave_notify_event_cb (GtkWidget * widget,
                                                                       GdkEvent * event,
                                                                       gpointer user_data)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
-  GtkToggleButton *toggle_button;
+  struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
 
-  toggle_button =
-      GTK_TOGGLE_BUTTON (gtk_builder_get_object
-                         (builder,
-                          "main_window_search_namespace_dropdown_button"));
   if (namespace_selector_window_leave_timeout_source > 0)
     g_source_remove (namespace_selector_window_leave_timeout_source);
   namespace_selector_window_leave_timeout_source 
     = g_timeout_add (AUTO_HIDE_TIMEOUT_MS, 
                      &namespace_selector_window_leave_timeout_cb,
-                     toggle_button);
+                     main_ctx->ns_dropdown_button);
   return FALSE;
 }
 
@@ -139,51 +134,35 @@ get_selected_row_from_treeview (GtkTreeView * tree)
  * user clicked to confirm.  Hide the drop down and display the
  * selected entry as the new namespace label.
  *
- * @param builder the builder for the main window
+ * @param main_ctx the context for the main window
  * @param tv the tree view that was updated
  */
 static void
-commit_changes (GtkBuilder *builder,
+commit_changes (struct GNUNET_GTK_MainWindowContext *main_ctx,
                 GtkTreeView *tv)
 {
-  GtkToggleButton *toggle_button;
-  GtkTreeRowReference *ref;
   GtkTreePath *treepath;
   gchar *value;
-    
-  toggle_button =
-    GTK_TOGGLE_BUTTON (gtk_builder_get_object
-                       (builder,
-                        "main_window_search_namespace_dropdown_button"));
-  ref = g_object_get_data (G_OBJECT (toggle_button), "selected-row-reference");
-  if (NULL != ref)
-    gtk_tree_row_reference_free (ref);
-  ref = get_selected_row_from_treeview (tv);
-  g_object_set_data (G_OBJECT (toggle_button), "selected-row-reference", ref);
 
-  treepath = gtk_tree_row_reference_get_path (ref);
+  if (NULL != main_ctx->selected_ns_row)
+    gtk_tree_row_reference_free (main_ctx->selected_ns_row);
+  main_ctx->selected_ns_row = get_selected_row_from_treeview (tv);
+
+  treepath = gtk_tree_row_reference_get_path (main_ctx->selected_ns_row);
   if (GNUNET_GTK_get_tree_string (tv, treepath, 0, &value))
   {
-    GtkLabel *sel_namespace_label;
-
-    sel_namespace_label =
-      GTK_LABEL (gtk_builder_get_object
-                 (builder, "main_window_search_selected_namespace_label"));
-    gtk_label_set_text (sel_namespace_label, (NULL != value) ? value : "");
+    gtk_label_set_text (main_ctx->search_ns_label, (NULL != value) ? value : "");
     g_free (value);
   }
   if (GNUNET_GTK_get_tree_string (tv, treepath, 2, &value))
   {
-    GtkEntry *search_entry;
-
-    search_entry = GTK_ENTRY (gtk_builder_get_object (builder, "main_window_search_entry"));
-    gtk_entry_set_text (search_entry, (NULL != value) ? value : "");
+    gtk_entry_set_text (main_ctx->search_entry, (NULL != value) ? value : "");
     g_free (value);
   }
   gtk_tree_path_free (treepath);
 
   /* hide the namespace selector */
-  gtk_toggle_button_set_active (toggle_button, FALSE);  
+  gtk_toggle_button_set_active (main_ctx->ns_dropdown_button, FALSE);  
 }
 
 
@@ -194,7 +173,7 @@ commit_changes (GtkBuilder *builder,
  *
  * @param widget the tree view widget
  * @param event the push event
- * @param user_data the builder for the main window
+ * @param user_data the context for the main window
  * @return FALSE
  */
 gboolean
@@ -202,13 +181,11 @@ GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb (GtkWidget * wid
                                                                  GdkEvent * event,
                                                                  gpointer user_data)
 {
-  GtkTreeRowReference *ref;
-  gpointer old = g_object_get_data (G_OBJECT (widget), "pushed-rowreference");
+  struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
 
-  if (NULL != old)
-      gtk_tree_row_reference_free (old);
-  ref = get_selected_row_from_treeview (GTK_TREE_VIEW (widget));
-  g_object_set_data (G_OBJECT (widget), "pushed-rowreference", ref);
+  if (NULL != main_ctx->ns_selector_pushed_row)
+      gtk_tree_row_reference_free (main_ctx->ns_selector_pushed_row);
+  main_ctx->ns_selector_pushed_row = get_selected_row_from_treeview (GTK_TREE_VIEW (widget));
   return FALSE;
 }
 
@@ -216,13 +193,11 @@ GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb (GtkWidget * wid
 /**
  * User released the button in the treeview.  Get the selected entry
  * and update the cursor accordingly, but only if the user pushed the
- * button down and released it in the same row.  We have stored the
- * row that the user selected when pushing the button down in the
- * "pushed-rowreference" of the widget.
+ * button down and released it in the same row.
  *
  * @param widget the tree view widget
  * @param event the release event
- * @param user_data the builder for the main window
+ * @param user_data the context for the main window
  * @return FALSE
  */
 gboolean
@@ -230,20 +205,19 @@ GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb (GtkWidget * w
                                                                    GdkEvent * event,
                                                                    gpointer user_data)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
+  struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
   GtkTreeRowReference *ref;
-  gpointer old = g_object_get_data (G_OBJECT (widget), "pushed-rowreference");
 
   ref = get_selected_row_from_treeview (GTK_TREE_VIEW (widget));
-  if ( (NULL != ref) && (NULL != old))
+  if ( (NULL != ref) && (NULL != main_ctx->ns_selector_pushed_row))
   {
     GtkTreePath *path_ref;
     GtkTreePath *path_old;
 
     path_ref = gtk_tree_row_reference_get_path (ref);
-    path_old = gtk_tree_row_reference_get_path (old);
+    path_old = gtk_tree_row_reference_get_path (main_ctx->ns_selector_pushed_row);
     if (0 == gtk_tree_path_compare (path_ref, path_old))
-      commit_changes (builder, GTK_TREE_VIEW (widget));
+      commit_changes (main_ctx, GTK_TREE_VIEW (widget));
     if (path_ref)
       gtk_tree_path_free (path_ref);
     if (path_old)
@@ -251,9 +225,9 @@ GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb (GtkWidget * w
   }
   if (NULL != ref)
     gtk_tree_row_reference_free (ref);
-  if (NULL != old)
-    gtk_tree_row_reference_free (old);
-  g_object_set_data (G_OBJECT (widget), "pushed-rowreference", NULL);
+  if (NULL != main_ctx->ns_selector_pushed_row)
+    gtk_tree_row_reference_free (main_ctx->ns_selector_pushed_row);
+  main_ctx->ns_selector_pushed_row = NULL;
   return FALSE;
 }
 
@@ -263,17 +237,15 @@ GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb (GtkWidget * w
  * list was toggled.
  *
  * @param togglebutton the button that toggles the namespace dropdown list
- * @param user_data the builder for the main window
+ * @param user_data the contexxt for the main window
  */
 void
 GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
                                                            togglebutton,
                                                            gpointer user_data)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
+  struct GNUNET_GTK_MainWindowContext *main_ctx = user_data;
   gboolean active;
-  GtkWidget *namespace_selector_window;
-  GtkWidget *namespace_selector_treeview;
   GtkAllocation togglebutton_allocation;
   GdkWindow *main_window_gdk;
   gint mwg_x;
@@ -283,19 +255,13 @@ GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
   gint popup_x;
   gint popup_y;
 
-  namespace_selector_window =
-      GTK_WIDGET (gtk_builder_get_object
-                  (builder, "namespace_selector_window"));  
   g_object_get (G_OBJECT (togglebutton), "active", &active, NULL);
   if (! active)
   {
-    gtk_widget_hide (namespace_selector_window);
+    gtk_widget_hide (main_ctx->ns_selector_window);
     gtk_widget_grab_focus (GTK_WIDGET (togglebutton));
     return;
   }
-  namespace_selector_treeview =
-      GTK_WIDGET (gtk_builder_get_object
-                  (builder, "namespace_selector_treeview"));
   gtk_widget_get_allocation (GTK_WIDGET (togglebutton),
                              &togglebutton_allocation);
   main_window_gdk = gtk_widget_get_window (GTK_WIDGET (togglebutton));
@@ -305,9 +271,9 @@ GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
   tgb_y = mwg_y + togglebutton_allocation.y;
   popup_x = tgb_x;
   popup_y = tgb_y + togglebutton_allocation.height;  
-  gtk_window_move (GTK_WINDOW (namespace_selector_window), popup_x, popup_y);
-  gtk_widget_show_all (namespace_selector_window);
-  gtk_widget_grab_focus (namespace_selector_treeview);
+  gtk_window_move (GTK_WINDOW (main_ctx->ns_selector_window), popup_x, popup_y);
+  gtk_widget_show_all (main_ctx->ns_selector_window);
+  gtk_widget_grab_focus (GTK_WIDGET (main_ctx->ns_selector_treeview));
 }
 
 
@@ -370,92 +336,103 @@ add_namespace_to_ts (void *cls, const GNUNET_HashCode * pseudonym,
   return GNUNET_OK;
 }
 
-
-/**
- * Startup hook to initialize the namespace dropdown widget.
- *
- * @param widget the main window
- * @param user_data the builder for the main window
- */
-/* FIXME-STYLE: hang up on 'realize' event of a widget closer to home? */
 void
-GNUNET_GTK_main_window_realize_cb (GtkWidget * widget, gpointer user_data)
+GNUNET_GTK_main_window_refresh_ns_list (struct GNUNET_GTK_MainWindowContext *main_ctx)
 {
-  GtkBuilder *builder = GTK_BUILDER (user_data);
   GtkTreeIter iter;
-  GtkTreeStore *namespace_treestore;
+  gint i;
 
-  /* FIXME-STYLE: can't we do the button initialization when we create the main window? */
-  /* Make sure button class is realized */
-  g_type_class_unref (g_type_class_ref (GTK_TYPE_BUTTON));
-  /* GNUnet main window assumes that images on buttons are visible,
-   * override the theme's gtkrc setting
-   */
-  g_object_set (gtk_settings_get_default (), "gtk-button-images", TRUE, NULL);
+  GtkTreePath *treepath;
+  GNUNET_HashCode *key = NULL, *selected_ns_id;
 
-  /* setup namespace treestore */
-  {
-    namespace_treestore =
-      GTK_TREE_STORE (GNUNET_FS_GTK_get_main_window_object
-                      ("main_window_search_namespace_treestore"));
+  gboolean found = FALSE;
+  gchar *value = NULL;
     
-    /* FIXME-FEATURE: find a way to manage pseudonyms.
-     * Right now the list will be filled with ALL and ANY pseudonyms that we
-     * find, these are held as files in a special directory.
-     * I don't see an easy way to ignore certain pseudonyms in that directory,
-     * and that require for pseudonym management. Also, pseudonyms are presented
-     * in arbitrary order. We must either sort them (by name?) or let the user
-     * drag them around to change the order in which they appear in the list.
-     * All that is not possible with a simple "files in a directory" concept.
-     */
-    gtk_tree_store_insert_with_values (namespace_treestore, &iter, NULL, G_MAXINT,
-                                       0, "Any", 1, NULL, 2, "", 3,
-                                       "Do not search in any particular namespace",
-                                       -1);
-    /* FIXME-BUG-MINOR: when do we unregister? */
-    GNUNET_PSEUDONYM_discovery_callback_register (GNUNET_FS_GTK_get_configuration (), 
-                                                  &add_namespace_to_ts,
-                                                  namespace_treestore);
-  }
-
-  /* select the first item and update the label */
-  /* FIXME-STYLE: is this even necessary? If the first item is "Any", we can
-     just have the label have the right default, or not? */
-  if (gtk_tree_model_get_iter_first
-      (GTK_TREE_MODEL (namespace_treestore), &iter))
+  if (NULL != main_ctx->selected_ns_row)
   {
-    gchar *value;
-    GtkLabel *sel_namespace_label;
-    GtkTreePath *treepath = gtk_tree_path_new_first ();
-    GtkTreeView *namespace_tree;
-
-    namespace_tree =
-      GTK_TREE_VIEW (GNUNET_FS_GTK_get_main_window_object
-                     ("namespace_selector_treeview"));
-    gtk_tree_selection_select_iter (gtk_tree_view_get_selection
-                                    (namespace_tree), &iter);
-    sel_namespace_label =
-        GTK_LABEL (gtk_builder_get_object
-                   (builder, "main_window_search_selected_namespace_label"));
-    if (GNUNET_GTK_get_tree_string (namespace_tree, treepath, 0, &value))
-      gtk_label_set_text (sel_namespace_label, value);
+    GtkTreeModel *model;
+    treepath = gtk_tree_row_reference_get_path (main_ctx->selected_ns_row);
+    model = gtk_tree_view_get_model (main_ctx->ns_selector_treeview);
+    if (model)
+    {
+      if (gtk_tree_model_get_iter (model, &iter, treepath))
+      {
+        gtk_tree_model_get (model, &iter, 1, &key, -1);
+      }
+    }
     gtk_tree_path_free (treepath);
+    gtk_tree_row_reference_free (main_ctx->selected_ns_row);
+    main_ctx->selected_ns_row = NULL;
   }
-
-  /* show the window (to trigger certain events) and immediately hide it */
-  /* FIXME-STYLE: yuck, can't we trigger these events by other means?  
-     CG->LRN: Which events are you even talking about here? I can't find anything
-     that would seem to be needed here. */
+  selected_ns_id = NULL;
+  if (key != NULL)
   {
-    GtkWidget *namespace_selector_window;
+    selected_ns_id = GNUNET_malloc (sizeof (GNUNET_HashCode));
+    memcpy (selected_ns_id, key, sizeof (GNUNET_HashCode));
+  }
 
-    namespace_selector_window =
-      GTK_WIDGET (gtk_builder_get_object
-                  (builder, "namespace_selector_window"));
-    gtk_widget_show (namespace_selector_window);
-    gtk_widget_hide (namespace_selector_window);
+  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+      main_ctx->search_ns_treestore), &iter))
+  {
+    while (TRUE)
+    {
+      gtk_tree_model_get (GTK_TREE_MODEL (main_ctx->search_ns_treestore), &iter,
+          1, &key,
+          -1);
+      GNUNET_free_non_null (key);
+      if (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
+        main_ctx->search_ns_treestore), &iter))
+        break;
+    }
+  }
+  gtk_tree_store_clear (main_ctx->search_ns_treestore);
+ 
+  gtk_tree_store_insert_with_values (main_ctx->search_ns_treestore, &iter, NULL, G_MAXINT,
+                                     0, "Any", 1, NULL, 2, "", 3,
+                                     "Do not search in any particular namespace",
+                                     -1);
+
+  if (GNUNET_YES == main_ctx->ns_callback_registered)
+    GNUNET_PSEUDONYM_discovery_callback_unregister (add_namespace_to_ts,
+        main_ctx->search_ns_treestore);
+  GNUNET_PSEUDONYM_discovery_callback_register (main_ctx->cfg, 
+      add_namespace_to_ts, main_ctx->search_ns_treestore);
+  main_ctx->ns_callback_registered = GNUNET_YES;
+
+  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+      main_ctx->search_ns_treestore), &iter))
+  {
+    while (TRUE)
+    {
+      gtk_tree_model_get (GTK_TREE_MODEL (main_ctx->search_ns_treestore), &iter,
+          0, &value,
+          1, &key,
+          -1);
+      if (selected_ns_id == NULL)
+        found = TRUE;
+      else if (key != NULL && memcmp (key, selected_ns_id, sizeof (GNUNET_HashCode)) == 0)
+        found = TRUE;
+      if (found || (TRUE != gtk_tree_model_iter_next (GTK_TREE_MODEL (
+        main_ctx->search_ns_treestore), &iter)))
+        break;
+      else
+        g_free (value);
+    }
   }
+  if (!found)
+  {
+    gtk_tree_model_get_iter_first (GTK_TREE_MODEL (
+        main_ctx->search_ns_treestore), &iter);
+    gtk_tree_model_get (GTK_TREE_MODEL (main_ctx->search_ns_treestore), &iter,
+        0, &value, 1, &key, -1);
+    found = TRUE;
+  }
+  gtk_tree_selection_select_iter (gtk_tree_view_get_selection
+                                  (main_ctx->ns_selector_treeview), &iter);
+  if (value != NULL)
+    gtk_label_set_text (main_ctx->search_ns_label, value);
+  g_free(value);
+  GNUNET_free_non_null (selected_ns_id);
 }
 
-
 /* end of gnunet-fs-gtk_main-window-namespace-dropdown.c */