diff --git a/ChangeLog b/ChangeLog
index 8f8f4be594..5ad8323aa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 28 13:28:10  Shivram U  <shivaram.upadhyayula@wipro.com>
+
+	* gtk/gtktextbuffer.c (selection_data_get_buffer): Check if the owner
+	got is of type GDK_WINDOW_FOREIGN. If so the owner is not in-process,
+	and so return NULL.
+
 2002-05-24  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkmain.c (_gtk_find_module): don't leak the paths.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8f8f4be594..5ad8323aa8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon May 28 13:28:10  Shivram U  <shivaram.upadhyayula@wipro.com>
+
+	* gtk/gtktextbuffer.c (selection_data_get_buffer): Check if the owner
+	got is of type GDK_WINDOW_FOREIGN. If so the owner is not in-process,
+	and so return NULL.
+
 2002-05-24  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkmain.c (_gtk_find_module): don't leak the paths.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8f8f4be594..5ad8323aa8 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon May 28 13:28:10  Shivram U  <shivaram.upadhyayula@wipro.com>
+
+	* gtk/gtktextbuffer.c (selection_data_get_buffer): Check if the owner
+	got is of type GDK_WINDOW_FOREIGN. If so the owner is not in-process,
+	and so return NULL.
+
 2002-05-24  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkmain.c (_gtk_find_module): don't leak the paths.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8f8f4be594..5ad8323aa8 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon May 28 13:28:10  Shivram U  <shivaram.upadhyayula@wipro.com>
+
+	* gtk/gtktextbuffer.c (selection_data_get_buffer): Check if the owner
+	got is of type GDK_WINDOW_FOREIGN. If so the owner is not in-process,
+	and so return NULL.
+
 2002-05-24  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkmain.c (_gtk_find_module): don't leak the paths.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8f8f4be594..5ad8323aa8 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon May 28 13:28:10  Shivram U  <shivaram.upadhyayula@wipro.com>
+
+	* gtk/gtktextbuffer.c (selection_data_get_buffer): Check if the owner
+	got is of type GDK_WINDOW_FOREIGN. If so the owner is not in-process,
+	and so return NULL.
+
 2002-05-24  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkmain.c (_gtk_find_module): don't leak the paths.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8f8f4be594..5ad8323aa8 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon May 28 13:28:10  Shivram U  <shivaram.upadhyayula@wipro.com>
+
+	* gtk/gtktextbuffer.c (selection_data_get_buffer): Check if the owner
+	got is of type GDK_WINDOW_FOREIGN. If so the owner is not in-process,
+	and so return NULL.
+
 2002-05-24  Michael Meeks  <michael@ximian.com>
 
 	* gtk/gtkmain.c (_gtk_find_module): don't leak the paths.
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 2a66d9e32b..45fd70c548 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -2894,6 +2894,9 @@ selection_data_get_buffer (GtkSelectionData *selection_data,
   if (owner == NULL)
     return NULL;
   
+  if (gdk_window_get_window_type (owner) == GDK_WINDOW_FOREIGN)
+    return NULL;
+ 
   if (selection_data->type != gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
     return NULL;