- fixes

3 files changed, 38 insertions, 73 deletions

diff --git a/contrib/gnunet_gns_gtk_main_window.glade b/contrib/gnunet_gns_gtk_main_window.glade
index 4fe6e015..7c729f9d 100644
--- a/contrib/gnunet_gns_gtk_main_window.glade
+++ b/contrib/gnunet_gns_gtk_main_window.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="GNUNET_GNS_GTK_main_window">
     <property name="can_focus">False</property>
@@ -231,7 +231,6 @@
                     <property name="reorderable">True</property>
                     <property name="sort_indicator">True</property>
                     <property name="sort_column_id">0</property>
-                    <signal name="clicked" handler="GNUNET_GNS_GTK_main_treeview_click_cb" swapped="no"/>
                     <child>
                       <object class="GtkCellRendererText" id="GNUNET_GNS_GTK_name_cellrenderertext">
                         <property name="editable">True</property>
@@ -271,11 +270,10 @@
                     <child>
                       <object class="GtkCellRendererCombo" id="GNUNET_GNS_GTK_type_cellrenderercombo">
                         <property name="editable">True</property>
+                        <property name="model">GNUNET_GNS_GTK_type_liststore</property>
+                        <property name="text_column">1</property>
                         <signal name="changed" handler="GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb" swapped="no"/>
                       </object>
-                      <attributes>
-                        <attribute name="text-column">3</attribute>
-                      </attributes>
                     </child>
                   </object>
                 </child>
@@ -325,28 +323,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
-    <columns>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-      <!-- column-name is_public -->
-      <column type="gboolean"/>
-      <!-- column-name record_type -->
-      <column type="guint"/>
-      <!-- column-name record_type_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name expiration_time -->
-      <column type="guint64"/>
-      <!-- column-name expiration_time_is_relative -->
-      <column type="gboolean"/>
-      <!-- column-name expiration_time_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name value_as_string -->
-      <column type="gchararray"/>
-      <!-- column-name value_color -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
   <object class="GtkListStore" id="GNUNET_GNS_GTK_type_liststore">
     <columns>
       <!-- column-name type -->
@@ -397,4 +373,26 @@
       </row>
     </data>
   </object>
+  <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
+    <columns>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+      <!-- column-name is_public -->
+      <column type="gboolean"/>
+      <!-- column-name record_type -->
+      <column type="guint"/>
+      <!-- column-name record_type_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name expiration_time -->
+      <column type="guint64"/>
+      <!-- column-name expiration_time_is_relative -->
+      <column type="gboolean"/>
+      <!-- column-name expiration_time_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name value_as_string -->
+      <column type="gchararray"/>
+      <!-- column-name value_color -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
 </interface>
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index ed3ff064..143c6406 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -408,6 +408,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                "gnunet-gtk" /* FIXME: different icon? */ ,
                                "gnunet-gns-gtk");
 
+  /*
   struct ZoneIteration_Context * zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
   zc_ctx->zone = zone;
   GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &zone,
@@ -415,6 +416,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       GNUNET_NAMESTORE_RF_NONE,
       &zone_iteration_proc,
       zc_ctx);
+   */
 
   /* make GUI visible */
   if (!tray_only)
diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index b7f7c22c..5739c888 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -140,43 +140,6 @@ GNUNET_GNS_GTK_main_treeview_popup_menu_cb (GtkWidget *widget,
   return FALSE;
 }
 
-enum
-{
-  COL_FIRST_NAME = 0,
-  COL_LAST_NAME,
-  COL_YEAR_BORN,
-  NUM_COLS
-} ;
-
-static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_GNS_Context *gns=cls;
-  GtkBuilder *builder = gns->builder;
-  GtkTreeStore *ts;
-  GtkTreeIter  toplevel, child;
-
-  ts  = GTK_TREE_STORE (gtk_builder_get_object (builder, "GNUNET_GNS_GTK_treestore"));
-  GNUNET_assert (ts != NULL);
-
-  GNUNET_break (0);
-  /* Append a top level row and leave it empty */
-  gtk_tree_store_append(ts, &toplevel, NULL);
-  /*
-  gtk_tree_store_set(ts, &toplevel,
-                     COL_FIRST_NAME, "Maria",
-                     COL_LAST_NAME, "Incognito",
-                     -1);*/
-}
-
-void
-GNUNET_GNS_GTK_main_treeview_click_cb (GtkTreeViewColumn *treeviewcolumn,
-                                      gpointer user_data)
-{
-
-  GNUNET_SCHEDULER_add_now (&test, user_data);
-}
-
 /**
  * The zone treeview was realized.   Setup the model.
  *
@@ -187,20 +150,22 @@ void
 GNUNET_GNS_GTK_main_treeview_realize_cb (GtkWidget *widget,
                                          gpointer user_data)
 {
-  /*
-  struct GNUNET_GNS_Context *gns=user_data;
+  struct GNUNET_GNS_Context *gns = user_data;
   GtkBuilder *builder = gns->builder;
-  GNUNET_assert (GTK_IS_BUILDER(user_data));
-
-  GtkTreeModel * tm;
-  tm  = GTK_TREE_MODEL(gtk_builder_get_object (builder, "GNUNET_GNS_GTK_treestore"));
-  GNUNET_assert (tm != NULL);
+  GtkTreeStore *ts;
+  GtkTreeIter toplevel;
 
-  //gtk_tree
-*/
+  GNUNET_assert (GTK_IS_BUILDER(builder));
   GNUNET_break (0);
 
+  ts  = GTK_TREE_STORE (gtk_builder_get_object (builder, "GNUNET_GNS_GTK_treestore"));
+  GNUNET_assert (GTK_IS_TREE_STORE(ts));
+  GNUNET_assert (ts != NULL);
+
+  /* Append a top level row and leave it empty */
+  gtk_tree_store_append(ts, &toplevel, NULL);
 
+  GNUNET_break (0);
 }