diff options
| author | lukefromdc <[email protected]> | 2023-07-11 21:28:01 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2023-07-17 02:47:28 +0200 |
| commit | 08bb8398e0d218daaefdfe95c44940e370802508 (patch) | |
| tree | 0c567b638dd31d831141a2ca4ef355a406883e08 /trashapplet/src | |
| parent | f94afff3bd198dca2412a75053e122c55b4b48dd (diff) | |
| download | mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.bz2 mate-applets-08bb8398e0d218daaefdfe95c44940e370802508.tar.xz | |
Allow building all applets in or out of process
*Use --enable-in-process selector for in-process builds
*Accessx-status: mark as incompatable with wayland
*Accessx-status: Fix in-process runtime warning
*Stickynote, Geyes: style fixes
Diffstat (limited to 'trashapplet/src')
| -rw-r--r-- | trashapplet/src/Makefile.am | 45 | ||||
| -rw-r--r-- | trashapplet/src/trashapplet.c | 14 |
2 files changed, 39 insertions, 20 deletions
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am index 1cad7acd..6cb5ef0a 100644 --- a/trashapplet/src/Makefile.am +++ b/trashapplet/src/Makefile.am @@ -4,31 +4,46 @@ AM_CPPFLAGS = -I$(top_srcdir) \ -DGRESOURCE=\""/org/mate/mate-applets/trash/\"" \ ${WARN_CFLAGS} -trashapplet_libdir= $(pkglibdir) -trashapplet_lib_LTLIBRARIES=libtrashapplet.la - -libtrashapplet_la_SOURCES = \ - trashapplet.c \ - trash-empty.h \ - trash-empty.c \ - xstuff.c \ - xstuff.h \ - trashapplet-resources.c \ - trashapplet-resources.h \ +BUILT_SOURCES = \ + trashapplet-resources.c \ + trashapplet-resources.h \ + $(NULL) +APPLET_SOURCES = \ + trashapplet.c \ + trash-empty.h \ + trash-empty.c \ + xstuff.c \ + xstuff.h \ $(NULL) -libtrashapplet_la_LIBADD = \ - $(MATE_APPLETS4_LIBS) \ - $(GIO_LIBS) \ +APPLET_LIBS = \ + $(MATE_APPLETS4_LIBS) \ + $(GIO_LIBS) \ -lX11 +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-trash-applet.la +nodist_libmate_trash_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_trash_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_trash_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_trash_applet_la_LDFLAGS = -module -avoid-version +libmate_trash_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = trashapplet +nodist_trashapplet_SOURCES = $(BUILT_SOURCES) +trashapplet_SOURCES = $(APPLET_SOURCES) +trashapplet_CFLAGS = $(AM_CFLAGS) +trashapplet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + trashapplet-resources.c: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< trashapplet-resources.h: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< -CLEANFILES = \ +CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c index 515bab10..f8a1bfc6 100644 --- a/trashapplet/src/trashapplet.c +++ b/trashapplet/src/trashapplet.c @@ -631,6 +631,10 @@ trash_applet_factory (MatePanelApplet *applet, AtkObject *atk_obj; GtkActionGroup *action_group; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Trash Applet")); +#endif + gtk_window_set_default_icon_name ("user-trash"); /* Set up the menu */ @@ -659,8 +663,8 @@ trash_applet_factory (MatePanelApplet *applet, return retval; } -MATE_PANEL_APPLET_IN_PROCESS_FACTORY ("TrashAppletFactory", - TRASH_TYPE_APPLET, - "TrashApplet", - trash_applet_factory, - NULL) +PANEL_APPLET_FACTORY ("TrashAppletFactory", + TRASH_TYPE_APPLET, + "TrashApplet", + trash_applet_factory, + NULL) |