diff options
| author | ZenWalker <[email protected]> | 2017-08-15 04:46:06 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2017-08-24 07:57:34 +0200 |
| commit | b3434faf1254d906f4db1b68f514e0f364b0cfad (patch) | |
| tree | 1da238f3b615abeaf254be51f3648f3a5705fde6 | |
| parent | 7facec455d825d317caffb8cafc4e4fec60065d9 (diff) | |
| download | mate-power-manager-b3434faf1254d906f4db1b68f514e0f364b0cfad.tar.bz2 mate-power-manager-b3434faf1254d906f4db1b68f514e0f364b0cfad.tar.xz | |
gtk 3.22: avoid deprecated gdk_screen_get_monitor... functions:
avoid deprecated:
gdk_screen_get_monitor_geometry
gdk_screen_get_monitor_at_point
| -rw-r--r-- | src/gpm-backlight.c | 12 | ||||
| -rw-r--r-- | src/gpm-kbd-backlight.c | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c index 68438ce..fa54ad6 100644 --- a/src/gpm-backlight.c +++ b/src/gpm-backlight.c @@ -208,7 +208,11 @@ gpm_backlight_dialog_show (GpmBacklight *backlight) GtkRequisition win_req; GdkScreen *pointer_screen; GdkRectangle geometry; +#if GTK_CHECK_VERSION (3, 22, 0) + GdkMonitor *monitor; +#else int monitor; +#endif GdkDisplay *display; GdkDeviceManager *device_manager; GdkDevice *device; @@ -237,6 +241,13 @@ gpm_backlight_dialog_show (GpmBacklight *backlight) &pointer_x, &pointer_y); +#if GTK_CHECK_VERSION (3, 22, 0) + monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display (pointer_screen), + pointer_x, + pointer_y); + + gdk_monitor_get_geometry (monitor, &geometry); +#else monitor = gdk_screen_get_monitor_at_point (pointer_screen, pointer_x, pointer_y); @@ -244,6 +255,7 @@ gpm_backlight_dialog_show (GpmBacklight *backlight) gdk_screen_get_monitor_geometry (pointer_screen, monitor, &geometry); +#endif screen_w = geometry.width; screen_h = geometry.height; diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c index c646855..cc5d362 100644 --- a/src/gpm-kbd-backlight.c +++ b/src/gpm-kbd-backlight.c @@ -185,7 +185,11 @@ gpm_kbd_backlight_dialog_show (GpmKbdBacklight *backlight) GtkRequisition win_req; GdkScreen *pointer_screen; GdkRectangle geometry; +#if GTK_CHECK_VERSION (3, 22, 0) + GdkMonitor *monitor; +#else int monitor; +#endif GdkDisplay *display; GdkDeviceManager *device_manager; GdkDevice *device; @@ -214,6 +218,13 @@ gpm_kbd_backlight_dialog_show (GpmKbdBacklight *backlight) &pointer_x, &pointer_y); +#if GTK_CHECK_VERSION (3, 22, 0) + monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display (pointer_screen), + pointer_x, + pointer_y); + + gdk_monitor_get_geometry (monitor, &geometry); +#else monitor = gdk_screen_get_monitor_at_point (pointer_screen, pointer_x, pointer_y); @@ -221,6 +232,7 @@ gpm_kbd_backlight_dialog_show (GpmKbdBacklight *backlight) gdk_screen_get_monitor_geometry (pointer_screen, monitor, &geometry); +#endif screen_w = geometry.width; screen_h = geometry.height; |