summaryrefslogtreecommitdiff
path: root/geyes/geyes.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2018-02-02 16:25:31 +0300
committerraveit65 <[email protected]>2018-02-04 20:32:14 +0100
commitd1020226236576464be4ab47ec0098a588bef486 (patch)
treec79b616da32f8b684b964af8b8cf3fa96b98c4e6 /geyes/geyes.c
parente6d55cba85fc49b3dfac8150c397540bda369847 (diff)
downloadmate-applets-d1020226236576464be4ab47ec0098a588bef486.tar.bz2
mate-applets-d1020226236576464be4ab47ec0098a588bef486.tar.xz
require GTK+ 3.22 and GLib 2.50
Diffstat (limited to 'geyes/geyes.c')
-rw-r--r--geyes/geyes.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/geyes/geyes.c b/geyes/geyes.c
index 2c8ed8a8..00f85fd7 100644
--- a/geyes/geyes.c
+++ b/geyes/geyes.c
@@ -124,33 +124,20 @@ static gint
timer_cb (EyesApplet *eyes_applet)
{
GdkDisplay *display;
-#if GTK_CHECK_VERSION (3, 20, 0)
GdkSeat *seat;
-#else
- GdkDeviceManager *device_manager;
- GdkDevice *device;
-#endif
gint x, y;
gint pupil_x, pupil_y;
gint i;
display = gtk_widget_get_display (GTK_WIDGET (eyes_applet->applet));
-#if GTK_CHECK_VERSION (3, 20, 0)
seat = gdk_display_get_default_seat (display);
-#else
- device_manager = gdk_display_get_device_manager (display);
- device = gdk_device_manager_get_client_pointer (device_manager);
-#endif
for (i = 0; i < eyes_applet->num_eyes; i++) {
if (gtk_widget_get_realized (eyes_applet->eyes[i])) {
-#if GTK_CHECK_VERSION (3, 20, 0)
gdk_window_get_device_position (gtk_widget_get_window (eyes_applet->eyes[i]),
gdk_seat_get_pointer (seat),
&x, &y, NULL);
-#else
- gdk_window_get_device_position (gtk_widget_get_window (eyes_applet->eyes[i]), device, &x, &y, NULL);
-#endif
+
if ((x != eyes_applet->pointer_last_x[i]) || (y != eyes_applet->pointer_last_y[i])) {
calculate_pupil_xy (eyes_applet, x, y, &pupil_x, &pupil_y, eyes_applet->eyes[i]);
@@ -342,17 +329,10 @@ help_cb (GtkAction *action,
{
GError *error = NULL;
-#if GTK_CHECK_VERSION (3, 22, 0)
gtk_show_uri_on_window (NULL,
"help:mate-geyes",
gtk_get_current_event_time (),
&error);
-#else
- gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (eyes_applet->applet)),
- "help:mate-geyes",
- gtk_get_current_event_time (),
- &error);
-#endif
if (error) {
GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,