summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.am9
-rw-r--r--plugins/fullscreen/eom-fullscreen-plugin.c12
-rw-r--r--plugins/fullscreen/fullscreen.plugin.desktop.in.in (renamed from plugins/fullscreen/fullscreen.plugin.desktop.in)2
-rw-r--r--plugins/fullscreen/meson.build27
-rw-r--r--plugins/meson.build8
-rw-r--r--plugins/reload/eom-reload-plugin.c2
-rw-r--r--plugins/reload/meson.build27
-rw-r--r--plugins/reload/reload.plugin.desktop.in.in (renamed from plugins/reload/reload.plugin.desktop.in)2
-rw-r--r--plugins/statusbar-date/eom-statusbar-date-plugin.c9
-rw-r--r--plugins/statusbar-date/meson.build27
-rw-r--r--plugins/statusbar-date/statusbar-date.plugin.desktop.in.in (renamed from plugins/statusbar-date/statusbar-date.plugin.desktop.in)2
11 files changed, 118 insertions, 9 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 614f435..48cb92f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -46,14 +46,19 @@ endif
# Generate plugin info files
+plugins_in_in_files = $(plugins_in_files:.desktop.in=.desktop.in.in)
plugins_DATA = $(plugins_in_files:.plugin.desktop.in=.plugin)
%.plugin: %.plugin.desktop.in
+if USE_NLS
$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+else
+ $(AM_V_GEN) cp $< $@
+endif
-DISTCLEANFILES = $(plugins_DATA)
+DISTCLEANFILES = $(plugins_in_files)
CLEANFILES = $(plugins_DATA)
-EXTRA_DIST = $(plugins_in_files)
+EXTRA_DIST = $(plugins_in_in_files)
-include $(top_srcdir)/git.mk
diff --git a/plugins/fullscreen/eom-fullscreen-plugin.c b/plugins/fullscreen/eom-fullscreen-plugin.c
index 653a725..b2565a1 100644
--- a/plugins/fullscreen/eom-fullscreen-plugin.c
+++ b/plugins/fullscreen/eom-fullscreen-plugin.c
@@ -119,8 +119,7 @@ eom_fullscreen_plugin_activate (EomWindowActivatable *activatable)
eom_debug (DEBUG_PLUGINS);
- plugin->signal_id = g_signal_connect (G_OBJECT (view),
- "button-press-event",
+ plugin->signal_id = g_signal_connect (view, "button-press-event",
G_CALLBACK (on_button_press),
plugin->window);
}
@@ -131,7 +130,14 @@ eom_fullscreen_plugin_deactivate (EomWindowActivatable *activatable)
EomFullscreenPlugin *plugin = EOM_FULLSCREEN_PLUGIN (activatable);
GtkWidget *view = eom_window_get_view (plugin->window);
- g_signal_handler_disconnect (view, plugin->signal_id);
+#if GLIB_CHECK_VERSION(2,62,0)
+ g_clear_signal_handler (&plugin->signal_id, view);
+#else
+ if (plugin->signal_id != 0) {
+ g_signal_handler_disconnect (view, plugin->signal_id);
+ plugin->signal_id = 0;
+ }
+#endif
}
static void
diff --git a/plugins/fullscreen/fullscreen.plugin.desktop.in b/plugins/fullscreen/fullscreen.plugin.desktop.in.in
index 34e5988..c7bb757 100644
--- a/plugins/fullscreen/fullscreen.plugin.desktop.in
+++ b/plugins/fullscreen/fullscreen.plugin.desktop.in.in
@@ -6,4 +6,4 @@ Icon=view-fullscreen
Description=Activate fullscreen mode with double-click
Authors=Lucas Rocha <[email protected]>
Copyright=Copyright © 2007 Lucas Rocha
-Website=http://www.mate-desktop.org/
+Website=@PACKAGE_URL@
diff --git a/plugins/fullscreen/meson.build b/plugins/fullscreen/meson.build
new file mode 100644
index 0000000..960a09e
--- /dev/null
+++ b/plugins/fullscreen/meson.build
@@ -0,0 +1,27 @@
+desktopfile = configure_file(input: 'fullscreen.plugin.desktop.in.in', configuration: pkg_info, output: 'fullscreen.plugin.desktop.in')
+if get_option('nls')
+ i18n.merge_file(
+ input: desktopfile,
+ output: 'fullscreen.plugin',
+ install: true,
+ install_dir: pluginsdir,
+ type: 'desktop',
+ po_dir: po_dir,
+ )
+else
+ install_data(desktopfile, install_dir: pluginsdir, rename: ['fullscreen.plugin'])
+endif
+
+shared_library(
+ 'fullscreen',
+ sources: [
+ 'eom-fullscreen-plugin.h',
+ 'eom-fullscreen-plugin.c',
+ ],
+ c_args: plugins_c_args,
+ dependencies: all_deps,
+ include_directories: [top_inc, src_inc],
+ link_with: [eom_links],
+ install: true,
+ install_dir: pluginsdir
+)
diff --git a/plugins/meson.build b/plugins/meson.build
new file mode 100644
index 0000000..3513e60
--- /dev/null
+++ b/plugins/meson.build
@@ -0,0 +1,8 @@
+plugins_c_args = ['-DEOM_LOCALEDIR=' + join_paths(datadir / 'locale')]
+
+subdir('fullscreen')
+subdir('reload')
+
+if exif.found()
+ subdir('statusbar-date')
+endif
diff --git a/plugins/reload/eom-reload-plugin.c b/plugins/reload/eom-reload-plugin.c
index 1f22eb2..e69b341 100644
--- a/plugins/reload/eom-reload-plugin.c
+++ b/plugins/reload/eom-reload-plugin.c
@@ -119,7 +119,9 @@ eom_reload_plugin_activate (EomWindowActivatable *activatable)
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
plugin->ui_action_group = gtk_action_group_new ("EomReloadPluginActions");
+#ifdef ENABLE_NLS
gtk_action_group_set_translation_domain (plugin->ui_action_group, GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
gtk_action_group_add_actions (plugin->ui_action_group, action_entries,
G_N_ELEMENTS (action_entries), plugin->window);
diff --git a/plugins/reload/meson.build b/plugins/reload/meson.build
new file mode 100644
index 0000000..5078556
--- /dev/null
+++ b/plugins/reload/meson.build
@@ -0,0 +1,27 @@
+desktopfile = configure_file(input: 'reload.plugin.desktop.in.in', configuration: pkg_info, output: 'reload.plugin.desktop.in')
+if get_option('nls')
+ i18n.merge_file(
+ input: desktopfile,
+ output: 'reload.plugin',
+ install: true,
+ install_dir: pluginsdir,
+ type: 'desktop',
+ po_dir: po_dir,
+ )
+else
+ install_data(desktopfile, install_dir: pluginsdir, rename: ['reload.plugin'])
+endif
+
+shared_library(
+ 'reload',
+ sources: [
+ 'eom-reload-plugin.h',
+ 'eom-reload-plugin.c',
+ ],
+ c_args: plugins_c_args,
+ dependencies: all_deps,
+ include_directories: [top_inc, src_inc],
+ link_with: [eom_links],
+ install: true,
+ install_dir: pluginsdir
+)
diff --git a/plugins/reload/reload.plugin.desktop.in b/plugins/reload/reload.plugin.desktop.in.in
index 60087a3..db791a7 100644
--- a/plugins/reload/reload.plugin.desktop.in
+++ b/plugins/reload/reload.plugin.desktop.in.in
@@ -6,4 +6,4 @@ Icon=view-refresh
Description=Reload current image
Authors=Lucas Rocha <[email protected]>
Copyright=Copyright © 2007 Lucas Rocha
-Website=http://www.mate-desktop.org/
+Website=@PACKAGE_URL@
diff --git a/plugins/statusbar-date/eom-statusbar-date-plugin.c b/plugins/statusbar-date/eom-statusbar-date-plugin.c
index 81b65f2..322277d 100644
--- a/plugins/statusbar-date/eom-statusbar-date-plugin.c
+++ b/plugins/statusbar-date/eom-statusbar-date-plugin.c
@@ -195,7 +195,14 @@ eom_statusbar_date_plugin_deactivate (EomWindowActivatable *activatable)
GtkWidget *statusbar = eom_window_get_statusbar (window);
GtkWidget *view = eom_window_get_thumb_view (window);
- g_signal_handler_disconnect (view, plugin->signal_id);
+#if GLIB_CHECK_VERSION(2,62,0)
+ g_clear_signal_handler (&plugin->signal_id, view);
+#else
+ if (plugin->signal_id != 0) {
+ g_signal_handler_disconnect (view, plugin->signal_id);
+ plugin->signal_id = 0;
+ }
+#endif
gtk_container_remove (GTK_CONTAINER (statusbar), plugin->statusbar_date);
}
diff --git a/plugins/statusbar-date/meson.build b/plugins/statusbar-date/meson.build
new file mode 100644
index 0000000..bdde68f
--- /dev/null
+++ b/plugins/statusbar-date/meson.build
@@ -0,0 +1,27 @@
+desktopfile = configure_file(input: 'statusbar-date.plugin.desktop.in.in', configuration: pkg_info, output: 'statusbar-date.plugin.desktop.in')
+if get_option('nls')
+ i18n.merge_file(
+ input: desktopfile,
+ output: 'statusbar-date.plugin',
+ install: true,
+ install_dir: pluginsdir,
+ type: 'desktop',
+ po_dir: po_dir,
+ )
+else
+ install_data(desktopfile, install_dir: pluginsdir, rename: ['statusbar-date.plugin'])
+endif
+
+shared_library(
+ 'statusbar-date',
+ sources: [
+ 'eom-statusbar-date-plugin.h',
+ 'eom-statusbar-date-plugin.c',
+ ],
+ c_args: plugins_c_args,
+ dependencies: all_deps,
+ include_directories: [top_inc, src_inc],
+ link_with: [eom_links],
+ install: true,
+ install_dir: pluginsdir
+)
diff --git a/plugins/statusbar-date/statusbar-date.plugin.desktop.in b/plugins/statusbar-date/statusbar-date.plugin.desktop.in.in
index c87848e..3898ae6 100644
--- a/plugins/statusbar-date/statusbar-date.plugin.desktop.in
+++ b/plugins/statusbar-date/statusbar-date.plugin.desktop.in.in
@@ -5,4 +5,4 @@ Name=Date in statusbar
Description=Shows the image date in the window statusbar
Authors=Claudio Saavedra <[email protected]>
Copyright=Copyright © 2008 Free Software Foundation
-Website=http://www.mate-desktop.org/
+Website=@PACKAGE_URL@
generated by cgit v1.2.1 (git 2.18.0) at 2025-07-04 22:25:00 +0000