diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | gtk/Makefile.am | 9 | ||||
| -rw-r--r-- | gtk/gtksettings.c | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 58163d84b8..6546fbe7d9 100644 --- a/configure.ac +++ b/configure.ac @@ -399,7 +399,6 @@ if test "x$enable_quartz_backend" = xyes; then # Pull in gio-unix for GDesktopAppInfo usage, see at least # gdkapplaunchcontext-x11.c have_gio_unix=yes - else AM_CONDITIONAL(USE_QUARTZ, false) fi diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 14a76a9a0c..d897df8d0f 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -2,12 +2,6 @@ AUTOMAKE_OPTIONS = subdir-objects include $(top_srcdir)/Makefile.decl -if USE_QUARTZ -GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f" -else -GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" -endif - AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Gtk\" \ -DGTK_LIBDIR=\"$(libdir)\" \ @@ -19,12 +13,11 @@ AM_CPPFLAGS = \ -DGTK_HOST=\"$(host)\" \ -DGTK_COMPILATION \ -DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\" \ - -DGTK_PRINT_PREVIEW_COMMAND=\"$(GTK_PRINT_PREVIEW_COMMAND)\" \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -I$(top_builddir) \ -I$(top_builddir)/gtk \ -I$(top_srcdir) \ -I$(top_srcdir)/gdk \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(GMODULE_CFLAGS) \ $(GTK_DEBUG_FLAGS) \ $(GDK_HIDDEN_VISIBILITY_CFLAGS) \ diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 0b6c41f56c..180b42e074 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -59,6 +59,12 @@ #include "deprecated/gtkrc.h" +#ifdef GDK_WINDOWING_QUARTZ +#define PRINT_PREVIEW_COMMAND "open -a /Applications/Preview.app %f" +#else +#define PRINT_PREVIEW_COMMAND "evince --unlink-tempfile --preview --print-settings %s %f" +#endif + /** * SECTION:gtksettings * @Short_description: Sharing settings between applications @@ -987,7 +993,7 @@ gtk_settings_class_init (GtkSettingsClass *class) g_param_spec_string ("gtk-print-preview-command", P_("Default command to run when displaying a print preview"), P_("Command to run when displaying a print preview"), - GTK_PRINT_PREVIEW_COMMAND, + PRINT_PREVIEW_COMMAND, GTK_PARAM_READWRITE), NULL); g_assert (result == PROP_PRINT_PREVIEW_COMMAND); |