diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-18 22:52:00 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:50 +0200 |
| commit | 0819a3d1982403935eb70b958ad515494d1b9a0a (patch) | |
| tree | bdaa5394d36a89189dd93e3c253aaee163bbbb43 | |
| parent | 9cc5e9489fd7285759d7f4ed0d43028dabc7bd87 (diff) | |
| download | caja-0819a3d1982403935eb70b958ad515494d1b9a0a.tar.bz2 caja-0819a3d1982403935eb70b958ad515494d1b9a0a.tar.xz | |
[lc-p/fm] Replace deprecated GDK_DISPLAY with GDK_DISPLAY_XDISPLAY
Don't use GDK_DISPLAY ()
http://git.gnome.org/browse/nautilus/commit/?id=b66ce0fd23500f9727c1aac93366430285575697
| -rw-r--r-- | libcaja-private/caja-autorun.c | 3 | ||||
| -rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c index cf801b08..d78f402d 100644 --- a/libcaja-private/caja-autorun.c +++ b/libcaja-private/caja-autorun.c @@ -747,7 +747,8 @@ is_shift_pressed (void) ret = FALSE; gdk_error_trap_push (); - status = XkbGetState (GDK_DISPLAY (), XkbUseCoreKbd, &state); + status = XkbGetState (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), + XkbUseCoreKbd, &state); gdk_error_trap_pop (); if (status == Success) diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index ae9e4c02..37b88378 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -352,7 +352,7 @@ fm_desktop_icon_view_handle_middle_click (CajaIconContainer *icon_container, /* build an X event to represent the middle click. */ x_event.type = ButtonPress; x_event.send_event = True; - x_event.display = GDK_DISPLAY (); + x_event.display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); x_event.window = GDK_ROOT_WINDOW (); x_event.root = GDK_ROOT_WINDOW (); x_event.subwindow = 0; @@ -366,7 +366,7 @@ fm_desktop_icon_view_handle_middle_click (CajaIconContainer *icon_container, x_event.same_screen = True; /* Send it to the root window, the window manager will handle it. */ - XSendEvent (GDK_DISPLAY (), GDK_ROOT_WINDOW (), True, + XSendEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_ROOT_WINDOW (), True, ButtonPressMask, (XEvent *) &x_event); } |