[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet-gtk] 03/03: cleaning up peerinfo tree model
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet-gtk] 03/03: cleaning up peerinfo tree model |
Date: |
Tue, 26 Jun 2018 09:04:57 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet-gtk.
commit a33900f13f006151b57cd8091827d53573b45832
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Jun 26 09:04:51 2018 +0200
cleaning up peerinfo tree model
---
contrib/gnunet_peerinfo_gtk_main_window.glade | 8 +---
src/peerinfo/gnunet-peerinfo-gtk.c | 55 ++++++++++++++++++---------
2 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/contrib/gnunet_peerinfo_gtk_main_window.glade
b/contrib/gnunet_peerinfo_gtk_main_window.glade
index 017f665e..4040e962 100644
--- a/contrib/gnunet_peerinfo_gtk_main_window.glade
+++ b/contrib/gnunet_peerinfo_gtk_main_window.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1
+<!-- Generated with glade 3.22.1
Copyright (C)
@@ -61,12 +61,6 @@ along with gnunet-peerinfo-gtk. If not, see
<http://www.gnu.org/licenses/>.
<column type="gchararray"/>
<!-- column-name transport_neighbour_state_timeout_as_string -->
<column type="gchararray"/>
- <!-- column-name transport_validation_state_led__DEAD -->
- <column type="GdkPixbuf"/>
- <!-- column-name transport_validation_is_valid__DEAD -->
- <column type="gboolean"/>
- <!-- column-name transport_validation_timeout_as_string__DEAD -->
- <column type="gchararray"/>
<!-- column-name plugin_connectivity_led -->
<column type="GdkPixbuf"/>
<!-- column-name plugin_connectivity_status -->
diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c
b/src/peerinfo/gnunet-peerinfo-gtk.c
index c647eedf..e7eef60d 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -142,42 +142,32 @@ enum PEERINFO_ModelColumns
/**
* A GdkPixbuf
*/
- PEERINFO_MC_VALIDATION_STATE_LED__DEAD = 18,
+ PEERINFO_MC_PLUGIN_CONNECTIVITY_LED = 18,
/**
* A gboolean
*/
- PEERINFO_MC_VALIDATION_IS_VALID__DEAD = 19,
+ PEERINFO_MC_PLUGIN_CONNECTIVITY_STATUS = 19,
/**
* A gchararray
*/
- PEERINFO_MC_VALIDATION_TIMEOUT_AS_STRING__DEAD = 20,
-
- /**
- * A GdkPixbuf
- */
- PEERINFO_MC_PLUGIN_CONNECTIVITY_LED = 21,
+ PEERINFO_MC_PLUGIN_CONNECTIVITY_TIMEOUT_AS_STRING = 20,
/**
* A gboolean
*/
- PEERINFO_MC_PLUGIN_CONNECTIVITY_STATUS = 22,
+ PEERINFO_MC_SHOW_FRIEND = 21,
/**
* A gchararray
*/
- PEERINFO_MC_PLUGIN_CONNECTIVITY_TIMEOUT_AS_STRING = 23,
+ PEERINFO_MC_PEERINFO_ADDRESS_EXPIRATION = 22,
/**
- * A gboolean
+ * Last "column" (does not actually exist).
*/
- PEERINFO_MC_SHOW_FRIEND = 24,
-
- /**
- * A gchararray
- */
- PEERINFO_MC_PEERINFO_ADDRESS_EXPIRATION = 25
+ PEERINFO_MC_END = 26
};
@@ -422,8 +412,35 @@ do_update (void *cls)
update_task = GNUNET_SCHEDULER_add_delayed (UPDATE_FREQUENCY,
&do_update,
NULL);
- gtk_widget_thaw_child_notify (GTK_WIDGET (tv));
- gtk_widget_freeze_child_notify (GTK_WIDGET (tv));
+#if 0
+ GtkTreeStore *sts;
+
+ sts = gtk_tree_store_new (PEERINFO_MC_END,
+ G_TYPE_STRING, /* pid */
+ G_TYPE_STRING, /* country name */
+ GDK_TYPE_PIXBUF, /* country flag */
+ G_TYPE_UINT, /* bandwidth_in */
+ G_TYPE_UINT, /* bandwidth_out */
+ GDK_TYPE_PIXBUF, /* ATS led */
+ G_TYPE_BOOLEAN, /* ATS selected */
+ GDK_TYPE_PIXBUF, /* CORE led */
+ G_TYPE_UINT, /* core status */
+ G_TYPE_BOOLEAN, /* is friend */
+ G_TYPE_POINTER, /* peerinfo */
+ G_TYPE_STRING, /* plugin name */
+ G_TYPE_STRING, /* address */
+ GDK_TYPE_PIXBUF, /* neighbour connectivity */
+ G_TYPE_BOOLEAN, /* connected status */
+ G_TYPE_STRING, /* timeout as string */
+ G_TYPE_STRING, /* neighbour state as string */
+ G_TYPE_STRING, /* neighbour state timeout as
string */
+ GDK_TYPE_PIXBUF, /* plugin connectivity led */
+ G_TYPE_BOOLEAN, /* plugin connectivity status */
+ G_TYPE_STRING, /* connectivity timeout plugin */
+ G_TYPE_BOOLEAN, /* show friend */
+ G_TYPE_STRING /* peerinfo addr expiration */
+ );
+#endif
}
--
To stop receiving notification emails like this one, please contact
address@hidden