Merge fix for bgo#463773 - Handle a NULL display in gtk_clipboard_get_for_display() so Flash won't hang

2009-05-12 13:50:45 -05:00
parent c57fc80465 e2bce0d630
commit 4134c346f9
1 changed files with 1 additions and 0 deletions
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@ -300,6 +300,7 @@ GtkClipboard *
 gtk_clipboard_get_for_display (GdkDisplay *display, 
 			       GdkAtom     selection)
 {
+  g_return_val_if_fail (display != NULL, NULL); /* See bgo#463773; this is needed because Flash Player sucks */
  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
  g_return_val_if_fail (!display->closed, NULL);