Battstat: Port to in-process for wayland compatability

*This gives wayland users a functional battery monitor on at least linux

4 files changed, 14 insertions, 23 deletions

diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index ed8d852c..11379050 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+APPLET_LOCATION = $(libdir)/mate-applets/libmate-battstat-applet.so
+
 ACPIINC= @ACPIINC@
 
 if NEED_LIBAPM
@@ -22,6 +24,9 @@ SUBDIRS = docs sounds $(APMDIR)
 
 DIST_SUBDIRS = docs sounds apmlib
 
+mate_battstat_applet_libdir= $(pkglibdir)
+mate_battstat_applet_lib_LTLIBRARIES=libmate-battstat-applet.la
+
 AM_CPPFLAGS =					\
 	${WARN_CFLAGS}				\
 	$(MATE_APPLETS4_CFLAGS)			\
@@ -33,11 +38,8 @@ AM_CPPFLAGS =					\
 	-DBATTSTAT_RESOURCE_PATH=\""/org/mate/mate-applets/battstat/"\" \
 	$(NULL)
 
-libexec_PROGRAMS = battstat-applet
 
-BUILT_SOURCES = battstat-resources.c battstat-resources.h
-nodist_battstat_applet_SOURCES = $(BUILT_SOURCES)
-battstat_applet_SOURCES =	\
+libmate_battstat_applet_la_SOURCES =	\
 	battstat.h		\
 	battstat_applet.c	\
 	battstat-preferences.c  \
@@ -49,9 +51,11 @@ battstat_applet_SOURCES =	\
 	acpi-freebsd.h		\
 	battstat-upower.c	\
 	battstat-upower.h	\
+	battstat-resources.c \
+	battstat-resources.h  \
 	$(NULL)
 
-battstat_applet_LDADD =		\
+libmate_battstat_applet_la_LIBADD =		\
 	$(MATE_APPLETS4_LIBS)	\
 	$(LIBNOTIFY_LIBS)	\
 	$(APMLIB)		\
@@ -75,26 +79,17 @@ applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-ap
 
 $(applet_in_files): $(applet_in_files).in Makefile
 	$(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+            -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.BattstatAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files)
-	$(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            $< > $@
 
 CLEANFILES =			\
 	$(applet_DATA)		\
 	$(applet_in_files)	\
-	$(service_DATA)		\
 	$(gsettings_SCHEMAS)	\
 	$(BUILT_SOURCES)	\
 	*.gschema.valid		\
@@ -105,7 +100,6 @@ EXTRA_DIST =					\
 	battstat-preferences.ui			\
 	battstat-resources.gresource.xml	\
 	$(applet_in_files).in			\
-	$(service_in_files)			\
 	$(batstat_gschema_in_files)		\
 	$(NULL)
 
diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c
index e3c83ac3..2afe96f4 100644
--- a/battstat/battstat_applet.c
+++ b/battstat/battstat_applet.c
@@ -1130,8 +1130,6 @@ battstat_applet_fill (MatePanelApplet *applet)
 
     if (DEBUG) g_print ("main ()\n");
 
-    g_set_application_name (_("Battery Charge Monitor"));
-
     gtk_window_set_default_icon_name ("battery");
 
     mate_panel_applet_set_flags (applet,
@@ -1210,7 +1208,7 @@ battstat_applet_factory (MatePanelApplet *applet,
     return retval;
 }
 
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("BattstatAppletFactory",
+MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("BattstatAppletFactory",
                                        PANEL_TYPE_APPLET,
                                        "battstat",
                                        battstat_applet_factory,
diff --git a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in
index 39103f79..86f8d3d5 100644
--- a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in
+++ b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in
@@ -1,6 +1,7 @@
 [Applet Factory]
 Id=BattstatAppletFactory
-Location=@LIBEXECDIR@/battstat-applet
+Location=@APPLET_LOCATION@
+InProcess=true
 Name=Battstat Factory
 Description=Battstat Factory
 
@@ -10,6 +11,7 @@ Description=Monitor a laptop's remaining power
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=battery
 MateComponentId=OAFIID:MATE_BattstatApplet
+Platforms=X11;Wayland;
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=mate-applets
 X-MATE-Bugzilla-Component=battery
diff --git a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in
deleted file mode 100644
index 050fd3c8..00000000
--- a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.mate.panel.applet.BattstatAppletFactory
-Exec=@LIBEXECDIR@/battstat-applet