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 /cpufreq | |
| 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 'cpufreq')
| -rw-r--r-- | cpufreq/data/Makefile.am | 28 | ||||
| -rw-r--r-- | cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in | 2 | ||||
| -rw-r--r-- | cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in | 3 | ||||
| -rw-r--r-- | cpufreq/src/Makefile.am | 91 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-applet.c | 14 |
5 files changed, 82 insertions, 56 deletions
diff --git a/cpufreq/data/Makefile.am b/cpufreq/data/Makefile.am index c4423f90..eeceb6ac 100644 --- a/cpufreq/data/Makefile.am +++ b/cpufreq/data/Makefile.am @@ -1,35 +1,53 @@ NULL = -cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in -gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml) +applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in + +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -APPLET_LOCATION = $(libdir)/mate-applets/libmatecpufreqapplet.so +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-cpufreq-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/mate-cpufreq-applet +endif !ENABLE_IN_PROCESS appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.CPUFreqApplet.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|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ $(applet_DATA): $(applet_in_files) Makefile $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + $(AM_V_GEN)sed \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ + $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ $(NULL) EXTRA_DIST = \ $(applet_in_files).in \ - $(cpufreq_gschema_in_files) \ + $(service_in_files) \ + $(gschema_in_files) \ cpufreq-applet-menu.xml \ cpufreq-preferences.ui \ cpufreq-resources.gresource.xml \ diff --git a/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in index fd548154..4ce2aec3 100644 --- a/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in +++ b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=CPUFreqAppletFactory -InProcess=true +InProcess=@APPLET_IN_PROCESS@ Location=@APPLET_LOCATION@ Name=CPU Frequency Scaling Monitor Description=Monitor the CPU Frequency Scaling diff --git a/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in new file mode 100644 index 00000000..ed33b33b --- /dev/null +++ b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.mate.panel.applet.CPUFreqAppletFactory +Exec=@APPLET_LOCATION@ diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am index 8324fe9e..e02b612d 100644 --- a/cpufreq/src/Makefile.am +++ b/cpufreq/src/Makefile.am @@ -5,68 +5,70 @@ endif SUBDIRS = $(selector_SUBDIR) AM_CPPFLAGS = \ - $(MATE_APPLETS4_CFLAGS) - -cpufreq_libdir= $(pkglibdir) -cpufreq_lib_LTLIBRARIES=libmatecpufreqapplet.la - -libmatecpufreqapplet_la_CPPFLAGS = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \ -DCPUFREQ_RESOURCE_PATH=\""/org/mate/mate-applets/cpufreq/"\" \ $(NULL) -libmatecpufreqapplet_la_CFLAGS = \ +AM_CFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(GIO_CFLAGS) \ $(WARN_CFLAGS) \ - $(AM_CFLAGS) \ $(NULL) -libmatecpufreqapplet_la_SOURCES = \ - cpufreq-applet.c \ - cpufreq-applet.h \ +BUILT_SOURCES = \ + cpufreq-resources.c \ + cpufreq-resources.h \ + $(NULL) +APPLET_SOURCES = \ + cpufreq-applet.c \ + cpufreq-applet.h \ cpufreq-utils.c \ - cpufreq-utils.h \ - cpufreq-prefs.c \ - cpufreq-prefs.h \ + cpufreq-utils.h \ + cpufreq-prefs.c \ + cpufreq-prefs.h \ cpufreq-selector.c \ - cpufreq-selector.h \ - cpufreq-popup.c \ - cpufreq-popup.h \ - cpufreq-monitor.c \ - cpufreq-monitor.h \ + cpufreq-selector.h \ + cpufreq-popup.c \ + cpufreq-popup.h \ + cpufreq-monitor.c \ + cpufreq-monitor.h \ cpufreq-monitor-factory.c \ - cpufreq-monitor-factory.h \ - cpufreq-resources.c \ - cpufreq-resources.h \ + cpufreq-monitor-factory.h \ $(NULL) -libmatecpufreqapplet_la_LDFLAGS = \ - -module -avoid-version \ - $(WARN_LDFLAGS) \ - $(AM_LDFLAGS) \ +if HAVE_LIBCPUFREQ +APPLET_SOURCES += \ + cpufreq-monitor-libcpufreq.c \ + cpufreq-monitor-libcpufreq.h \ $(NULL) +else +APPLET_SOURCES += \ + cpufreq-monitor-cpuinfo.c \ + cpufreq-monitor-cpuinfo.h \ + cpufreq-monitor-sysfs.c \ + cpufreq-monitor-sysfs.h \ + $(NULL) +endif -libmatecpufreqapplet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(LIBCPUFREQ_LIBS) \ $(NULL) -if HAVE_LIBCPUFREQ -libmatecpufreqapplet_la_SOURCES += \ - cpufreq-monitor-libcpufreq.c \ - cpufreq-monitor-libcpufreq.h \ - $(NULL) -else -libmatecpufreqapplet_la_SOURCES += \ - cpufreq-monitor-cpuinfo.c \ - cpufreq-monitor-cpuinfo.h \ - cpufreq-monitor-sysfs.c \ - cpufreq-monitor-sysfs.h \ - $(NULL) -endif + +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-cpufreq-applet.la +nodist_libmate_cpufreq_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_cpufreq_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_cpufreq_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_cpufreq_applet_la_LDFLAGS = -module -avoid-version +libmate_cpufreq_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = mate-cpufreq-applet +nodist_mate_cpufreq_applet_SOURCES = $(BUILT_SOURCES) +mate_cpufreq_applet_SOURCES = $(APPLET_SOURCES) +mate_cpufreq_applet_CFLAGS = $(AM_CFLAGS) +mate_cpufreq_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS cpufreq-resources.c: $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/cpufreq/data --generate-dependencies $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $< @@ -75,8 +77,7 @@ cpufreq-resources.h: $(top_srcdir)/cpufreq/data/cpufreq-resources.gresource.xml $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/cpufreq/data --generate --c-name cpufreq $< CLEANFILES = \ - cpufreq-resources.c \ - cpufreq-resources.h \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c index 7e02b6ca..b1509eaa 100644 --- a/cpufreq/src/cpufreq-applet.c +++ b/cpufreq/src/cpufreq-applet.c @@ -787,6 +787,10 @@ cpufreq_applet_setup (CPUFreqApplet *applet) AtkObject *atk_obj; GSettings *settings; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("CPU Frequency Scaling Monitor")); +#endif + gtk_window_set_default_icon_name ("mate-cpu-frequency-applet"); /* Preferences */ @@ -865,8 +869,8 @@ cpufreq_applet_factory (CPUFreqApplet *applet, return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("CPUFreqAppletFactory", - CPUFREQ_TYPE_APPLET, - "cpufreq-applet", - (MatePanelAppletFactoryCallback) cpufreq_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("CPUFreqAppletFactory", + CPUFREQ_TYPE_APPLET, + "cpufreq-applet", + (MatePanelAppletFactoryCallback) cpufreq_applet_factory, + NULL) |