diff options
Diffstat (limited to 'plugins/time')
| -rwxr-xr-x | plugins/time/Makefile.am | 4 | ||||
| -rwxr-xr-x | plugins/time/pluma-time-plugin.c | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am index 398e84b4..0c270b8a 100755 --- a/plugins/time/Makefile.am +++ b/plugins/time/Makefile.am @@ -1,7 +1,7 @@ # time plugin plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ @@ -34,7 +34,7 @@ gsettings_SCHEMAS = org.mate.pluma.plugins.time.gschema.xml %.gschema.xml.in: %.gschema.xml.in.in Makefile $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ -EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS_in_in) +EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS).in.in CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn) DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) diff --git a/plugins/time/pluma-time-plugin.c b/plugins/time/pluma-time-plugin.c index 36a96352..a1b8e354 100755 --- a/plugins/time/pluma-time-plugin.c +++ b/plugins/time/pluma-time-plugin.c @@ -450,7 +450,11 @@ get_time (const gchar* format) } static void +#if GTK_CHECK_VERSION (3, 0, 0) +dialog_disposed (GObject *obj, gpointer dialog_pointer) +#else dialog_destroyed (GtkObject *obj, gpointer dialog_pointer) +#endif { pluma_debug (DEBUG_PLUGINS); @@ -830,8 +834,13 @@ get_configure_dialog (PlumaTimePlugin *plugin) G_CALLBACK (configure_dialog_button_toggled), dialog); g_signal_connect (dialog->dialog, +#if GTK_CHECK_VERSION (3, 0, 0) + "dispose", + G_CALLBACK (dialog_disposed), +#else "destroy", G_CALLBACK (dialog_destroyed), +#endif dialog); g_signal_connect (dialog->custom_entry, "changed", @@ -993,8 +1002,13 @@ get_choose_format_dialog (GtkWindow *parent, G_CALLBACK (choose_format_dialog_button_toggled), dialog); g_signal_connect (dialog->dialog, +#if GTK_CHECK_VERSION (3, 0, 0) + "dispose", + G_CALLBACK (dialog_disposed), +#else "destroy", G_CALLBACK (dialog_destroyed), +#endif dialog); g_signal_connect (dialog->custom_entry, "changed", |