cpufreq: port to in-process for wayland compatablity

author: lukefromdc <[email protected]> 2023-06-11 17:24:31 -0400
committer: raveit65 <[email protected]> 2023-07-17 02:47:16 +0200
commit: 84498251fab3fdbd4031478eea4dfe4eb8c0c28b (patch)
tree: f8b7e88c32fe4fdb15a65c83e5522d45c1854eda /cpufreq
parent: 22d571466674641a3a767e577373a3c5f78ab157 (diff)
download: mate-applets-84498251fab3fdbd4031478eea4dfe4eb8c0c28b.tar.bz2
mate-applets-84498251fab3fdbd4031478eea4dfe4eb8c0c28b.tar.xz
5 files changed, 60 insertions, 46 deletions
diff --git a/cpufreq/data/Makefile.am b/cpufreq/data/Makefile.am
index b08d6345..c4423f90 100644
--- a/cpufreq/data/Makefile.am
+++ b/cpufreq/data/Makefile.am
@@ -4,39 +4,31 @@ cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
 gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
+APPLET_LOCATION = $(libdir)/mate-applets/libmatecpufreqapplet.so
+
 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|\@LIBEXECDIR\@|$(libexecdir)|" \
- -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
- $< > $@
+ -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+ -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 $@
 
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
 
 CLEANFILES = \
 $(applet_DATA) \
 $(applet_in_files) \
- $(service_DATA) \
 $(gsettings_SCHEMAS) \
 *.gschema.valid \
 $(NULL)
 
 EXTRA_DIST = \
 $(applet_in_files).in \
- $(service_in_files) \
 $(cpufreq_gschema_in_files) \
 cpufreq-applet-menu.xml \
 cpufreq-preferences.ui \
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 168c6317..fd548154 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,7 @@
 [Applet Factory]
 Id=CPUFreqAppletFactory
-Location=@LIBEXECDIR@/mate-cpufreq-applet
+InProcess=true
+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
deleted file mode 100644
index a04c672b..00000000
--- a/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.mate.panel.applet.CPUFreqAppletFactory
-Exec=@LIBEXECDIR@/mate-cpufreq-applet
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 86b18674..8324fe9e 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -5,45 +5,69 @@ endif
 SUBDIRS = $(selector_SUBDIR)
 
 AM_CPPFLAGS = \
- -DCPUFREQ_RESOURCE_PATH=\""/org/mate/mate-applets/cpufreq/"\" \
 $(MATE_APPLETS4_CFLAGS)
 
-libexec_PROGRAMS = mate-cpufreq-applet
+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 = \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(AM_CFLAGS) \
+ $(NULL)
 
-BUILT_SOURCES = \
- cpufreq-resources.c cpufreq-resources.h
+libmatecpufreqapplet_la_SOURCES = \
+ cpufreq-applet.c \
+ cpufreq-applet.h \
+ cpufreq-utils.c \
+ 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-monitor-factory.c \
+ cpufreq-monitor-factory.h \
+ cpufreq-resources.c \
+ cpufreq-resources.h \
+ $(NULL)
 
-nodist_mate_cpufreq_applet_SOURCES = \
- $(BUILT_SOURCES)
+libmatecpufreqapplet_la_LDFLAGS = \
+ -module -avoid-version \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
 
-mate_cpufreq_applet_SOURCES = \
- cpufreq-applet.c cpufreq-applet.h \
- cpufreq-utils.c 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-monitor-factory.c cpufreq-monitor-factory.h
+libmatecpufreqapplet_la_LIBADD = \
+ $(MATE_APPLETS4_LIBS) \
+ $(LIBCPUFREQ_LIBS) \
+ $(NULL)
 
 if HAVE_LIBCPUFREQ
-mate_cpufreq_applet_SOURCES += \
+libmatecpufreqapplet_la_SOURCES += \
 cpufreq-monitor-libcpufreq.c \
- cpufreq-monitor-libcpufreq.h
+ cpufreq-monitor-libcpufreq.h \
+ $(NULL)
 else
-mate_cpufreq_applet_SOURCES += \
+libmatecpufreqapplet_la_SOURCES += \
 cpufreq-monitor-cpuinfo.c \
 cpufreq-monitor-cpuinfo.h \
 cpufreq-monitor-sysfs.c \
- cpufreq-monitor-sysfs.h
+ cpufreq-monitor-sysfs.h \
+ $(NULL)
 endif
 
-mate_cpufreq_applet_CFLAGS = \
- ${WARN_CFLAGS}
-
-mate_cpufreq_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(LIBCPUFREQ_LIBS)
-
 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 $<
 
@@ -51,6 +75,8 @@ 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 = \
- $(BUILT_SOURCES)
+ cpufreq-resources.c \
+ cpufreq-resources.h \
+ $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c
index 351d6136..7e02b6ca 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -787,8 +787,6 @@ cpufreq_applet_setup (CPUFreqApplet *applet)
 AtkObject *atk_obj;
 GSettings *settings;
 
- g_set_application_name (_("CPU Frequency Scaling Monitor"));
-
 gtk_window_set_default_icon_name ("mate-cpu-frequency-applet");
 
 /* Preferences */
@@ -867,7 +865,7 @@ cpufreq_applet_factory (CPUFreqApplet *applet,
 return retval;
 }
 
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("CPUFreqAppletFactory",
+MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("CPUFreqAppletFactory",
 CPUFREQ_TYPE_APPLET,
 "cpufreq-applet",
 (MatePanelAppletFactoryCallback) cpufreq_applet_factory,
author	lukefromdc <[email protected]>	2023-06-11 17:24:31 -0400
committer	raveit65 <[email protected]>	2023-07-17 02:47:16 +0200
commit	84498251fab3fdbd4031478eea4dfe4eb8c0c28b (patch)
tree	f8b7e88c32fe4fdb15a65c83e5522d45c1854eda /cpufreq
parent	22d571466674641a3a767e577373a3c5f78ab157 (diff)
download	mate-applets-84498251fab3fdbd4031478eea4dfe4eb8c0c28b.tar.bz2 mate-applets-84498251fab3fdbd4031478eea4dfe4eb8c0c28b.tar.xz