summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac5
-rw-r--r--src/eom-close-confirmation-dialog.c2
-rw-r--r--src/eom-print-image-setup.c22
3 files changed, 17 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 9163fdc..eade83b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,9 +98,11 @@ AC_MSG_RESULT([$with_gtk])
case "$with_gtk" in
2.0) GTK_API_VERSION=2.0
GTK_REQUIRED=2.18.0
+ GTK_PRINT_REQUIRED=2.10.0
;;
3.0) GTK_API_VERSION=3.0
GTK_REQUIRED=3.0.0
+ GTK_PRINT_REQUIRED=3.0.0
;;
esac
@@ -108,7 +110,6 @@ GLIB_REQUIRED=2.25.9
GIO_REQUIRED=2.25.9
MATE_DESKTOP_REQUIRED=1.5.0
GDKPIXBUF_REQUIRED=2.4.0
-GTK_PRINT_REQUIRED=2.10.0
MATE_ICON_THEME_REQUIRED=1.1.0
SHARED_MIME_INFO_REQUIRED=0.20
EXEMPI_REQUIRED=1.99.5
@@ -122,7 +123,7 @@ EOM_MODULES="gtk+-$GTK_API_VERSION >= $GTK_REQUIRED \
mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED \
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED \
gio-2.0 >= $GIO_REQUIRED \
- gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED \
+ gtk+-unix-print-$GTK_API_VERSION >= $GTK_PRINT_REQUIRED \
mate-icon-theme >= $MATE_ICON_THEME_REQUIRED \
shared-mime-info >= $SHARED_MIME_INFO_REQUIRED"
diff --git a/src/eom-close-confirmation-dialog.c b/src/eom-close-confirmation-dialog.c
index c747465..9355ba4 100644
--- a/src/eom-close-confirmation-dialog.c
+++ b/src/eom-close-confirmation-dialog.c
@@ -180,7 +180,9 @@ eom_close_confirmation_dialog_init (EomCloseConfirmationDialog *dlg)
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), 14);
gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
+#if !GTK_CHECK_VERSION(2,22,0)
gtk_dialog_set_has_separator (GTK_DIALOG (dlg), FALSE);
+#endif
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dlg), TRUE);
gtk_window_set_title (GTK_WINDOW (dlg), "");
diff --git a/src/eom-print-image-setup.c b/src/eom-print-image-setup.c
index df63b2b..787b214 100644
--- a/src/eom-print-image-setup.c
+++ b/src/eom-print-image-setup.c
@@ -36,8 +36,10 @@
#include "eom-print-image-setup.h"
#include "eom-print-preview.h"
-#if GTK_CHECK_VERSION(3, 0, 0)
- #define gtk_combo_box_new_text() gtk_combo_box_text_new()
+#if !GTK_CHECK_VERSION(2,24,0)
+ #define gtk_combo_box_text_new() gtk_combo_box_new_text()
+ #define gtk_combo_box_text_insert_text(x,y,z) gtk_combo_box_insert_text(x,y,z)
+ #define GTK_COMBO_BOX_TEXT(x) GTK_COMBO_BOX(x)
#endif
/**
@@ -884,14 +886,14 @@ eom_print_image_setup_init (EomPrintImageSetup *setup)
label = gtk_label_new_with_mnemonic (_("C_enter:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- combobox = gtk_combo_box_new_text ();
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
+ combobox = gtk_combo_box_text_new ();
+ gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combobox),
CENTER_NONE, _("None"));
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combobox),
CENTER_HORIZONTAL, _("Horizontal"));
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combobox),
CENTER_VERTICAL, _("Vertical"));
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combobox),
CENTER_BOTH, _("Both"));
gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), CENTER_NONE);
gtk_table_attach (GTK_TABLE (table), label,
@@ -934,10 +936,10 @@ eom_print_image_setup_init (EomPrintImageSetup *setup)
label = gtk_label_new_with_mnemonic (_("_Unit:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- combobox = gtk_combo_box_new_text ();
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox), UNIT_MM,
+ combobox = gtk_combo_box_text_new ();
+ gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combobox), UNIT_MM,
_("Millimeters"));
- gtk_combo_box_insert_text (GTK_COMBO_BOX (combobox), UNIT_INCH,
+ gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combobox), UNIT_INCH,
_("Inches"));
#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT