[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33097 - in gnunet-gtk: contrib src/peerinfo
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33097 - in gnunet-gtk: contrib src/peerinfo |
Date: |
Wed, 16 Apr 2014 11:56:47 +0200 |
Author: grothoff
Date: 2014-04-16 11:56:47 +0200 (Wed, 16 Apr 2014)
New Revision: 33097
Modified:
gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
Log:
reorder dialog to make order consistent with layering; handle NULL address
Modified: gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade 2014-04-16
09:41:43 UTC (rev 33096)
+++ gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade 2014-04-16
09:56:47 UTC (rev 33097)
@@ -74,7 +74,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">CORE</property>
- <property name="stock">gtk-connect</property>
+ <property name="stock">gtk-dialog-authentication</property>
</object>
<object class="GtkImage" id="connected_image_neighbours">
<property name="visible">True</property>
@@ -83,7 +83,7 @@
<property name="stock">gtk-connect</property>
</object>
<object class="GtkImage" id="connected_image_plugin">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">PLUGIN</property>
<property name="stock">gtk-connect</property>
@@ -98,7 +98,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Address valid?</property>
- <property name="stock">gtk-dialog-authentication</property>
+ <property name="stock">gtk-connect</property>
</object>
<object class="GtkWindow" id="GNUNET_PEERINFO_GTK_main_window">
<property name="can_focus">False</property>
@@ -204,31 +204,30 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_core_connectivity_treeviewcolumn">
- <property name="spacing">2</property>
- <property name="sizing">autosize</property>
- <property name="widget">connected_image_core</property>
+ <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_plugin_connectivity_treeviewcolumn">
+ <property name="widget">connected_image_plugin</property>
<property name="reorderable">True</property>
+ <property name="visible">False</property>
<property name="sort_indicator">True</property>
- <property name="sort_column_id">8</property>
+ <property name="sort_column_id">22</property>
<child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_core_led_cellrendererpixbuf"/>
+ <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_plugin_led_cellrendererpixbuf"/>
<attributes>
- <attribute name="pixbuf">7</attribute>
+ <attribute name="pixbuf">21</attribute>
</attributes>
</child>
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_plugin_connectivity_treeviewcolumn">
- <property name="widget">connected_image_plugin</property>
+ <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_validation_status_treeviewcolumn">
+ <property name="widget">validated_image</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
- <property name="sort_column_id">22</property>
+ <property name="sort_column_id">19</property>
<child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_plugin_led_cellrendererpixbuf"/>
+ <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_valdiation_led_cellrendererpixbuf"/>
<attributes>
- <attribute name="pixbuf">21</attribute>
+ <attribute name="pixbuf">18</attribute>
</attributes>
</child>
</object>
@@ -260,15 +259,17 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_validation_status_treeviewcolumn">
- <property name="widget">validated_image</property>
+ <object class="GtkTreeViewColumn"
id="GNUNET_PEERINFO_GTK_main_window_core_connectivity_treeviewcolumn">
+ <property name="spacing">2</property>
+ <property name="sizing">autosize</property>
+ <property name="widget">connected_image_core</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
- <property name="sort_column_id">19</property>
+ <property name="sort_column_id">8</property>
<child>
- <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_valdiation_led_cellrendererpixbuf"/>
+ <object class="GtkCellRendererPixbuf"
id="GNUNET_PEERINFO_GTK_main_window_core_led_cellrendererpixbuf"/>
<attributes>
- <attribute name="pixbuf">18</attribute>
+ <attribute name="pixbuf">7</attribute>
</attributes>
</child>
</object>
Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2014-04-16 09:41:43 UTC
(rev 33096)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2014-04-16 09:56:47 UTC
(rev 33097)
@@ -987,6 +987,8 @@
PEERINFO_MC_NEIGHBOUR_STATE_TIMEOUT_AS_STRING, NULL,
-1);
}
+ if (NULL == address)
+ return;
pa = get_address (info, address);
get_iter_from_rr (pa->rr, &iter);
gtk_tree_store_set (ts, &iter,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33097 - in gnunet-gtk: contrib src/peerinfo,
gnunet <=