7 files changed, 241 insertions, 201 deletions
diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am
index 350217f2..b6cb4875 100644
--- a/netspeed/data/Makefile.am
+++ b/netspeed/data/Makefile.am
@@ -1,36 +1,44 @@
 NULL =
 
+applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in
+service_in_files = org.mate.panel.applet.NetspeedAppletFactory.service.in
+gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in
+
+if ENABLE_IN_PROCESS
+APPLET_LOCATION = $(pkglibdir)/libmate-netspeed-applet.so
+else !ENABLE_IN_PROCESS
 APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet
+endif !ENABLE_IN_PROCESS
 
 appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in
 applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 $(AM_V_GEN)sed \
- -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
+ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+ -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \
 $< > $@
 
 $(applet_DATA): $(applet_in_files) Makefile
 $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.NetspeedAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
+if !ENABLE_IN_PROCESS
+servicedir = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
 
-org.mate.panel.applet.NetspeedAppletFactory.service: $(service_in_files)
+$(service_DATA): $(service_in_files) Makefile
 $(AM_V_GEN)sed \
- -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
+ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
 $< > $@
+endif !ENABLE_IN_PROCESS
 
-netspeed_gschema_in_files = org.mate.panel.applet.netspeed.gschema.xml.in
-gsettings_SCHEMAS = $(netspeed_gschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
 $(applet_in_files).in \
 $(service_in_files) \
- $(netspeed_gschema_in_files) \
+ $(gschema_in_files) \
 netspeed-details.ui \
 netspeed-menu.xml \
 netspeed-preferences.ui \
diff --git a/netspeed/data/netspeed-details.ui b/netspeed/data/netspeed-details.ui
index a537555f..06b6562a 100644
--- a/netspeed/data/netspeed-details.ui
+++ b/netspeed/data/netspeed-details.ui
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
 <requires lib="gtk+" version="3.22"/>
 <object class="GtkImage" id="close_img">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">window-close</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">window-close</property>
 </object>
 <object class="GtkImage" id="help_img">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">help-browser</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">help-browser</property>
 </object>
 <object class="GtkDialog" id="dialog">
- <property name="can_focus">False</property>
- <property name="border_width">12</property>
- <property name="type_hint">dialog</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">12</property>
+ <property name="type-hint">dialog</property>
 <signal name="response" handler="on_dialog_response" swapped="no"/>
 <child internal-child="vbox">
 <object class="GtkBox">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">12</property>
 <child internal-child="action_area">
 <object class="GtkButtonBox">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
 <child>
 <object class="GtkButton" id="button1">
 <property name="label" translatable="yes">_Help</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
 <property name="image">help_img</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
 </object>
 <packing>
 <property name="expand">True</property>
@@ -46,13 +46,13 @@
 <object class="GtkButton" id="button2">
 <property name="label" translatable="yes">_Close</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
 <property name="image">close_img</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
 </object>
 <packing>
 <property name="expand">True</property>
@@ -70,26 +70,26 @@
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">10</property>
 <child>
 <object class="GtkFrame" id="da_frame">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
 <child>
 <object class="GtkAlignment">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="xalign">0</property>
 <property name="yalign">0</property>
 <child>
 <object class="GtkDrawingArea" id="drawingarea">
- <property name="height_request">180</property>
+ <property name="height-request">180</property>
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <signal name="draw" handler="on_drawingarea_draw" swapped="no"/>
 </object>
 </child>
@@ -97,8 +97,9 @@
 </child>
 <child type="label">
 <object class="GtkLabel">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="label" translatable="yes">Transfer Rate Graph</property>
+ <property name="mnemonic-widget">drawingarea</property>
 </object>
 </child>
 </object>
@@ -111,13 +112,13 @@
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkColorButton" id="incolor_sel">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
 <signal name="color-set" handler="on_incolor_sel_color_set" swapped="no"/>
 </object>
 <packing>
@@ -129,10 +130,10 @@
 <child>
 <object class="GtkLabel">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="label" translatable="yes">_In graph color</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">incolor_sel</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">incolor_sel</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -143,8 +144,8 @@
 <child>
 <object class="GtkColorButton" id="outcolor_sel">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
 <signal name="color-set" handler="on_outcolor_sel_color_set" swapped="no"/>
 </object>
 <packing>
@@ -156,10 +157,10 @@
 <child>
 <object class="GtkLabel">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="label" translatable="yes">_Out graph color</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">outcolor_sel</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">outcolor_sel</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -177,21 +178,22 @@
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel" id="ip_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">IPv4 Address:</property>
+ <property name="mnemonic-widget">ip_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -203,7 +205,7 @@
 <child>
 <object class="GtkLabel" id="ip_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="selectable">True</property>
 <property name="xalign">0</property>
@@ -217,9 +219,10 @@
 <child>
 <object class="GtkLabel" id="netmask_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">Netmask:</property>
+ <property name="mnemonic-widget">netmask_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -231,7 +234,7 @@
 <child>
 <object class="GtkLabel" id="netmask_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="selectable">True</property>
 <property name="xalign">0</property>
@@ -250,16 +253,60 @@
 </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="mnemonic-widget">ipv6_text</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>
+ <property name="can-focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel" id="hwaddr_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">Hardware Address:</property>
+ <property name="mnemonic-widget">hwaddr_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -271,7 +318,7 @@
 <child>
 <object class="GtkLabel" id="hwaddr_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="selectable">True</property>
 <property name="xalign">0</property>
@@ -285,9 +332,10 @@
 <child>
 <object class="GtkLabel" id="ptpip_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">P-t-P Address:</property>
+ <property name="mnemonic-widget">ptpip_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -299,7 +347,7 @@
 <child>
 <object class="GtkLabel" id="ptpip_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="selectable">True</property>
 <property name="xalign">0</property>
@@ -314,20 +362,21 @@
 <packing>
 <property name="expand">False</property>
 <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
 </packing>
 </child>
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel" id="inbytes_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">Bytes in:</property>
+ <property name="mnemonic-widget">inbytes_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -339,9 +388,10 @@
 <child>
 <object class="GtkLabel" id="inbytes_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">0 byte</property>
+ <property name="selectable">True</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -353,9 +403,10 @@
 <child>
 <object class="GtkLabel" id="outbytes_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">Bytes out:</property>
+ <property name="mnemonic-widget">outbytes_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -367,55 +418,16 @@
 <child>
 <object class="GtkLabel" id="outbytes_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">0 byte</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </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>
- </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>
 </object>
 <packing>
 <property name="expand">False</property>
 <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</property>
 </packing>
 </child>
 </object>
@@ -428,20 +440,21 @@
 <child>
 <object class="GtkBox" id="wireless_box">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel" id="essid_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">ESSID:</property>
+ <property name="mnemonic-widget">essid_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -453,7 +466,7 @@
 <child>
 <object class="GtkLabel" id="essid_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="selectable">True</property>
 <property name="xalign">0</property>
@@ -467,9 +480,10 @@
 <child>
 <object class="GtkLabel" id="signal_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">Signal Strength:</property>
+ <property name="mnemonic-widget">signalbar</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -481,7 +495,7 @@
 <child>
 <object class="GtkProgressBar" id="signalbar">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">True</property>
 <property name="halign">start</property>
 <property name="hexpand">True</property>
 </object>
@@ -501,19 +515,20 @@
 <child>
 <object class="GtkBox" id="netlink_box">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel" id="station_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="label" translatable="yes">Station:</property>
+ <property name="mnemonic-widget">station_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -525,7 +540,8 @@
 <child>
 <object class="GtkLabel" id="station_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="selectable">True</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -537,8 +553,9 @@
 <child>
 <object class="GtkLabel" id="channel_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="label" translatable="yes">Channel:</property>
+ <property name="mnemonic-widget">channel_label</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -550,7 +567,8 @@
 <child>
 <object class="GtkLabel" id="channel_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="selectable">True</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -569,13 +587,14 @@
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel" id="connected_time_label">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="label" translatable="yes">Connected Time:</property>
+ <property name="mnemonic-widget">connected_time_text</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -587,7 +606,8 @@
 <child>
 <object class="GtkLabel" id="connected_time_text">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="selectable">True</property>
 <property name="xalign">0</property>
 </object>
 <packing>
@@ -637,12 +657,9 @@
 <action-widget response="-11">button1</action-widget>
 <action-widget response="-3">button2</action-widget>
 </action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
 </object>
 <object class="GtkSizeGroup">
- <property name="ignore_hidden">True</property>
+ <property name="ignore-hidden">True</property>
 <widgets>
 <widget name="ip_label"/>
 <widget name="hwaddr_label"/>
@@ -654,7 +671,7 @@
 </widgets>
 </object>
 <object class="GtkSizeGroup">
- <property name="ignore_hidden">True</property>
+ <property name="ignore-hidden">True</property>
 <widgets>
 <widget name="ip_text"/>
 <widget name="hwaddr_text"/>
@@ -664,7 +681,7 @@
 </widgets>
 </object>
 <object class="GtkSizeGroup">
- <property name="ignore_hidden">True</property>
+ <property name="ignore-hidden">True</property>
 <widgets>
 <widget name="netmask_label"/>
 <widget name="ptpip_label"/>
@@ -674,7 +691,7 @@
 </widgets>
 </object>
 <object class="GtkSizeGroup">
- <property name="ignore_hidden">True</property>
+ <property name="ignore-hidden">True</property>
 <widgets>
 <widget name="netmask_text"/>
 <widget name="ptpip_text"/>
diff --git a/netspeed/data/netspeed-menu.xml b/netspeed/data/netspeed-menu.xml
index 553936f5..958cc294 100644
--- a/netspeed/data/netspeed-menu.xml
+++ b/netspeed/data/netspeed-menu.xml
@@ -1,5 +1,5 @@
-<menuitem name="MateNetspeedAppletDetails" action="MateNetspeedAppletDetails" />
+<menuitem name="NetspeedAppletDetails" action="NetspeedAppletDetails" />
 <separator/>
-<menuitem name="MateNetspeedAppletProperties" action="MateNetspeedAppletProperties" />
-<menuitem name="MateNetspeedAppletHelp" action="MateNetspeedAppletHelp" />
-<menuitem name="MateNetspeedAppletAbout" action="MateNetspeedAppletAbout" />
+<menuitem name="NetspeedAppletProperties" action="NetspeedAppletProperties" />
+<menuitem name="NetspeedAppletHelp" action="NetspeedAppletHelp" />
+<menuitem name="NetspeedAppletAbout" action="NetspeedAppletAbout" />
diff --git a/netspeed/data/netspeed-preferences.ui b/netspeed/data/netspeed-preferences.ui
index 62b0e601..bc1e5587 100644
--- a/netspeed/data/netspeed-preferences.ui
+++ b/netspeed/data/netspeed-preferences.ui
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface>
 <requires lib="gtk+" version="3.22"/>
 <object class="GtkImage" id="image1">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">help-browser</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">help-browser</property>
 </object>
 <object class="GtkImage" id="image2">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">window-close</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">window-close</property>
 </object>
- <object class="GtkDialog" id="preferences_dialog">
- <property name="can_focus">False</property>
- <property name="border_width">12</property>
+ <template class="NetspeedPreferences" parent="GtkDialog">
+ <property name="can-focus">False</property>
+ <property name="border-width">12</property>
 <property name="title" translatable="yes">MATE Netspeed Preferences</property>
- <property name="icon_name">mate-netspeed-applet</property>
- <property name="type_hint">dialog</property>
- <signal name="response" handler="on_preferences_dialog_response" swapped="no"/>
+ <property name="destroy-with-parent">True</property>
+ <property name="icon-name">mate-netspeed-applet</property>
+ <property name="type-hint">dialog</property>
 <child internal-child="vbox">
 <object class="GtkBox">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="orientation">vertical</property>
 <property name="spacing">2</property>
 <child internal-child="action_area">
 <object class="GtkButtonBox">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
 <child>
 <object class="GtkButton" id="button1">
 <property name="label" translatable="yes">_Help</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
 <property name="image">image1</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
 </object>
 <packing>
 <property name="expand">True</property>
@@ -48,13 +48,13 @@
 <object class="GtkButton" id="button2">
 <property name="label" translatable="yes">_Close</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
 <property name="image">image2</property>
- <property name="use_underline">True</property>
- <property name="always_show_image">True</property>
+ <property name="use-underline">True</property>
+ <property name="always-show-image">True</property>
 </object>
 <packing>
 <property name="expand">True</property>
@@ -72,34 +72,34 @@
 <child>
 <object class="GtkFrame">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
 <child>
 <object class="GtkAlignment">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="left-padding">12</property>
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">5</property>
 <property name="orientation">vertical</property>
 <property name="spacing">6</property>
 <child>
 <object class="GtkBox">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkLabel">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">Network _device:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">network_device_combo</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">network_device_combo</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -110,7 +110,7 @@
 <child>
 <object class="GtkComboBoxText" id="network_device_combo">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <signal name="changed" handler="on_network_device_combo_changed" swapped="no"/>
 </object>
 <packing>
@@ -130,12 +130,11 @@
 <object class="GtkCheckButton" id="show_sum_checkbutton">
 <property name="label" translatable="yes">Show _sum instead of in &amp; out</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
 <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_sum_checkbutton_toggled" swapped="no"/>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -147,12 +146,11 @@
 <object class="GtkCheckButton" id="show_bits_checkbutton">
 <property name="label" translatable="yes">Show _bits instead of bytes</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
 <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_bits_checkbutton_toggled" swapped="no"/>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -164,12 +162,11 @@
 <object class="GtkCheckButton" id="change_icon_checkbutton">
 <property name="label" translatable="yes">_Change icon according to the selected device</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
 <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_change_icon_checkbutton_toggled" swapped="no"/>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -181,12 +178,11 @@
 <object class="GtkCheckButton" id="show_icon_checkbutton">
 <property name="label" translatable="yes">Show _icon</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
 <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_icon_checkbutton_toggled" swapped="no"/>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -198,12 +194,11 @@
 <object class="GtkCheckButton" id="show_quality_icon_checkbutton">
 <property name="label" translatable="yes">Show signal _quality icon for wireless devices</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
 <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_show_quality_icon_checkbutton_toggled" swapped="no"/>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -211,6 +206,22 @@
 <property name="position">5</property>
 </packing>
 </child>
+ <child>
+ <object class="GtkCheckButton" id="show_all_addresses_checkbutton">
+ <property name="label" translatable="yes">Show all _IP addresses on tooltip</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
 </object>
 </child>
 </object>
@@ -218,7 +229,7 @@
 <child type="label">
 <object class="GtkLabel">
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">General Settings</property>
 <attributes>
@@ -239,8 +250,5 @@
 <action-widget response="-11">button1</action-widget>
 <action-widget response="-3">button2</action-widget>
 </action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
- </object>
+ </template>
 </interface>
diff --git a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
index fdc64666..2d156785 100644
--- a/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
+++ b/netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=NetspeedAppletFactory
-Location=@LOCATION@
+Location=@APPLET_LOCATION@
+InProcess=@APPLET_IN_PROCESS@
 Name=Netspeed Applet Factory
 Description=Netspeed Applet
 
@@ -10,6 +11,7 @@ Description=Netspeed Applet
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=mate-netspeed-applet
 MateComponentId=OAFIID:MATE_NetspeedApplet
+Platforms=X11;Wayland;
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-netspeed
 X-MATE-Bugzilla-Component=netspeed
diff --git a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in
index 2868eec8..49f7ff15 100644
--- a/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in
+++ b/netspeed/data/org.mate.panel.applet.NetspeedAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.NetspeedAppletFactory
-Exec=@LOCATION@
+Exec=@APPLET_LOCATION@
diff --git a/netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in b/netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in
index 88b6a8aa..a45dadb1 100644
--- a/netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in
+++ b/netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in
@@ -15,6 +15,11 @@
 <summary>Show bits</summary>
 <description>If true, show speed in bits instead of bytes.</description>
 </key>
+ <key name="show-all-addresses" type="b">
+ <default>false</default>
+ <summary>Show IPv4 and IPv6 addresses on tooltip</summary>
+ <description>If true, show both IP addresses if enabled.</description>
+ </key>
 <key name="show-icon" type="b">
 <default>true</default>
 <summary>Show icon</summary>