diff options
| author | lukefromdc <[email protected]> | 2023-06-19 16:51:54 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | ed185133fa170ee018dfa25e1010b1fcf4238c78 (patch) | |
| tree | c5841c319f631c0ec5249f31ad6d6e462ed6b4bc /mateweather/src | |
| parent | be92bb4015a69ee66ac01449b0697a77d18b0139 (diff) | |
| download | mate-applets-ed185133fa170ee018dfa25e1010b1fcf4238c78.tar.bz2 mate-applets-ed185133fa170ee018dfa25e1010b1fcf4238c78.tar.xz | |
mate-weather-applet: port to in-process for wayland support
Diffstat (limited to 'mateweather/src')
| -rw-r--r-- | mateweather/src/Makefile.am | 21 | ||||
| -rw-r--r-- | mateweather/src/main.c | 2 | ||||
| -rw-r--r-- | mateweather/src/mateweather-applet.c | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/mateweather/src/Makefile.am b/mateweather/src/Makefile.am index b01bc226..d032a98f 100644 --- a/mateweather/src/Makefile.am +++ b/mateweather/src/Makefile.am @@ -1,3 +1,8 @@ +NULL = + +mateweather_applet_libdir= $(pkglibdir) +mateweather_applet_lib_LTLIBRARIES=libmateweather-applet.la + AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir) \ @@ -7,23 +12,23 @@ AM_CPPFLAGS = \ $(LIBMATEWEATHER_CFLAGS) \ ${WARN_CFLAGS} -libexec_PROGRAMS = mateweather-applet - -BUILT_SOURCES = mateweather-resources.c mateweather-resources.h -nodist_mateweather_applet_SOURCES = $(BUILT_SOURCES) -mateweather_applet_SOURCES = \ +libmateweather_applet_la_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.c mateweather-applet.h \ + mateweather-resources.c \ + mateweather-resources.h \ + $(NULL) -mateweather_applet_LDADD = \ +libmateweather_applet_la_LIBADD = \ $(LIBNOTIFY_LIBS) \ $(MATE_APPLETS4_LIBS) \ $(MATE_LIBS2_LIBS) \ - $(LIBMATEWEATHER_LIBS) + $(LIBMATEWEATHER_LIBS) \ + $(NULL) 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..af128dea 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) +MATE_PANEL_APPLET_IN_PROCESS_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 4000b692..48bc7dbe 100644 --- a/mateweather/src/mateweather-applet.c +++ b/mateweather/src/mateweather-applet.c @@ -341,8 +341,6 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet) mate_panel_applet_set_flags (gw_applet->applet, MATE_PANEL_APPLET_EXPAND_MINOR); - g_set_application_name (_("Weather Report")); - gtk_window_set_default_icon_name ("weather-storm"); g_signal_connect (gw_applet->applet, "change-orient", |