diff options
| author | raveit65 <[email protected]> | 2018-01-31 11:17:25 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-01-31 13:12:39 +0100 |
| commit | d269182caecf368c957a00310e245d176e809e83 (patch) | |
| tree | f19f87d013eec81107644b61e205f1d1af217366 | |
| parent | bcd9924b5e561b2af08ec91e5ecbb9ecaf26c13c (diff) | |
| download | mate-sensors-applet-d269182caecf368c957a00310e245d176e809e83.tar.bz2 mate-sensors-applet-d269182caecf368c957a00310e245d176e809e83.tar.xz | |
require GTK+ 3.22 and GLib 2.50
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | sensors-applet/prefs-dialog.c | 4 | ||||
| -rw-r--r-- | sensors-applet/sensor-config-dialog.c | 4 | ||||
| -rw-r--r-- | sensors-applet/sensors-applet.c | 12 |
4 files changed, 2 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 65f71d6..a94680d 100644 --- a/configure.ac +++ b/configure.ac @@ -47,8 +47,8 @@ AC_CHECK_HEADERS( dlfcn.h ) -GLIB_REQUIRED=2.36.0 -GTK_REQUIRED=3.14.0 +GLIB_REQUIRED=2.50.0 +GTK_REQUIRED=3.22.0 LIBPANEL_REQUIRED=1.17.0 LIBNOTIFY_REQUIRED=0.7.0 LIBCAIRO_REQUIRED=1.0.4 diff --git a/sensors-applet/prefs-dialog.c b/sensors-applet/prefs-dialog.c index f7d11ff..6694ada 100644 --- a/sensors-applet/prefs-dialog.c +++ b/sensors-applet/prefs-dialog.c @@ -71,11 +71,7 @@ void prefs_dialog_response(GtkDialog *prefs_dialog, ((current_page == 1) ? "sensors-applet-sensors" : NULL))); -#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window(NULL, uri, gtk_get_current_event_time(), &error); -#else - gtk_show_uri(NULL, uri, gtk_get_current_event_time(), &error); -#endif g_free(uri); if (error) { diff --git a/sensors-applet/sensor-config-dialog.c b/sensors-applet/sensor-config-dialog.c index 16583f9..ba095d1 100644 --- a/sensors-applet/sensor-config-dialog.c +++ b/sensors-applet/sensor-config-dialog.c @@ -81,11 +81,7 @@ static void sensor_config_dialog_response(GtkDialog *dialog, switch (response) { case GTK_RESPONSE_HELP: g_debug("loading help in config dialog"); -#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window(NULL, -#else - gtk_show_uri(NULL, -#endif "help:mate-sensors-applet/sensors-applet-sensors#sensors-applet-sensor-config-dialog", gtk_get_current_event_time(), &error); diff --git a/sensors-applet/sensors-applet.c b/sensors-applet/sensors-applet.c index 3ddd48d..583c42c 100644 --- a/sensors-applet/sensors-applet.c +++ b/sensors-applet/sensors-applet.c @@ -75,11 +75,7 @@ static void help_cb(GtkAction *action, gpointer data) { GError *error = NULL; -#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window(NULL, "help:mate-sensors-applet", -#else - gtk_show_uri(NULL, "help:mate-sensors-applet", -#endif gtk_get_current_event_time(), &error); @@ -704,12 +700,8 @@ static void sensors_applet_pack_display(SensorsApplet *sensors_applet) { gtk_widget_set_valign (((ActiveSensor *)(current_sensor->data))->icon, GTK_ALIGN_CENTER); } if (((ActiveSensor *)(current_sensor->data))->label) { -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL(((ActiveSensor *)(current_sensor->data))->label), 0); gtk_label_set_yalign (GTK_LABEL(((ActiveSensor *)(current_sensor->data))->label), 0.5); -#else - gtk_misc_set_alignment(GTK_MISC(((ActiveSensor *)(current_sensor->data))->label), 0.0, 0.5); -#endif } if (((ActiveSensor *)(current_sensor->data))->value) { gtk_widget_set_halign (((ActiveSensor *)(current_sensor->data))->value, GTK_ALIGN_START); @@ -731,12 +723,8 @@ static void sensors_applet_pack_display(SensorsApplet *sensors_applet) { gtk_widget_set_valign (((ActiveSensor *)(current_sensor->data))->icon, GTK_ALIGN_CENTER); } if (((ActiveSensor *)(current_sensor->data))->label) { -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL(((ActiveSensor *)(current_sensor->data))->label), 0.5); gtk_label_set_yalign (GTK_LABEL(((ActiveSensor *)(current_sensor->data))->label), 0.5); -#else - gtk_misc_set_alignment(GTK_MISC(((ActiveSensor *)(current_sensor->data))->label), 0.5, 0.5); -#endif } if (((ActiveSensor *)(current_sensor->data))->value) { gtk_widget_set_halign (((ActiveSensor *)(current_sensor->data))->value, GTK_ALIGN_CENTER); |