diff options
| author | mbkma <[email protected]> | 2021-02-10 12:02:25 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-03-02 22:19:58 +0100 |
| commit | c0c513f3ef7e7ea432e799d8a5e10cfe94d38908 (patch) | |
| tree | e4b7840617c282855884bd3fac3c1c1313cb68fa /pluma/Makefile.am | |
| parent | 814ae9fdeb8367d0f5b43a4691b32a514cf3e6e9 (diff) | |
| download | pluma-c0c513f3ef7e7ea432e799d8a5e10cfe94d38908.tar.bz2 pluma-c0c513f3ef7e7ea432e799d8a5e10cfe94d38908.tar.xz | |
Introduce PlumaWindowActivatable, PlumaAppActivatable, PlumaViewActivatable
These interfaces are for extensions that should be activated against a window/app/view.
Backport from
- https://gitlab.gnome.org/GNOME/gedit/-/commit/4fe7161560941ae1aa42165ff4d71121ad6f67b9
- https://gitlab.gnome.org/GNOME/gedit/-/commit/56a790a6851ebc98766cc4aca27cb32dde1b41bf
- https://gitlab.gnome.org/GNOME/gedit/-/commit/210ed41e48988646203fc94eba19ce94657821cd
In pluma-app.c we use gtk_main_quit instead of app object unref when last window closed.
Plugin engine finalization calls app_get_default which
reconstructs the app object. Before that was reasonably ok
because it didn't really do anything, but now the app does stuff
in 'init'.
See https://gitlab.gnome.org/GNOME/gedit/-/commit/90c9889a4a31fbebfa042c5d2c64bb2b05160b10
Diffstat (limited to 'pluma/Makefile.am')
| -rw-r--r-- | pluma/Makefile.am | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pluma/Makefile.am b/pluma/Makefile.am index 1dc9403c..28c869f0 100644 --- a/pluma/Makefile.am +++ b/pluma/Makefile.am @@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libpluma.la AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(srcdir) \ - -I$(srcdir)/mate-submodules/libegg \ + -I$(srcdir)/mate-submodules/libegg \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ $(INTROSPECTION_CFLAGS) \ @@ -65,6 +65,7 @@ NOINST_H_FILES = \ INST_H_FILES = \ pluma-app.h \ + pluma-app-activatable.h \ pluma-commands.h \ pluma-debug.h \ pluma-document.h \ @@ -82,7 +83,9 @@ INST_H_FILES = \ pluma-tab.h \ pluma-utils.h \ pluma-view.h \ - pluma-window.h + pluma-view-activatable.h \ + pluma-window.h \ + pluma-window-activatable.h if !ENABLE_GVFS_METADATA INST_H_FILES += pluma-metadata-manager.h @@ -95,6 +98,7 @@ header_DATA = \ libpluma_c_files = \ pluma-app.c \ + pluma-app-activatable.c \ pluma-close-button.c \ pluma-commands-documents.c \ pluma-commands-edit.c \ @@ -138,12 +142,16 @@ libpluma_c_files = \ pluma-tab-label.c \ pluma-utils.c \ pluma-view.c \ + pluma-view-activatable.c \ pluma-window.c \ + pluma-window-activatable.c \ plumatextregion.c +nodist_libpluma_la_SOURCES = \ + $(BUILT_SOURCES) + libpluma_la_SOURCES = \ $(libpluma_c_files) \ - $(BUILT_SOURCES) \ $(BACON_FILES) \ $(POSIXIO_FILES) \ $(NOINST_H_FILES) \ @@ -187,11 +195,11 @@ INTROSPECTION_GIRS = Pluma-1.0.gir INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir) --warn-all Pluma-1.0.gir: pluma -Pluma_1_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0 -Pluma_1_0_gir_FILES = $(INST_H_FILES) $(libpluma_c_files) $(BUILT_SOURCES) +Pluma_1_0_gir_NAMESPACE = Pluma Pluma_1_0_gir_VERSION = 1.0 Pluma_1_0_gir_PROGRAM = $(builddir)/pluma -Pluma_1_0_gir_NAMESPACE = Pluma +Pluma_1_0_gir_FILES = $(INST_H_FILES) $(libpluma_c_files) $(BUILT_SOURCES) +Pluma_1_0_gir_INCLUDES = Gtk-3.0 GtkSource-3.0 girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) @@ -202,9 +210,6 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelib_DATA) endif -dist-hook: - cd $(distdir); rm -f $(BUILT_SOURCES) - BACON_DIR=$(srcdir)/../../libbacon/src/ BACON_FILES=bacon-message-connection.h bacon-message-connection.c |