gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r4897 - gnunet-gtk/src/plugins/fs


From: gnunet
Subject: [GNUnet-SVN] r4897 - gnunet-gtk/src/plugins/fs
Date: Sat, 2 Jun 2007 01:25:12 -0600 (MDT)

Author: grothoff
Date: 2007-06-02 01:25:12 -0600 (Sat, 02 Jun 2007)
New Revision: 4897

Modified:
   gnunet-gtk/src/plugins/fs/namespace.c
Log:
code cleanup

Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c       2007-06-02 06:55:00 UTC (rev 
4896)
+++ gnunet-gtk/src/plugins/fs/namespace.c       2007-06-02 07:25:12 UTC (rev 
4897)
@@ -44,6 +44,7 @@
   GtkWidget * treeview;
   GtkWidget * namespacepage;
   GtkWidget * addButton;
+  GtkWidget * updateButton;
   GtkTreeModel * model;
   char * name;
   HashCode512 id;
@@ -56,8 +57,7 @@
 
 static GladeXML * metaXML;
 
-static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
-                                     GtkWidget ** addButton) {
+void makeNamespaceFrame(NamespaceList * entry) {
   GtkWidget * child;
   GtkWidget * resultList;
   GtkCellRenderer * renderer;
@@ -76,10 +76,11 @@
                                      "namespaceContentFrame");
   resultList = glade_xml_get_widget(namespaceXML,
                                    "namespaceContentFrameTreeView");
-  *addButton = glade_xml_get_widget(namespaceXML,
-                                   "addButton");
-  if (treeview != NULL)
-    (*treeview) = GTK_WIDGET(GTK_TREE_VIEW(resultList));
+  entry->addButton = glade_xml_get_widget(namespaceXML,
+                                         "addButton");
+  entry->updateButton = glade_xml_get_widget(namespaceXML,
+                                            "updateButton");
+  entry->treeview = GTK_WIDGET(GTK_TREE_VIEW(resultList));
   model =
     gtk_list_store_new(IN_NAMESPACE_NUM,
                       G_TYPE_STRING, /* (file)name */
@@ -93,6 +94,7 @@
                       G_TYPE_STRING, /* next pub date */
                       G_TYPE_POINTER,  /* URI */
                       G_TYPE_POINTER);  /* META */
+  entry->model = GTK_TREE_MODEL(model);
   gtk_tree_view_set_model(GTK_TREE_VIEW(resultList),
                          GTK_TREE_MODEL(model));
   
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(resultList)),
@@ -237,7 +239,7 @@
   UNREF(namespaceXML);
   DEBUG_END();
 
-  return child;
+  entry->namespacepage = child;
 }
 
 
@@ -379,9 +381,7 @@
                              int rating) {
   NamespaceList * list;
   GtkWidget * label;
-  GtkWidget * addButton;
   GtkWidget * notebook;
-  GtkListStore * model;
 
   DEBUG_BEGIN();
   label = gtk_label_new(namespaceName);
@@ -389,16 +389,7 @@
   list->name = STRDUP(namespaceName);
   list->id = *namespaceId;
   list->meta = ECRS_dupMetaData(md);
-  list->namespacepage
-    = makeNamespaceFrame(&list->treeview,
-                        &addButton);
-  list->addButton
-    = addButton;
-  model = GTK_LIST_STORE
-    (gtk_tree_view_get_model
-     (GTK_TREE_VIEW(list->treeview)));
-  list->model
-    = GTK_TREE_MODEL(model);
+  makeNamespaceFrame(list);
   list->next
     = head;
   head = list;
@@ -416,7 +407,7 @@
      cfg,
      namespaceName,
      &addNamespaceContentToModel,
-     model);
+     list->model);
   DEBUG_END();
   return OK;
 }





reply via email to

[Prev in Thread] Current Thread [Next in Thread]