From ce1cbb1ec0c2ca72457fedb88aef870b9a5036fd Mon Sep 17 00:00:00 2001 From: monsta Date: Tue, 22 Nov 2016 00:00:24 +0300 Subject: move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option and require mate-panel >= 1.17 --- src/gpm-backlight.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'src/gpm-backlight.c') diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c index 82841b3..0989640 100644 --- a/src/gpm-backlight.c +++ b/src/gpm-backlight.c @@ -55,10 +55,6 @@ #include "gpm-icon-names.h" #include "egg-console-kit.h" -#if !GTK_CHECK_VERSION(3,0,0) -#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,y) -#endif - #define GPM_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_BACKLIGHT, GpmBacklightPrivate)) struct GpmBacklightPrivate @@ -214,11 +210,9 @@ gpm_backlight_dialog_show (GpmBacklight *backlight) GdkScreen *pointer_screen; GdkRectangle geometry; int monitor; -#if GTK_CHECK_VERSION(3,0,0) GdkDisplay *display; GdkDeviceManager *device_manager; GdkDevice *device; -#endif /* * get the window size @@ -236,7 +230,6 @@ gpm_backlight_dialog_show (GpmBacklight *backlight) } pointer_screen = NULL; -#if GTK_CHECK_VERSION(3,0,0) display = gtk_widget_get_display (backlight->priv->popup); device_manager = gdk_display_get_device_manager (display); device = gdk_device_manager_get_client_pointer (device_manager); @@ -244,13 +237,7 @@ gpm_backlight_dialog_show (GpmBacklight *backlight) &pointer_screen, &pointer_x, &pointer_y); -#else - gdk_display_get_pointer (gtk_widget_get_display (backlight->priv->popup), - &pointer_screen, - &pointer_x, - &pointer_y, - NULL); -#endif + monitor = gdk_screen_get_monitor_at_point (pointer_screen, pointer_x, pointer_y); -- cgit v1.2.1