Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -0,0 +1,23 @@
commit 124e814f478936e017e58359240c540ad6678f3b
Author: John Ralls <jralls@ceridwen.us>
Date: Sat Sep 28 10:55:22 2013 -0700
Bug 651224 - Potential NULL display ptr from quartz gtk_clipboard_wait_for_contents
diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c
index ab7732b..a68d1cf 100644
--- a/gtk/gtkclipboard-quartz.c
+++ b/gtk/gtkclipboard-quartz.c
@@ -701,10 +701,12 @@ gtk_clipboard_wait_for_contents (GtkClipboard *clipboard,
GdkAtom *atoms;
length = [types count] * sizeof (GdkAtom);
-
+
selection_data = g_slice_new0 (GtkSelectionData);
selection_data->selection = clipboard->selection;
selection_data->target = target;
+ if (!selection_data->display)
+ selection_data->display = gdk_display_get_default ();
atoms = g_malloc (length);