From 6dd9ab19ab5a72c203dab7c2c96277f77e222260 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Mon, 19 Jun 2023 18:03:18 -0400 Subject: netspeed: port to in-process for wayland *Also switch to automatic signal handling/disconnection *Otherwise this applet when in-process will segfault on removal --- netspeed/src/Makefile.am | 20 ++++++++-------- netspeed/src/netspeed.c | 60 +++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 41 deletions(-) (limited to 'netspeed/src') diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am index 8358b3c9..e91c1b34 100644 --- a/netspeed/src/Makefile.am +++ b/netspeed/src/Makefile.am @@ -1,5 +1,8 @@ NULL = +mate_netspeed_applet_libdir= $(pkglibdir) +mate_netspeed_applet_lib_LTLIBRARIES=libmate-netspeed-applet.la + AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(includedir) \ @@ -13,35 +16,33 @@ if HAVE_NL AM_CPPFLAGS += $(NL_CFLAGS) endif -libexec_PROGRAMS = mate-netspeed-applet - -BUILT_SOURCES = netspeed-resources.c netspeed-resources.h -nodist_mate_netspeed_applet_SOURCES = $(BUILT_SOURCES) -mate_netspeed_applet_SOURCES = \ +libmate_netspeed_applet_la_SOURCES = \ backend.h \ backend.c \ netspeed.c \ netspeed.h \ netspeed-preferences.c \ netspeed-preferences.h \ + netspeed-resources.c \ + netspeed-resources.h \ $(NULL) if HAVE_NL -mate_netspeed_applet_SOURCES += \ +libmate_netspeed_applet_la_SOURCES += \ nl80211.h \ ieee80211.h \ $(NULL) endif -mate_netspeed_applet_LDADD = $(GIO_LIBS) $(GTOP_APPLETS_LIBS) \ +libmate_netspeed_applet_la_LIBADD = $(GIO_LIBS) $(GTOP_APPLETS_LIBS) \ $(MATE_APPLETS4_LIBS) \ $(INTLLIBS) -lm if HAVE_IW -mate_netspeed_applet_LDADD += $(IW_LIBS) +libmate_netspeed_applet_la_LIBADD += $(IW_LIBS) endif if HAVE_NL -mate_netspeed_applet_LDADD += $(NL_LIBS) +libmate_netspeed_applet_la_LIBADD += $(NL_LIBS) endif netspeed-resources.c: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/netspeed-resources.gresource.xml) @@ -51,7 +52,6 @@ netspeed-resources.h: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $< CLEANFILES = \ - $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/netspeed/src/netspeed.c b/netspeed/src/netspeed.c index 60e2aec7..441f314f 100644 --- a/netspeed/src/netspeed.c +++ b/netspeed/src/netspeed.c @@ -1574,7 +1574,6 @@ netspeed_applet_factory (MatePanelApplet *applet, return FALSE; glibtop_init (); - g_set_application_name (_("MATE Netspeed")); netspeed = NETSPEED_APPLET (applet); netspeed->icon_theme = gtk_icon_theme_get_default (); @@ -1680,62 +1679,61 @@ netspeed_applet_factory (MatePanelApplet *applet, netspeed->timeout_id = g_timeout_add (REFRESH_TIME, (GSourceFunc)timeout_function, netspeed); - - g_signal_connect (applet, "change-size", + g_signal_connect_object (applet, "change-size", G_CALLBACK (applet_change_size_or_orient), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->icon_theme, "changed", + g_signal_connect_object (netspeed->icon_theme, "changed", G_CALLBACK (icon_theme_changed_cb), - netspeed); + netspeed, 0); - g_signal_connect (applet, "change-orient", + g_signal_connect_object (applet, "change-orient", G_CALLBACK (applet_change_size_or_orient), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->in_label, "size-allocate", + g_signal_connect_object (netspeed->in_label, "size-allocate", G_CALLBACK (label_size_allocate_cb), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->out_label, "size-allocate", + g_signal_connect_object (netspeed->out_label, "size-allocate", G_CALLBACK (label_size_allocate_cb), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->sum_label, "size-allocate", + g_signal_connect_object (netspeed->sum_label, "size-allocate", G_CALLBACK (label_size_allocate_cb), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::auto-change-device", + g_signal_connect_object (netspeed->settings, "changed::auto-change-device", G_CALLBACK (auto_change_device_settings_changed), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::device", + g_signal_connect_object (netspeed->settings, "changed::device", G_CALLBACK (device_settings_changed), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-all-addresses", + g_signal_connect_object (netspeed->settings, "changed::show-all-addresses", G_CALLBACK (showalladdresses_settings_changed), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-sum", + g_signal_connect_object (netspeed->settings, "changed::show-sum", G_CALLBACK (showsum_settings_changed), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-bits", + g_signal_connect_object (netspeed->settings, "changed::show-bits", G_CALLBACK (showbits_settings_changed), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::change-icon", + g_signal_connect_object (netspeed->settings, "changed::change-icon", G_CALLBACK (changeicon_settings_changed), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-icon", + g_signal_connect_object (netspeed->settings, "changed::show-icon", G_CALLBACK (showicon_settings_changed), - netspeed); + netspeed, 0); - g_signal_connect (netspeed->settings, "changed::show-quality-icon", + g_signal_connect_object (netspeed->settings, "changed::show-quality-icon", G_CALLBACK (showqualityicon_settings_changed), - netspeed); + netspeed, 0); action_group = gtk_action_group_new ("Netspeed Applet Actions"); gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); @@ -1761,7 +1759,7 @@ netspeed_applet_factory (MatePanelApplet *applet, return TRUE; } -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("NetspeedAppletFactory", +MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("NetspeedAppletFactory", NETSPEED_TYPE_APPLET, "NetspeedApplet", netspeed_applet_factory, -- cgit v1.2.1