4 files changed, 40 insertions, 19 deletions
diff --git a/mateweather/src/Makefile.am b/mateweather/src/Makefile.am
index b01bc226..e30affd6 100644
--- a/mateweather/src/Makefile.am
+++ b/mateweather/src/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 AM_CPPFLAGS = \
 -I$(srcdir) \
 -I$(top_srcdir) \
@@ -7,23 +9,40 @@ AM_CPPFLAGS = \
 $(LIBMATEWEATHER_CFLAGS) \
 ${WARN_CFLAGS}
 
-libexec_PROGRAMS = mateweather-applet
+BUILT_SOURCES = \
+ mateweather-resources.c \
+ mateweather-resources.h \
+ $(NULL)
+APPLET_SOURCES = \
+ mateweather.h \
+ main.c \
+ mateweather-about.c mateweather-about.h \
+ mateweather-pref.c mateweather-pref.h \
+ mateweather-dialog.c mateweather-dialog.h \
+ mateweather-applet.c mateweather-applet.h \
+ $(NULL)
 
-BUILT_SOURCES = mateweather-resources.c mateweather-resources.h
-nodist_mateweather_applet_SOURCES = $(BUILT_SOURCES)
-mateweather_applet_SOURCES = \
- mateweather.h \
- main.c \
- mateweather-about.c mateweather-about.h \
- mateweather-pref.c mateweather-pref.h \
- mateweather-dialog.c mateweather-dialog.h \
- mateweather-applet.c mateweather-applet.h
-
-mateweather_applet_LDADD = \
+APPLET_LIBS = \
 $(LIBNOTIFY_LIBS) \
 $(MATE_APPLETS4_LIBS) \
 $(MATE_LIBS2_LIBS) \
- $(LIBMATEWEATHER_LIBS)
+ $(LIBMATEWEATHER_LIBS) \
+ $(NULL)
+
+if ENABLE_IN_PROCESS
+pkglib_LTLIBRARIES = libmateweather-applet.la
+nodist_libmateweather_applet_la_SOURCES = $(BUILT_SOURCES)
+libmateweather_applet_la_SOURCES = $(APPLET_SOURCES)
+libmateweather_applet_la_CFLAGS = $(AM_CFLAGS)
+libmateweather_applet_la_LDFLAGS = -module -avoid-version
+libmateweather_applet_la_LIBADD = $(APPLET_LIBS)
+else !ENABLE_IN_PROCESS
+libexec_PROGRAMS = mateweather-applet
+nodist_mateweather_applet_SOURCES = $(BUILT_SOURCES)
+mateweather_applet_SOURCES = $(APPLET_SOURCES)
+mateweather_applet_CFLAGS = $(AM_CFLAGS)
+mateweather_applet_LDADD = $(APPLET_LIBS)
+endif !ENABLE_IN_PROCESS
 
 mateweather-resources.c: ../data/mateweather-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/mateweather-resources.gresource.xml)
 $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name mateweather $<
diff --git a/mateweather/src/main.c b/mateweather/src/main.c
index f472fa23..e16ef9e0 100644
--- a/mateweather/src/main.c
+++ b/mateweather/src/main.c
@@ -54,4 +54,4 @@ static gboolean mateweather_applet_factory(MatePanelApplet* applet, const gchar*
 return retval;
 }
 
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY("MateWeatherAppletFactory", PANEL_TYPE_APPLET, "mateweather", mateweather_applet_factory, NULL)
+PANEL_APPLET_FACTORY("MateWeatherAppletFactory", PANEL_TYPE_APPLET, "mateweather", mateweather_applet_factory, NULL)
diff --git a/mateweather/src/mateweather-applet.c b/mateweather/src/mateweather-applet.c
index 098b620d..efb2c308 100644
--- a/mateweather/src/mateweather-applet.c
+++ b/mateweather/src/mateweather-applet.c
@@ -341,15 +341,17 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet)
 
 mate_panel_applet_set_flags (gw_applet->applet, MATE_PANEL_APPLET_EXPAND_MINOR);
 
+#ifndef ENABLE_IN_PROCESS
 g_set_application_name (_("Weather Report"));
+#endif
 
 gtk_window_set_default_icon_name ("weather-storm");
 
- g_signal_connect (gw_applet->applet, "change_orient",
+ g_signal_connect (gw_applet->applet, "change-orient",
 G_CALLBACK (change_orient_cb),
 gw_applet);
 
- g_signal_connect (gw_applet->applet, "size_allocate",
+ g_signal_connect (gw_applet->applet, "size-allocate",
 G_CALLBACK (size_allocate_cb),
 gw_applet);
 
@@ -357,11 +359,11 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet)
 G_CALLBACK (applet_destroy),
 gw_applet);
 
- g_signal_connect (gw_applet->applet, "button_press_event",
+ g_signal_connect (gw_applet->applet, "button-press-event",
 G_CALLBACK(clicked_cb),
 gw_applet);
 
- g_signal_connect (gw_applet->applet, "key_press_event",
+ g_signal_connect (gw_applet->applet, "key-press-event",
 G_CALLBACK (key_press_cb),
 gw_applet);
 
diff --git a/mateweather/src/mateweather-pref.c b/mateweather/src/mateweather-pref.c
index 32314f37..2f5b268f 100644
--- a/mateweather/src/mateweather-pref.c
+++ b/mateweather/src/mateweather-pref.c
@@ -1174,7 +1174,7 @@ mateweather_pref_create (MateWeatherPref* pref)
 #ifdef RADARMAP
 g_signal_connect (pref->priv->basic_radar_btn, "toggled", G_CALLBACK (on_radar_toggled), pref);
 g_signal_connect (pref->priv->basic_radar_url_btn, "toggled", G_CALLBACK (on_use_radar_url_toggled), pref);
- g_signal_connect (pref->priv->basic_radar_url_entry, "focus_out_event", G_CALLBACK (on_radar_url_changed), pref);
+ g_signal_connect (pref->priv->basic_radar_url_entry, "focus-out-event", G_CALLBACK (on_radar_url_changed), pref);
 #endif /* RADARMAP */
 #ifdef HAVE_LIBNOTIFY
 g_signal_connect (pref->priv->basic_show_notifications_btn, "toggled", G_CALLBACK (on_show_notifications_toggled), pref);