diff options
| author | monsta <[email protected]> | 2018-01-28 11:43:24 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-01-29 14:22:01 +0100 |
| commit | 31da7a4eb64da546b3eb9d3226f6a5710bf0de2d (patch) | |
| tree | 90b3951963f1f66c382b2c9e01273549c4b22dfa | |
| parent | c0f503b1b003bb664545a3685b863f2ce6fdb1c4 (diff) | |
| download | mate-user-share-31da7a4eb64da546b3eb9d3226f6a5710bf0de2d.tar.bz2 mate-user-share-31da7a4eb64da546b3eb9d3226f6a5710bf0de2d.tar.xz | |
require GTK+ 3.22 and GLib 2.50
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/caja-share-bar.c | 8 | ||||
| -rw-r--r-- | src/file-share-properties.c | 4 |
3 files changed, 2 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index a2f6370..df24355 100644 --- a/configure.ac +++ b/configure.ac @@ -62,8 +62,8 @@ AS_IF([test "x$enable_bluetooth" = "xyes"],[ ]) AM_CONDITIONAL(USE_BLUETOOTH, [test "$enable_bluetooth" = "yes"]) -GLIB_REQUIRED_VERSION=2.36.0 -GTK_REQUIRED_VERSION=3.14.0 +GLIB_REQUIRED_VERSION=2.50.0 +GTK_REQUIRED_VERSION=3.22.0 dnl ========================================================================== diff --git a/src/caja-share-bar.c b/src/caja-share-bar.c index 8a0de08..6c62a26 100644 --- a/src/caja-share-bar.c +++ b/src/caja-share-bar.c @@ -104,22 +104,14 @@ caja_share_bar_init (CajaShareBar *bar) gtk_label_set_attributes (GTK_LABEL (label), attrs); pango_attr_list_unref (attrs); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -#endif gtk_widget_show (label); gtk_container_add (GTK_CONTAINER (vbox), label); bar->priv->label = gtk_label_new (NULL); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (bar->priv->label), 0.0); gtk_label_set_yalign (GTK_LABEL (bar->priv->label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5); -#endif gtk_widget_show (bar->priv->label); gtk_container_add (GTK_CONTAINER (vbox), bar->priv->label); diff --git a/src/file-share-properties.c b/src/file-share-properties.c index dad134b..111a51b 100644 --- a/src/file-share-properties.c +++ b/src/file-share-properties.c @@ -438,11 +438,7 @@ help_button_clicked (GtkButton *button, GtkWidget *window) { GError *error = NULL; -#if GTK_CHECK_VERSION (3, 22, 0) if (gtk_show_uri_on_window (GTK_WINDOW (window), "help:mate-user-share", gtk_get_current_event_time (), &error) == FALSE) { -#else - if (gtk_show_uri (gtk_widget_get_screen (window), "help:mate-user-share", gtk_get_current_event_time (), &error) == FALSE) { -#endif GtkWidget *dialog; dialog = error_dialog (_("Could not display the help contents."), error->message, GTK_WINDOW (window)); |