summaryrefslogtreecommitdiff
path: root/gtk/gtkselection.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-06-20 19:38:22 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-06-20 19:38:22 +0000
commit511d536a4bacbc2a5bfaa675b81baedbed8b779a (patch)
tree4245709ed437c32d5d068468cfcae04df36bcd63 /gtk/gtkselection.c
parent4b47bcb3a98a8478407ff9d1c642ab7983c386e9 (diff)
downloadgdk-pixbuf-511d536a4bacbc2a5bfaa675b81baedbed8b779a.tar.gz
Get the owner from the display if !NULL. Otherwise, warn for multihead.
Thu Jun 20 15:36:40 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkselection.c (gtk_selection_owner_set): Get the owner from the display if !NULL. Otherwise, warn for multihead. (#85680)
Diffstat (limited to 'gtk/gtkselection.c')
-rw-r--r--gtk/gtkselection.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 76dad02ce..6078d5c8a 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -408,12 +408,22 @@ gtk_selection_owner_set (GtkWidget *widget,
GdkAtom selection,
guint32 time)
{
+ GdkDisplay *display;
+
g_return_val_if_fail (widget == NULL || GTK_WIDGET_REALIZED (widget), FALSE);
+
+ if (widget)
+ display = gtk_widget_get_display (widget);
+ else
+ {
+ GTK_NOTE (MULTIHEAD,
+ g_warning ("gtk_selection_owner_set (NULL,...) is not multihead safe"));
+
+ display = gdk_get_default_display ();
+ }
- return gtk_selection_owner_set_for_display (gdk_get_default_display(),
- widget,
- selection,
- time);
+ return gtk_selection_owner_set_for_display (display, widget,
+ selection, time);
}
/*************************************************************