diff options
| author | lukefromdc <[email protected]> | 2023-07-11 21:28:01 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 08bb8398e0d218daaefdfe95c44940e370802508 (patch) | |
| tree | 0c567b638dd31d831141a2ca4ef355a406883e08 /multiload/src | |
| parent | f94afff3bd198dca2412a75053e122c55b4b48dd (diff) | |
| download | mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.bz2 mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.xz | |
Allow building all applets in or out of process
*Use --enable-in-process selector for in-process builds
*Accessx-status: mark as incompatable with wayland
*Accessx-status: Fix in-process runtime warning
*Stickynote, Geyes: style fixes
Diffstat (limited to 'multiload/src')
| -rw-r--r-- | multiload/src/Makefile.am | 29 | ||||
| -rw-r--r-- | multiload/src/main.c | 14 |
2 files changed, 31 insertions, 12 deletions
diff --git a/multiload/src/Makefile.am b/multiload/src/Makefile.am index 6efa6796..6b42871f 100644 --- a/multiload/src/Makefile.am +++ b/multiload/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mate_multiload_applet_libdir= $(pkglibdir) -mate_multiload_applet_lib_LTLIBRARIES=libmate-multiload-applet.la - AM_CPPFLAGS = \ -I$(srcdir) \ -DMULTILOAD_RESOURCE_PATH=\""/org/mate/mate-applets/multiload/"\" \ @@ -11,7 +8,11 @@ AM_CPPFLAGS = \ $(GIO_CFLAGS) \ ${WARN_CFLAGS} -libmate_multiload_applet_la_SOURCES = \ +BUILT_SOURCES = \ + multiload-resources.c \ + multiload-resources.h \ + $(NULL) +APPLET_SOURCES = \ global.h \ linux-proc.h \ load-graph.h \ @@ -22,16 +23,29 @@ libmate_multiload_applet_la_SOURCES = \ netspeed.c netspeed.h \ autoscaler.c \ autoscaler.h \ - multiload-resources.c \ - multiload-resources.h \ $(NULL) -libmate_multiload_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(GTOP_APPLETS_LIBS) \ $(GIO_LIBS) \ -lm +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-multiload-applet.la +nodist_libmate_multiload_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_multiload_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_multiload_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_multiload_applet_la_LDFLAGS = -module -avoid-version +libmate_multiload_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = mate-multiload-applet +nodist_mate_multiload_applet_SOURCES = $(BUILT_SOURCES) +mate_multiload_applet_SOURCES = $(APPLET_SOURCES) +mate_multiload_applet_CFLAGS = $(AM_CFLAGS) +mate_multiload_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + multiload-resources.c: $(srcdir)/../data/multiload-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/multiload-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name multiload $< @@ -39,6 +53,7 @@ multiload-resources.h: $(srcdir)/../data/multiload-resources.gresource.xml $(she $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name multiload $< CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/multiload/src/main.c b/multiload/src/main.c index 80d365cd..9439b320 100644 --- a/multiload/src/main.c +++ b/multiload/src/main.c @@ -495,6 +495,10 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data) ma->prop_dialog = NULL; ma->last_clicked = 0; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("System Monitor")); +#endif + gtk_window_set_default_icon_name ("utilities-system-monitor"); ma->settings = mate_panel_applet_settings_new (applet, "org.mate.panel.applet.multiload"); @@ -573,8 +577,8 @@ multiload_factory (MatePanelApplet *applet, return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("MultiLoadAppletFactory", - PANEL_TYPE_APPLET, - "multiload", - multiload_factory, - NULL) +PANEL_APPLET_FACTORY ("MultiLoadAppletFactory", + PANEL_TYPE_APPLET, + "multiload", + multiload_factory, + NULL) |