diff options
| author | monsta <[email protected]> | 2018-01-27 22:28:20 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-01-28 11:38:13 +0100 |
| commit | 55e7dbacb56a742128eb802ff16eba90faa00229 (patch) | |
| tree | 68597a775dd9b90b45c090197708d28a568e97be | |
| parent | 171fc61b7cc160b915b4973d81e11a4431d4fcfb (diff) | |
| download | mate-session-manager-55e7dbacb56a742128eb802ff16eba90faa00229.tar.bz2 mate-session-manager-55e7dbacb56a742128eb802ff16eba90faa00229.tar.xz | |
require GTK+ 3.22 and GLib 2.50
and drop additional checks for min/max GLib versions, it's not needed
| -rw-r--r-- | capplet/main.c | 13 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 2 insertions, 21 deletions
diff --git a/capplet/main.c b/capplet/main.c index 257618f..30c2ac6 100644 --- a/capplet/main.c +++ b/capplet/main.c @@ -38,7 +38,6 @@ static GOptionEntry options[] = { static void dialog_response(GsmPropertiesDialog* dialog, guint response_id, gpointer data) { -#if GTK_CHECK_VERSION (3, 22, 0) GError* error; if (response_id == GTK_RESPONSE_HELP) @@ -46,18 +45,6 @@ static void dialog_response(GsmPropertiesDialog* dialog, guint response_id, gpoi error = NULL; gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-user-guide/gosstartsession-2", gtk_get_current_event_time (), &error); -#else - GdkScreen* screen; - GError* error; - - if (response_id == GTK_RESPONSE_HELP) - { - screen = gtk_widget_get_screen(GTK_WIDGET (dialog)); - - error = NULL; - gtk_show_uri (screen, "help:mate-user-guide/gosstartsession-2", - gtk_get_current_event_time (), &error); -#endif if (error != NULL) { diff --git a/configure.ac b/configure.ac index 3493934..dfd643b 100644 --- a/configure.ac +++ b/configure.ac @@ -11,12 +11,6 @@ AM_MAINTAINER_MODE MATE_COMMON_INIT MATE_DEBUG_CHECK -# GLib min/max required versions -AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], - [Warn on use of APIs added after GLib 2.36]) -AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], - [Warn on use of APIs deprecated before GLib 2.36]) - IT_PROG_INTLTOOL([0.50.1]) AC_PROG_CC @@ -41,9 +35,9 @@ if test "x$enable_deprecations" = "xyes"; then AC_SUBST([DISABLE_DEPRECATED_CFLAGS]) fi -GLIB_REQUIRED=2.36.0 +GLIB_REQUIRED=2.50.0 GIO_REQUIRED=2.25.0 -GTK_REQUIRED=3.14.0 +GTK_REQUIRED=3.22.0 DBUS_GLIB_REQUIRED=0.76 dnl ==================================================================== |