3 files changed, 35 insertions, 17 deletions
diff --git a/multiload/src/Makefile.am b/multiload/src/Makefile.am
index 670f1c50..6b42871f 100644
--- a/multiload/src/Makefile.am
+++ b/multiload/src/Makefile.am
@@ -8,11 +8,11 @@ AM_CPPFLAGS = \
 $(GIO_CFLAGS) \
 ${WARN_CFLAGS}
 
-libexec_PROGRAMS = mate-multiload-applet
-
-BUILT_SOURCES = multiload-resources.c multiload-resources.h
-nodist_mate_multiload_applet_SOURCES = $(BUILT_SOURCES)
-mate_multiload_applet_SOURCES = \
+BUILT_SOURCES = \
+ multiload-resources.c \
+ multiload-resources.h \
+ $(NULL)
+APPLET_SOURCES = \
 global.h \
 linux-proc.h \
 load-graph.h \
@@ -22,14 +22,30 @@ mate_multiload_applet_SOURCES = \
 properties.c \
 netspeed.c netspeed.h \
 autoscaler.c \
- autoscaler.h
+ autoscaler.h \
+ $(NULL)
 
-mate_multiload_applet_LDADD = \
+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 $<
 
diff --git a/multiload/src/load-graph.c b/multiload/src/load-graph.c
index 67fc09cd..e8ca8bd3 100644
--- a/multiload/src/load-graph.c
+++ b/multiload/src/load-graph.c
@@ -472,7 +472,7 @@ load_graph_new (MultiloadApplet *ma, guint n, const gchar *label,
 
 g_signal_connect (g->disp, "draw",
 G_CALLBACK (load_graph_expose), g);
- g_signal_connect (g->disp, "configure_event",
+ g_signal_connect (g->disp, "configure-event",
 G_CALLBACK (load_graph_configure), g);
 g_signal_connect (g->disp, "destroy",
 G_CALLBACK (load_graph_destroy), g);
diff --git a/multiload/src/main.c b/multiload/src/main.c
index 1f2ac814..9439b320 100644
--- a/multiload/src/main.c
+++ b/multiload/src/main.c
@@ -495,7 +495,9 @@ 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");
 
@@ -533,15 +535,15 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data)
 
 g_object_unref (action_group);
 
- g_signal_connect (applet, "change_size",
+ g_signal_connect (applet, "change-size",
 G_CALLBACK (multiload_change_size_cb), ma);
- g_signal_connect (applet, "change_orient",
+ g_signal_connect (applet, "change-orient",
 G_CALLBACK (multiload_change_orient_cb), ma);
 g_signal_connect (applet, "destroy",
 G_CALLBACK (multiload_destroy_cb), ma);
- g_signal_connect (applet, "button_press_event",
+ g_signal_connect (applet, "button-press-event",
 G_CALLBACK (multiload_button_press_event_cb), ma);
- g_signal_connect (applet, "key_press_event",
+ g_signal_connect (applet, "key-press-event",
 G_CALLBACK (multiload_key_press_event_cb), ma);
 
 atk_obj = gtk_widget_get_accessible (GTK_WIDGET (applet));
@@ -575,8 +577,8 @@ multiload_factory (MatePanelApplet *applet,
 return retval;
 }
 
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("MultiLoadAppletFactory",
- PANEL_TYPE_APPLET,
- "multiload",
- multiload_factory,
- NULL)
+PANEL_APPLET_FACTORY ("MultiLoadAppletFactory",
+ PANEL_TYPE_APPLET,
+ "multiload",
+ multiload_factory,
+ NULL)