summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/caja-application.c4
-rw-r--r--src/file-manager/fm-desktop-icon-view.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/caja-application.c b/src/caja-application.c
index 77a323a6..5f460d3d 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -816,9 +816,9 @@ caja_application_create_desktop_windows (CajaApplication *application)
/* We realize it immediately so that the CAJA_DESKTOP_WINDOW_ID
property is set so mate-settings-daemon doesn't try to set the
- background. And we do a gdk_flush() to be sure X gets it. */
+ background. And we do a gdk_display_flush() to be sure X gets it. */
gtk_widget_realize (GTK_WIDGET (window));
- gdk_flush ();
+ gdk_display_flush (display);
caja_application_desktop_windows =
g_list_prepend (caja_application_desktop_windows, window);
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 42186a70..54e5d265 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -321,6 +321,7 @@ fm_desktop_icon_view_handle_middle_click (CajaIconContainer *icon_container,
XButtonEvent x_event;
GdkDevice *keyboard = NULL, *pointer = NULL, *cur;
GdkSeat *seat;
+ GdkDisplay *display;
seat = gdk_display_get_default_seat (gtk_widget_get_display (GTK_WIDGET (icon_container)));
pointer = gdk_seat_get_pointer (seat);
@@ -350,7 +351,8 @@ fm_desktop_icon_view_handle_middle_click (CajaIconContainer *icon_container,
}
/* Stop the event because we don't want anyone else dealing with it. */
- gdk_flush ();
+ display = gtk_widget_get_display (GTK_WIDGET (icon_container));
+ gdk_display_flush (display);
g_signal_stop_emission_by_name (icon_container, "middle_click");
/* build an X event to represent the middle click. */