diff options
| author | Alexander Larsson <alexl@redhat.com> | 2009-05-25 14:30:01 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2009-05-25 14:30:01 +0200 |
| commit | 7698daf97aced5c22aeeb7bfbf02567b61cebaef (patch) | |
| tree | 3af0c19ca365eea39c6bee7c272b21fb3484d5eb /gdk/x11/gdkselection-x11.c | |
| parent | 1288ef1707dbb9a38d58be8c0dece6ea15a5ba00 (diff) | |
| parent | d0f887ddb144a69a85371041d1ad3640ab379ee8 (diff) | |
| download | gtk+-7698daf97aced5c22aeeb7bfbf02567b61cebaef.tar.gz | |
Merge branch 'master' into client-side-windows
Conflicts:
gdk/x11/gdkwindow-x11.c
Diffstat (limited to 'gdk/x11/gdkselection-x11.c')
| -rw-r--r-- | gdk/x11/gdkselection-x11.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index d9ef881a2e..7d23080fdd 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -405,7 +405,10 @@ gdk_selection_send_notify_for_display (GdkDisplay *display, xevent.requestor = requestor; xevent.selection = gdk_x11_atom_to_xatom_for_display (display, selection); xevent.target = gdk_x11_atom_to_xatom_for_display (display, target); - xevent.property = gdk_x11_atom_to_xatom_for_display (display, property); + if (property == GDK_NONE) + xevent.property = None; + else + xevent.property = gdk_x11_atom_to_xatom_for_display (display, property); xevent.time = time; _gdk_send_xevent (display, requestor, False, NoEventMask, (XEvent*) & xevent); |