Skip to content

Commit

Permalink
netspeed: improve display of IPv6 addresses in device details.
Browse files Browse the repository at this point in the history
  • Loading branch information
@treysis @rbuj
treysis authored and rbuj committed Dec 22, 2020
1 parent c47ffa4 commit 2215279
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
86 changes: 43 additions & 43 deletions netspeed/data/netspeed-details.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,48 @@
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="ipv6_box">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="ipv6_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">IPv6 Address:</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ipv6_text">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
Expand Down Expand Up @@ -314,7 +356,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
<child>
Expand Down Expand Up @@ -379,48 +421,6 @@
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox" id="ipv6_box">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="ipv6_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">IPv6 Address:</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="ipv6_text">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
Expand Down
4 changes: 2 additions & 2 deletions netspeed/src/backend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ get_ip_address_list (const char *iface_name,
}

list = g_slist_prepend (list,
g_strdup_printf ("%s: %s/%u",
scope, ip, netmask));
g_strdup_printf ("%s/%u (%s)",
ip, netmask, scope));
} else {
struct sockaddr_in ip4_addr;
struct sockaddr_in ip4_network;
Expand Down

0 comments on commit 2215279

Please sign in to comment.