summaryrefslogtreecommitdiff
path: root/netspeed
diff options
context:
space:
mode:
authortreysis <[email protected]>2020-12-22 02:02:20 +0100
committerRobert Antoni Buj Gelonch <[email protected]>2020-12-22 07:06:02 +0100
commit221527986bdae3c4140be05725cb858cd8dae0d0 (patch)
treee1a800bbdb573a1bf9e8a205369a9672c79be431 /netspeed
parentc47ffa433de0dbf94d57aacbccac5c0cb440951d (diff)
downloadmate-applets-221527986bdae3c4140be05725cb858cd8dae0d0.tar.bz2
mate-applets-221527986bdae3c4140be05725cb858cd8dae0d0.tar.xz
netspeed: improve display of IPv6 addresses in device details.
Diffstat (limited to 'netspeed')
-rw-r--r--netspeed/data/netspeed-details.ui86
-rw-r--r--netspeed/src/backend.c4
2 files changed, 45 insertions, 45 deletions
diff --git a/netspeed/data/netspeed-details.ui b/netspeed/data/netspeed-details.ui
index 32f01ed1..af1cc376 100644
--- a/netspeed/data/netspeed-details.ui
+++ b/netspeed/data/netspeed-details.ui
@@ -250,6 +250,48 @@
</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>
<property name="can-focus">False</property>
@@ -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>
@@ -382,48 +424,6 @@
<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>
<property name="position">3</property>
</packing>
</child>
diff --git a/netspeed/src/backend.c b/netspeed/src/backend.c
index 5eb67319..9fcfa226 100644
--- a/netspeed/src/backend.c
+++ b/netspeed/src/backend.c
@@ -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;