diff options
| author | Jasmine Hassan <[email protected]> | 2012-12-22 03:07:56 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-12-22 03:36:29 +0200 |
| commit | 79738b4bddc38257848464414a6b0f16dee86d22 (patch) | |
| tree | 5020788bca4b4079c4fe179f67ff0c9012ed3b52 | |
| parent | f6c53419d075eb15dd952119bfc0bc9db2c30fbd (diff) | |
| download | mate-settings-daemon-79738b4bddc38257848464414a6b0f16dee86d22.tar.bz2 mate-settings-daemon-79738b4bddc38257848464414a6b0f16dee86d22.tar.xz | |
[general] replace deprecations, use GDK X11 API, bump GTK+ to 2.24
for:
gdk_x11_window_lookup_for_display()
gdk_x11_window_foreign_new_for_display()
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/clipboard/msd-clipboard-manager.c | 4 | ||||
| -rw-r--r-- | plugins/xrandr/msd-xrandr-manager.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f4311ab..8286840 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ dnl --------------------------------------------------------------------------- DBUS_GLIB_REQUIRED_VERSION=0.74 GLIB_REQUIRED_VERSION=2.17.3 -GTK_REQUIRED_VERSION=2.21.2 +GTK_REQUIRED_VERSION=2.24.0 GIO_REQUIRED_VERSION=2.26.0 MATE_DESKTOP_REQUIRED_VERSION=1.5.0 LIBMATENOTIFY_REQUIRED_VERSION=1.1.0 diff --git a/plugins/clipboard/msd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c index 8f02be1..93b1858 100644 --- a/plugins/clipboard/msd-clipboard-manager.c +++ b/plugins/clipboard/msd-clipboard-manager.c @@ -825,11 +825,11 @@ clipboard_manager_watch_cb (MsdClipboardManager *manager, GdkDisplay *display; display = gdk_display_get_default (); - gdkwin = gdk_window_lookup_for_display (display, window); + gdkwin = gdk_x11_window_lookup_for_display (display, window); if (is_start) { if (gdkwin == NULL) { - gdkwin = gdk_window_foreign_new_for_display (display, window); + gdkwin = gdk_x11_window_foreign_new_for_display (display, window); } else { g_object_ref (gdkwin); } diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index c56cd51..f7f1f88 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -614,7 +614,7 @@ msd_xrandr_manager_2_apply_configuration (MsdXrandrManager *manager, gboolean result; if (parent_window_id != 0) - parent_window = gdk_window_foreign_new_for_display (gdk_display_get_default (), (GdkNativeWindow) parent_window_id); + parent_window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), (Window) parent_window_id); else parent_window = NULL; |