diff options
| author | Federico Mena Quintero <federico@novell.com> | 2009-05-12 13:44:04 -0500 |
|---|---|---|
| committer | Federico Mena Quintero <federico@novell.com> | 2009-05-12 13:44:04 -0500 |
| commit | e2bce0d630c6f424664e81ee95352c4cbc41fc27 (patch) | |
| tree | d572c005f700dbb0fd28aa3490ae6f4d0c47927e /gtk/gtkclipboard.c | |
| parent | 52325ccd669ebd24de873bb0949d68d6dad17fb0 (diff) | |
| download | gtk+-e2bce0d630c6f424664e81ee95352c4cbc41fc27.tar.gz | |
bgo#463773 - Handle a NULL display in gtk_clipboard_get_for_display() so Flash won't hang
Diffstat (limited to 'gtk/gtkclipboard.c')
| -rw-r--r-- | gtk/gtkclipboard.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index 48ee63f537..c9e9a2c119 100644 --- 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); |