2 files changed, 28 insertions, 14 deletions
diff --git a/accessx-status/src/Makefile.am b/accessx-status/src/Makefile.am
index 9128ae1b..3880b3f2 100644
--- a/accessx-status/src/Makefile.am
+++ b/accessx-status/src/Makefile.am
@@ -7,19 +7,31 @@ AM_CPPFLAGS = \
 -DACCESSX_RESOURCE_PATH=\""/org/mate/mate-applets/accessx-status/"\" \
 $(NULL)
 
-libexec_PROGRAMS = accessx-status-applet
-
 BUILT_SOURCES = accessx-status-resources.c accessx-status-resources.h
-nodist_accessx_status_applet_SOURCES = $(BUILT_SOURCES)
-accessx_status_applet_SOURCES = \
+APPLET_SOURCES = \
 applet.c \
 applet.h
 
-accessx_status_applet_LDADD = \
+APPLET_LIBS = \
 $(MATE_APPLETS4_LIBS) \
 $(GIO_LIBS) \
 $(X_LIBS)
 
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmate-accessx-status-applet.la
+nodist_libmate_accessx_status_applet_la_SOURCES = $(BUILT_SOURCES)
+libmate_accessx_status_applet_la_SOURCES = $(APPLET_SOURCES)
+libmate_accessx_status_applet_la_CFLAGS = $(AM_CFLAGS)
+libmate_accessx_status_applet_la_LDFLAGS = -module -avoid-version
+libmate_accessx_status_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = accessx-status-applet
+nodist_accessx_status_applet_SOURCES = $(BUILT_SOURCES)
+accessx_status_applet_SOURCES = $(APPLET_SOURCES)
+accessx_status_applet_CFLAGS = $(AM_CFLAGS)
+accessx_status_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
+
 accessx-status-resources.c: $(srcdir)/../data/accessx-status-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/accessx-status-resources.gresource.xml)
 $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name accessx $<
 
diff --git a/accessx-status/src/applet.c b/accessx-status/src/applet.c
index c24a6561..dd3e6cc9 100644
--- a/accessx-status/src/applet.c
+++ b/accessx-status/src/applet.c
@@ -1316,7 +1316,9 @@ create_applet (MatePanelApplet* applet)
 GtkIconTheme *icon_theme;
 gint icon_size, icon_scale;
 
+#ifndef ENABLE_IN_PROCESS
 g_set_application_name (_("AccessX Status"));
+#endif
 
 sapplet->xkb = NULL;
 sapplet->xkb_display = NULL;
@@ -1634,15 +1636,15 @@ accessx_status_applet_fill (MatePanelApplet* applet)
 
 g_object_connect (sapplet->applet,
 "signal::destroy", accessx_status_applet_destroy, sapplet,
- "signal::change_orient", accessx_status_applet_reorient, sapplet,
- "signal::change_size", accessx_status_applet_resize, sapplet,
+ "signal::change-orient", accessx_status_applet_reorient, sapplet,
+ "signal::change-size", accessx_status_applet_resize, sapplet,
 NULL);
 
- g_signal_connect (sapplet->applet, "button_press_event",
+ g_signal_connect (sapplet->applet, "button-press-event",
 G_CALLBACK (button_press_cb),
 sapplet);
 
- g_signal_connect (sapplet->applet, "key_press_event",
+ g_signal_connect (sapplet->applet, "key-press-event",
 G_CALLBACK (key_press_cb),
 sapplet);
 
@@ -1697,9 +1699,9 @@ accessx_status_applet_factory (MatePanelApplet* applet,
 return retval;
 }
 
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("AccessxStatusAppletFactory",
- PANEL_TYPE_APPLET,
- "accessx-status",
- accessx_status_applet_factory,
- NULL)
+PANEL_APPLET_FACTORY ("AccessxStatusAppletFactory",
+ PANEL_TYPE_APPLET,
+ "accessx-status",
+ accessx_status_applet_factory,
+ NULL)